diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-06 14:26:51 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-06 14:26:51 +0100 |
commit | c35cf8dc9fd90ff108abe08527df042bcd29a02f (patch) | |
tree | a5b962854f9a1a2659207f41204840b2b98078bd /include/configs/am3517_evm.h | |
parent | 7988bd4ed6b48127ac8b45cf144255daabaa1250 (diff) | |
parent | 18a02e8050b7af165efa72325753e7880bf5567c (diff) | |
download | u-boot-imx-c35cf8dc9fd90ff108abe08527df042bcd29a02f.zip u-boot-imx-c35cf8dc9fd90ff108abe08527df042bcd29a02f.tar.gz u-boot-imx-c35cf8dc9fd90ff108abe08527df042bcd29a02f.tar.bz2 |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/am3517_evm.h')
-rw-r--r-- | include/configs/am3517_evm.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 5ff65c6..5e259f5 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -141,8 +141,18 @@ #define CONFIG_SYS_I2C_SLAVE 1 #define CONFIG_DRIVER_OMAP34XX_I2C 1 -#undef CONFIG_CMD_NET -#undef CONFIG_CMD_NFS +/* + * Ethernet + */ +#define CONFIG_DRIVER_TI_EMAC +#define CONFIG_DRIVER_TI_EMAC_USE_RMII +#define CONFIG_MII +#define CONFIG_BOOTP_DEFAULT +#define CONFIG_BOOTP_DNS +#define CONFIG_BOOTP_DNS2 +#define CONFIG_BOOTP_SEND_HOSTNAME +#define CONFIG_NET_RETRY_COUNT 10 + /* * Board NAND Info. */ |