Convert CS8900 Ethernet driver to CONFIG_NET_MULTI API

[u-boot] / lib_arm / board.c

diff --git a/lib_arm/board.c b/lib_arm/board.c
index 4236c942008683fa107c3c62035f3a9c9e65c216..fa87d51373156b7f87bd1d979c47e7053696c557 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -41,13 +41,14 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
-#include <devices.h>
+#include <stdio_dev.h>
 #include <timestamp.h>
 #include <version.h>
 #include <net.h>
 #include <serial.h>
 #include <nand.h>
 #include <onenand_uboot.h>
+#include <mmc.h>
 
 #ifdef CONFIG_DRIVER_SMC91111
 #include "../drivers/net/smc91111.h"
@@ -72,10 +73,6 @@ extern void dataflash_print_info(void);
 const char version_string[] =
        U_BOOT_VERSION" (" U_BOOT_DATE " - " U_BOOT_TIME ")"CONFIG_IDENT_STRING;
 
-#ifdef CONFIG_DRIVER_CS8900
-extern void cs8900_get_enetaddr (void);
-#endif
-
 #ifdef CONFIG_DRIVER_RTL8019
 extern void rtl8019_get_enetaddr (uchar * addr);
 #endif
@@ -388,7 +385,7 @@ void start_armboot (void)
        /* IP Address */
        gd->bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
 
-       devices_init ();        /* get the devices list going. */
+       stdio_init ();  /* get the devices list going. */
 
        jumptable_init ();
 
@@ -422,11 +419,6 @@ extern void davinci_eth_set_mac_addr (const u_int8_t *addr);
        }
 #endif
 
-#ifdef CONFIG_DRIVER_CS8900
-       /* XXX: this needs to be moved to board init */
-       cs8900_get_enetaddr ();
-#endif
-
 #if defined(CONFIG_DRIVER_SMC91111) || defined (CONFIG_DRIVER_LAN91C96)
        /* XXX: this needs to be moved to board init */
        if (getenv ("ethaddr")) {
@@ -449,6 +441,12 @@ extern void davinci_eth_set_mac_addr (const u_int8_t *addr);
 #ifdef BOARD_LATE_INIT
        board_late_init ();
 #endif
+
+#ifdef CONFIG_GENERIC_MMC
+       puts ("MMC:   ");
+       mmc_initialize (gd->bd);
+#endif
+
 #if defined(CONFIG_CMD_NET)
 #if defined(CONFIG_NET_MULTI)
        puts ("Net:   ");