summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2014-04-08 09:50:53 -0500
committerTom Rini <trini@ti.com>2014-04-17 17:24:39 -0400
commit9d70e7728582836c7f09bc28a08f296566d17a53 (patch)
tree5795625e6b00396a5ca4414304a5a536c8cf263c
parentc2800b162bdf9ffa74bbff793bd7beb5bd903773 (diff)
downloadu-boot-imx-9d70e7728582836c7f09bc28a08f296566d17a53.zip
u-boot-imx-9d70e7728582836c7f09bc28a08f296566d17a53.tar.gz
u-boot-imx-9d70e7728582836c7f09bc28a08f296566d17a53.tar.bz2
OMAP3: zoom1: enable LAN9211
Zoom1 was wrongly setup for LAN91C96. Fix it by enabling LAN9211. Signed-off-by: Nishanth Menon <nm@ti.com>
-rw-r--r--board/logicpd/zoom1/zoom1.c20
-rw-r--r--include/configs/omap3_zoom1.h10
2 files changed, 27 insertions, 3 deletions
diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c
index 56e512f..461a852 100644
--- a/board/logicpd/zoom1/zoom1.c
+++ b/board/logicpd/zoom1/zoom1.c
@@ -102,9 +102,25 @@ int board_mmc_init(bd_t *bis)
int board_eth_init(bd_t *bis)
{
int rc = 0;
-#ifdef CONFIG_LAN91C96
- rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+
+#ifdef CONFIG_SMC911X
+#define STR_ENV_ETHADDR "ethaddr"
+
+ struct eth_device *dev;
+ uchar eth_addr[6];
+
+ rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+ if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
+ dev = eth_get_dev_by_index(0);
+ if (dev) {
+ eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
+ } else {
+ printf("zoom1: Couldn't get eth device\n");
+ rc = -1;
+ }
+ }
#endif
+
return rc;
}
#endif
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index c4178d8..4a4dfd9 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -115,7 +115,7 @@
#undef CONFIG_CMD_FPGA /* FPGA configuration Support */
#undef CONFIG_CMD_IMI /* iminfo */
#undef CONFIG_CMD_IMLS /* List all found images */
-#undef CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */
+#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */
#undef CONFIG_CMD_NFS /* NFS support */
#define CONFIG_SYS_NO_FLASH
@@ -265,4 +265,12 @@
#define CONFIG_SYS_CACHELINE_SIZE 64
+#ifdef CONFIG_CMD_NET
+/* Ethernet (LAN9211 from SMSC9118 family) */
+#define CONFIG_SMC911X
+#define CONFIG_SMC911X_32_BIT
+#define CONFIG_SMC911X_BASE DEBUG_BASE
+
+#endif
+
#endif /* __CONFIG_H */