aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schwingen <michael@schwingen.org>2011-05-23 00:00:13 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-06-23 08:25:19 +0200
commit1ed63c549892bc3a4ce1a43f09a6a92a00054f3d (patch)
treed17d238becdcca92342f6122674b8ed5f6df54e0
parent29161f47d00f39aaad110f59406ff5f66b3c3811 (diff)
downloadu-boot-linaro-1ed63c549892bc3a4ce1a43f09a6a92a00054f3d.tar.gz
run arm_pci_init after relocation
Signed-off-by: Michael Schwingen <michael@schwingen.org>
-rw-r--r--arch/arm/lib/board.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 1a784a1e1..99bc2c70d 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -262,9 +262,6 @@ 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
NULL,
};
@@ -533,6 +530,9 @@ void board_init_r (gd_t *id, ulong dest_addr)
/* initialize environment */
env_relocate ();
+#if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
+ arm_pci_init();
+#endif
#ifdef CONFIG_VFD
/* must do this after the framebuffer is allocated */
drv_vfd_init();