aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-06-01 21:08:17 +0000
committerwdenk <wdenk>2004-06-01 21:08:17 +0000
commit979bdbc70e5aa6430e24c6db1e424f62ea2d287a (patch)
tree4db0172ddc9699f75f01ad4d679e2c96fc8cb8ca
parent69459791268d48c7081802dbc7a51d4e42c8a8cd (diff)
downloadu-boot-linaro-stable-979bdbc70e5aa6430e24c6db1e424f62ea2d287a.tar.gz
Fix PCI support on CPC45 board
-rw-r--r--CHANGELOG2
-rw-r--r--lib_ppc/board.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a13900761..3610e92d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
Changes since U-Boot 1.1.1:
======================================================================
+* Fix PCI support on CPC45 board
+
* Patch by Scott McNutt, 25 Apr 2004:
Add Nios GDB/JTAG Console support:
- Add stubs to support gdb via JTAG.
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index bb56fbe73..c9e38dfc3 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -825,7 +825,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
WATCHDOG_RESET ();
-#if defined(CONFIG_PCI) && !defined(CONFIG_BAB7xx)
+#if defined(CONFIG_PCI) && !defined(CONFIG_BAB7xx) && !defined(CONFIG_CPC45)
/*
* Do pci configuration
*/