]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
OMAP3: zoom1: enable LAN9211
authorNishanth Menon <nm@ti.com>
Tue, 8 Apr 2014 14:50:53 +0000 (09:50 -0500)
committerTom Rini <trini@ti.com>
Thu, 17 Apr 2014 21:24:39 +0000 (17:24 -0400)
Zoom1 was wrongly setup for LAN91C96. Fix it by enabling
LAN9211.

Signed-off-by: Nishanth Menon <nm@ti.com>
board/logicpd/zoom1/zoom1.c
include/configs/omap3_zoom1.h

index 56e512fe0591d24a5b2d23d009220b7f3beb16a4..461a852724eb6d7a76dd79d785599a26300a8fcb 100644 (file)
@@ -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
index c4178d8c156955d18fbd2614dfe9cdf1f796a9f2..4a4dfd9695476f661633767968b654da36b20360 100644 (file)
 #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
 
 #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 */