s3c24x0: move i2c driver to drivers/i2c

[u-boot] / cpu / ixp / cpu.c

diff --git a/cpu/ixp/cpu.c b/cpu/ixp/cpu.c
index 7f9f3344b3f17d1f7e7e1a76140ff4a26eb677b2..fd545b5a254c16bc03f126e0aa6fbc75534096de 100644 (file)
--- a/cpu/ixp/cpu.c
+++ b/cpu/ixp/cpu.c
@@ -32,6 +32,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <netdev.h>
 #include <asm/arch/ixp425.h>
 
 ulong loops_per_jiffy;
@@ -81,13 +82,10 @@ int cpu_init (void)
         * setup up stacks if necessary
         */
 #ifdef CONFIG_USE_IRQ
-       IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4;
+       IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
        FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_PCI) || defined (CONFIG_PCI)
-       pci_init();
-#endif
        return 0;
 }
 
@@ -198,7 +196,7 @@ void pci_init(void)
 
 void bootcount_store (ulong a)
 {
-       volatile ulong *save_addr = (volatile ulong *)(CFG_BOOTCOUNT_ADDR);
+       volatile ulong *save_addr = (volatile ulong *)(CONFIG_SYS_BOOTCOUNT_ADDR);
 
        save_addr[0] = a;
        save_addr[1] = BOOTCOUNT_MAGIC;
@@ -206,7 +204,7 @@ void bootcount_store (ulong a)
 
 ulong bootcount_load (void)
 {
-       volatile ulong *save_addr = (volatile ulong *)(CFG_BOOTCOUNT_ADDR);
+       volatile ulong *save_addr = (volatile ulong *)(CONFIG_SYS_BOOTCOUNT_ADDR);
 
        if (save_addr[1] != BOOTCOUNT_MAGIC)
                return 0;
@@ -215,3 +213,11 @@ ulong bootcount_load (void)
 }
 
 #endif /* CONFIG_BOOTCOUNT_LIMIT */
+
+int cpu_eth_init(bd_t *bis)
+{
+#ifdef CONFIG_IXP4XX_NPE
+       npe_initialize(bis);
+#endif
+       return 0;
+}