Patchwork [U-Boot,IXP42x,series,v5,17/17] run arm_pci_init after relocation

login
register
mail settings
Submitter Michael Schwingen
Date May 22, 2011, 10 p.m.
Message ID <1306101613-18200-18-git-send-email-michael@schwingen.org>
Download mbox | patch
Permalink /patch/96808/
State Accepted
Headers show

Comments

Michael Schwingen - May 22, 2011, 10 p.m.
Signed-off-by: Michael Schwingen <michael@schwingen.org>
---
Changes for V3:
 - new in V3
Changes for V4:
 - add changelog
Changes for V5:

 arch/arm/lib/board.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

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_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();