projects
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
29161f4
)
run arm_pci_init after relocation
author
Michael Schwingen
<michael@schwingen.org>
Sun, 22 May 2011 22:00:13 +0000
(
00:00
+0200)
committer
Albert ARIBAUD
<albert.u.boot@aribaud.net>
Thu, 23 Jun 2011 06:25:19 +0000
(08:25 +0200)
Signed-off-by: Michael Schwingen <michael@schwingen.org>
arch/arm/lib/board.c
patch
|
blob
|
history
diff --git
a/arch/arm/lib/board.c
b/arch/arm/lib/board.c
index
1a784a1
..
99bc2c7
100644
(file)
--- 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();