Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
diff --git a/cpu/ixp/cpu.c b/cpu/ixp/cpu.c index 27872fb..fd545b5 100644 --- a/cpu/ixp/cpu.c +++ b/cpu/ixp/cpu.c @@ -86,9 +86,6 @@ int cpu_init (void) FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ; #endif
-#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI) - pci_init(); -#endif return 0; }
diff --git a/lib_arm/board.c b/lib_arm/board.c index 0f99cc5..0d3baad 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -224,6 +224,18 @@ static int init_func_i2c (void) } #endif
+#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI) +#include <pci.h> +static int arm_pci_init(void) +{ + pci_init(); + return 0; +} +# define INIT_FUNC_PCI_INIT arm_pci_init, +#else +# define INIT_FUNC_PCI_INIT +#endif /* CONFIG_CMD_PCI || CONFIG_PCI */ + /* * Breathe some life into the board... * @@ -270,6 +282,7 @@ init_fnc_t *init_sequence[] = { init_func_i2c, #endif dram_init, /* configure available RAM banks */ + INIT_FUNC_PCI_INIT display_dram_config, NULL, };