Merge branch 'next' of git://git.denx.de/u-boot-video into next

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

diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c
index 63745b4fdbf01ef2f2b697e14d3a8a6d058ea789..59346bc6d45d65ffb742456f5ed59d931900ba44 100644 (file)
--- a/board/cerf250/cerf250.c
+++ b/board/cerf250/cerf250.c
@@ -26,6 +26,9 @@
  */
 
 #include <common.h>
+#include <netdev.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 /* ------------------------------------------------------------------------- */
 
@@ -36,13 +39,11 @@
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* memory and cpu-speed are setup before relocation */
        /* so we do _nothing_ here */
 
        /* arch number of cerf PXA Board */
-       gd->bd->bi_arch_number = 139;
+       gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF;
 
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0xa0000100;
@@ -60,8 +61,6 @@ int board_late_init(void)
 
 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;
@@ -73,3 +72,14 @@ int dram_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