Commit a7a0640085ac7a47091471034553f9b619053654
1 parent
c3799fceda
Exists in
master
and in
53 other branches
TI:am335x: Better comment and organize the networking related options
While in here, drop CONFIG_BOOTP_DEFAULT as it is unused in the code. Signed-off-by: Tom Rini <trini@ti.com>
Showing 2 changed files with 14 additions and 8 deletions Side-by-side Diff
include/configs/am335x_evm.h
| ... | ... | @@ -228,17 +228,24 @@ |
| 228 | 228 | /* SPL */ |
| 229 | 229 | #ifndef CONFIG_NOR_BOOT |
| 230 | 230 | #define CONFIG_SPL_YMODEM_SUPPORT |
| 231 | + | |
| 232 | +/* CPSW support */ | |
| 233 | +#define CONFIG_SPL_ETH_SUPPORT | |
| 234 | + | |
| 235 | +/* USB gadget RNDIS */ | |
| 236 | +#define CONFIG_SPL_MUSB_NEW_SUPPORT | |
| 237 | + | |
| 238 | +/* General network SPL, both CPSW and USB gadget RNDIS */ | |
| 231 | 239 | #define CONFIG_SPL_NET_SUPPORT |
| 232 | 240 | #define CONFIG_SPL_ENV_SUPPORT |
| 233 | 241 | #define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL" |
| 234 | -#define CONFIG_SPL_ETH_SUPPORT | |
| 242 | + | |
| 235 | 243 | #define CONFIG_SPL_SPI_SUPPORT |
| 236 | 244 | #define CONFIG_SPL_SPI_FLASH_SUPPORT |
| 237 | 245 | #define CONFIG_SPL_SPI_LOAD |
| 238 | 246 | #define CONFIG_SPL_SPI_BUS 0 |
| 239 | 247 | #define CONFIG_SPL_SPI_CS 0 |
| 240 | 248 | #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 |
| 241 | -#define CONFIG_SPL_MUSB_NEW_SUPPORT | |
| 242 | 249 | #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" |
| 243 | 250 | |
| 244 | 251 | #ifdef CONFIG_NAND |
include/configs/ti_am335x_common.h
| ... | ... | @@ -28,18 +28,17 @@ |
| 28 | 28 | #define CONFIG_SYS_NS16550_CLK 48000000 |
| 29 | 29 | |
| 30 | 30 | /* Network defines. */ |
| 31 | -#define CONFIG_CMD_NET | |
| 31 | +#define CONFIG_CMD_NET /* 'bootp' and 'tftp' */ | |
| 32 | 32 | #define CONFIG_CMD_DHCP |
| 33 | -#define CONFIG_CMD_PING | |
| 34 | -#define CONFIG_DRIVER_TI_CPSW | |
| 35 | -#define CONFIG_MII | |
| 36 | -#define CONFIG_BOOTP_DEFAULT | |
| 37 | -#define CONFIG_BOOTP_DNS | |
| 33 | +#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ | |
| 38 | 34 | #define CONFIG_BOOTP_DNS2 |
| 39 | 35 | #define CONFIG_BOOTP_SEND_HOSTNAME |
| 40 | 36 | #define CONFIG_BOOTP_GATEWAY |
| 41 | 37 | #define CONFIG_BOOTP_SUBNETMASK |
| 42 | 38 | #define CONFIG_NET_RETRY_COUNT 10 |
| 39 | +#define CONFIG_CMD_PING | |
| 40 | +#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ | |
| 41 | +#define CONFIG_MII /* Required in net/eth.c */ | |
| 43 | 42 | |
| 44 | 43 | /* |
| 45 | 44 | * SPL related defines. The Public RAM memory map the ROM defines the |