Merge branch 'reloc'

[oweals/u-boot.git] / board / voiceblue / voiceblue.c

diff --git a/board/voiceblue/voiceblue.c b/board/voiceblue/voiceblue.c
index 04093d172c6bf83f3294e1245fd6cdc95bdfa1e7..5f8af2bd24385120e65e59d0e8dff6583685a3f3 100644 (file)
--- a/board/voiceblue/voiceblue.c
+++ b/board/voiceblue/voiceblue.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -28,8 +29,7 @@ int board_init(void)
        *((volatile unsigned char *) VOICEBLUE_LED_REG) = 0xaa;
 
        /* arch number of VoiceBlue board */
-       /* TODO: use define from asm/mach-types.h */
-       gd->bd->bi_arch_number = 218;
+       gd->bd->bi_arch_number = MACH_TYPE_VOICEBLUE;
 
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x10000100;
@@ -41,10 +41,10 @@ int dram_init(void)
 {
        *((volatile unsigned short *) VOICEBLUE_LED_REG) = 0xff;
 
-       /* Take the Ethernet controller out of reset and wait
-        * for the EEPROM load to complete. */
+       /* Take the Ethernet controller out of reset and wait
+        * for the EEPROM load to complete. */
        *((volatile unsigned short *) GPIO_DATA_OUTPUT_REG) |= 0x80;
-       udelay(10);     /* doesn't work before interrupt_init call */
+       udelay(10);     /* doesn't work before timer_init call */
        *((volatile unsigned short *) GPIO_DATA_OUTPUT_REG) &= ~0x80;
        udelay(500);
 
@@ -67,3 +67,14 @@ int board_late_init(void)
 
        return 0;
 }
+
+#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