mmc: rescan fails on empty slot

[u-boot] / board / cmc_pu2 / cmc_pu2.c

diff --git a/board/cmc_pu2/cmc_pu2.c b/board/cmc_pu2/cmc_pu2.c
index 374cd0701311e6d0488bf79fb47f70be57649ff5..0ac851c97f3e9270861733660722cfc86905991b 100644 (file)
--- a/board/cmc_pu2/cmc_pu2.c
+++ b/board/cmc_pu2/cmc_pu2.c
@@ -30,8 +30,12 @@
 #include <common.h>
 #include <asm/mach-types.h>
 #include <asm/arch/AT91RM9200.h>
+#include <asm/io.h>
+#include <netdev.h>
+#if defined(CONFIG_DRIVER_ETHER)
 #include <at91rm9200_net.h>
 #include <dm9161.h>
+#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -73,7 +77,7 @@ int board_init (void)
        pioc->PIO_PPUDR = AT91C_PIO_PC0 | AT91C_PIO_PC1 |
                        AT91C_PIO_PC2 | AT91C_PIO_PC3;
        pioc->PIO_PER = AT91C_PIO_PC0 | AT91C_PIO_PC1 |
-                       AT91C_PIO_PC2 | AT91C_PIO_PC3;
+                       AT91C_PIO_PC2 | AT91C_PIO_PC3;
 
        /*
         * On CMC-PU2 board configure PB3-PB6 to input without pull ups to
@@ -177,3 +181,12 @@ void at91rm9200_GetPhyInterface(AT91PS_PhyOps p_phyops)
 
 #endif
 #endif /* CONFIG_DRIVER_ETHER */
+
+#ifdef CONFIG_DRIVER_AT91EMAC
+int board_eth_init(bd_t *bis)
+{
+       int rc = 0;
+       rc = at91emac_register(bis, 0);
+       return rc;
+}
+#endif