summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-01-31 09:04:58 +0100
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-01-31 10:16:01 +0100
commitf90c8022f448bc5e93090e4b714368e52e912f0f (patch)
tree28def8682e66fa04a34e2c32c55eb86a6bc12241
parent8cb79b5f275f1888ccb278a2d2197140444a84b7 (diff)
downloadu-boot-imx-f90c8022f448bc5e93090e4b714368e52e912f0f.zip
u-boot-imx-f90c8022f448bc5e93090e4b714368e52e912f0f.tar.gz
u-boot-imx-f90c8022f448bc5e93090e4b714368e52e912f0f.tar.bz2
ixp: move pci init in arm/board instead of cpu
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--cpu/ixp/cpu.c3
-rw-r--r--lib_arm/board.c12
2 files changed, 12 insertions, 3 deletions
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 2358beb..964f5cc 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -221,6 +221,15 @@ 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;
+}
+#endif /* CONFIG_CMD_PCI || CONFIG_PCI */
+
/*
* Breathe some life into the board...
*
@@ -267,6 +276,9 @@ init_fnc_t *init_sequence[] = {
init_func_i2c,
#endif
dram_init, /* configure available RAM banks */
+#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
+ arm_pci_init,
+#endif
display_dram_config,
NULL,
};