From: wdenk <wdenk>
Date: Tue, 1 Jun 2004 21:08:17 +0000 (+0000)
Subject: Fix PCI support on CPC45 board
X-Git-Tag: LABEL_2006_03_12_0025~570
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=979bdbc70e5aa6430e24c6db1e424f62ea2d287a;p=oweals%2Fu-boot.git

Fix PCI support on CPC45 board
---

diff --git a/CHANGELOG b/CHANGELOG
index a13900761e..3610e92d1f 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 bb56fbe739..c9e38dfc32 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
 	 */