summaryrefslogtreecommitdiff
path: root/lib_arm
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-02-01 21:24:38 +0100
committerWolfgang Denk <wd@denx.de>2009-02-01 21:24:38 +0100
commitf4b6f45dcba989f5a900edc07ececae80c79abdf (patch)
tree85e623dc76eba877275c5978a6527f368975abb2 /lib_arm
parenta87fb1b308a2a375cb9ca74ca0dd3e2c5793d3bf (diff)
parent930590f3e49c8f32256edf2e5861e1535a329c6c (diff)
downloadu-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.zip
u-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.tar.gz
u-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ixp
Diffstat (limited to 'lib_arm')
-rw-r--r--lib_arm/board.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c
index 2358beb..964f5cc 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -221,6 +221,15 @@ static int init_func_i2c (void)
}
#endif
+#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
+#include <pci.h>
+static int arm_pci_init(void)
+{
+ pci_init();
+ return 0;
+}
+#endif /* CONFIG_CMD_PCI || CONFIG_PCI */
+
/*
* Breathe some life into the board...
*
@@ -267,6 +276,9 @@ 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
display_dram_config,
NULL,
};