Merge branch 'reloc'

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

diff --git a/board/cradle/cradle.c b/board/cradle/cradle.c
index 6f65f3275731294158deb8c6e5ec7fec98879529..21eb6550db67cf09c848bf680fe0fff18fbcd27f 100644 (file)
--- a/board/cradle/cradle.c
+++ b/board/cradle/cradle.c
@@ -27,6 +27,9 @@
 
 #include <asm/arch/pxa-regs.h>
 #include <common.h>
+#include <netdev.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 /* ------------------------------------------------------------------------- */
 
@@ -181,8 +184,6 @@ int
 board_init (void)
 /**********************************************************/
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        led_code (0xf, YELLOW);
 
        /* arch number of HHP Cradle */
@@ -209,8 +210,6 @@ int
 dram_init (void)
 /**********************************************************/
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size  = PHYS_SDRAM_1_SIZE;
        gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
@@ -225,3 +224,14 @@ dram_init (void)
                PHYS_SDRAM_3_SIZE +
                PHYS_SDRAM_4_SIZE );
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+       int rc = 0;
+#ifdef CONFIG_SMC91111
+       rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
+#endif
+       return rc;
+}
+#endif