commit 1ed63c549892bc3a4ce1a43f09a6a92a00054f3d
author Michael Schwingen <michael@schwingen.org> Mon May 23 00:00:13 2011 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Thu Jun 23 08:25:19 2011 +0200
tree d17d238becdcca92342f6122674b8ed5f6df54e0
parent 29161f47d00f39aaad110f59406ff5f66b3c3811

run arm_pci_init after relocation

Signed-off-by: Michael Schwingen <michael@schwingen.org>

arch/arm/lib/board.c

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 1a784a1..99bc2c7 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -262,9 +262,6 @@
 	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 @@
 	/* 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();