Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / board / eltec / elppc / elppc.c

diff --git a/board/eltec/elppc/elppc.c b/board/eltec/elppc/elppc.c
index 7b4d7d20090fc1859a64af445db1e85a72d2cc94..e73c712cbb9a60eea25fbee21f92fc3225627705 100644 (file)
--- a/board/eltec/elppc/elppc.c
+++ b/board/eltec/elppc/elppc.c
@@ -25,6 +25,9 @@
 #include <command.h>
 #include <mpc106.h>
 #include <video_fb.h>
+#include <netdev.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 /* ------------------------------------------------------------------------- */
 
@@ -65,16 +68,16 @@ long int dram_size (int board_type)
 
        register unsigned long i, msar1, mear1, memSize;
 
-#if defined(CFG_MEMTEST)
+#if defined(CONFIG_SYS_MEMTEST)
        register unsigned long reg;
 
        printf ("Testing DRAM\n");
 
        /* write each mem addr with it's address */
-       for (reg = CFG_MEMTEST_START; reg < CFG_MEMTEST_END; reg += 4)
+       for (reg = CONFIG_SYS_MEMTEST_START; reg < CONFIG_SYS_MEMTEST_END; reg += 4)
                *reg = reg;
 
-       for (reg = CFG_MEMTEST_START; reg < CFG_MEMTEST_END; reg += 4) {
+       for (reg = CONFIG_SYS_MEMTEST_START; reg < CONFIG_SYS_MEMTEST_END; reg += 4) {
                if (*reg != reg)
                        return -1;
        }
@@ -102,7 +105,7 @@ long int dram_size (int board_type)
 
 /* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        return dram_size (board_type);
 }
@@ -137,12 +140,10 @@ void watchdog_reset (void)
 
 void after_reloc (ulong dest_addr)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /*
         * Jump to the main U-Boot board init code
         */
-       board_init_r (gd, dest_addr);
+       board_init_r ((gd_t *)gd, dest_addr);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -172,3 +173,8 @@ void video_get_info_str (int line_number, char *info)
        return;
 }
 #endif
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}