nand_spl: nand_boot.c: Remove CONFIG_SYS_NAND_READ_DELAY

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

diff --git a/board/linkstation/linkstation.c b/board/linkstation/linkstation.c
index f6bc0a958da9812ad4250028a89edfb9f1779144..e564e505ac4bed09a64bc1da0557ad777e24fdc2 100644 (file)
--- a/board/linkstation/linkstation.c
+++ b/board/linkstation/linkstation.c
@@ -26,16 +26,18 @@
 #include <mpc824x.h>
 #include <asm/io.h>
 #include <ns16550.h>
+#include <netdev.h>
 
 #ifdef CONFIG_PCI
 #include <pci.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 extern void init_AVR_DUART(void);
 
 int checkboard (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        char *p;
        bd_t *bd = gd->bd;
 
@@ -50,9 +52,9 @@ int checkboard (void)
        return 0;
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
-       return (get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE));
+       return (get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE));
 }
 
 /*
@@ -128,3 +130,8 @@ int board_early_init_f (void)
        out_8((volatile u8*)UART_DCR, 1);
        return 0;
 }
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}