summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-05-30 23:32:44 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-05-30 23:32:44 +0200
commit392c252efd5d2e67b47ebeb3b7e4f42e7e3d5127 (patch)
tree79f04d305d848c0429ae71b7347e61edcb5b0256
parentb9b2480f4fdeb0b3285a338e22916dd249cdf973 (diff)
downloadu-boot-imx-392c252efd5d2e67b47ebeb3b7e4f42e7e3d5127.zip
u-boot-imx-392c252efd5d2e67b47ebeb3b7e4f42e7e3d5127.tar.gz
u-boot-imx-392c252efd5d2e67b47ebeb3b7e4f42e7e3d5127.tar.bz2
Fix PCI to memory window size problems on PM82x boards
We use the "automatic" mode that was used for the MPC8266ADS and MPC8272 boards. Eventually this should be used on all boards?] Patch by Wolfgang Grandegger, 17 Jan 2006
-rw-r--r--CHANGELOG5
-rw-r--r--cpu/mpc8260/pci.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bcae503..4aab6fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fix PCI to memory window size problems on PM82x boards
+ We use the "automatic" mode that was used for the MPC8266ADS and
+ MPC8272 boards. Eventually this should be used on all boards?]
+ Patch by Wolfgang Grandegger, 17 Jan 2006
+
* Correct GPIO setup (UART1/IRQ's) on yosemite & yellowstone
Patch by Stefan Roese, 29 May 2006
diff --git a/cpu/mpc8260/pci.c b/cpu/mpc8260/pci.c
index ea5514f..b14fc15 100644
--- a/cpu/mpc8260/pci.c
+++ b/cpu/mpc8260/pci.c
@@ -34,7 +34,7 @@
#include <asm/m8260_pci.h>
#include <asm/io.h>
-#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272
+#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272 || defined CONFIG_PM826
DECLARE_GLOBAL_DATA_PTR;
#endif
@@ -401,7 +401,7 @@ void pci_mpc8250_init (struct pci_controller *hose)
hose->last_busno = 0xff;
/* System memory space */
-#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272
+#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272 || defined CONFIG_PM826
pci_set_region (hose->regions + 0,
PCI_SLV_MEM_BUS,
PCI_SLV_MEM_LOCAL,