From: Michael Schwingen <michael@schwingen.org>
Date: Sun, 22 May 2011 22:00:13 +0000 (+0200)
Subject: run arm_pci_init after relocation
X-Git-Tag: v2011.06~5^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1ed63c549892bc3a4ce1a43f09a6a92a00054f3d;p=oweals%2Fu-boot.git

run arm_pci_init after relocation

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

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 1a784a1e19..99bc2c70d4 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();