summaryrefslogtreecommitdiffstats
path: root/board/esd
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2010-09-11 09:31:43 +0200
committerStefan Roese <sr@denx.de>2010-09-23 09:02:05 +0200
commit5e7abce99163a00b8d267cc8045f06b498728288 (patch)
tree33da20a6f8524f7a8929cc4f8c003708a5f0a6e8 /board/esd
parent098877628888f28f321b8a61a9b0b982a969e415 (diff)
downloadblackbird-obmc-uboot-5e7abce99163a00b8d267cc8045f06b498728288.tar.gz
blackbird-obmc-uboot-5e7abce99163a00b8d267cc8045f06b498728288.zip
ppc4xx: Big header cleanup, mostly PPC440 related
This patch starts a bit PPC4xx header cleanup. First patch mostly touches PPC440 files. A later patch will touch the PPC405 files as well. This cleanup is done by creating header files for all SoC versions and moving the SoC specific defines into these special headers. This way the common header ppc405.h and ppc440.h can be cleaned up finally. Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/esd')
-rw-r--r--board/esd/du440/du440.c4
-rw-r--r--board/esd/pci405/pci405.c1
-rw-r--r--board/esd/pmc440/pmc440.c4
3 files changed, 4 insertions, 5 deletions
diff --git a/board/esd/du440/du440.c b/board/esd/du440/du440.c
index fccfaee7b3..426321e7bc 100644
--- a/board/esd/du440/du440.c
+++ b/board/esd/du440/du440.c
@@ -265,8 +265,8 @@ int misc_init_r(void)
* This fix will make the MAL burst disabling patch for the Linux
* EMAC driver obsolete.
*/
- reg = mfdcr(PLB4_ACR) & ~PLB4_ACR_WRP;
- mtdcr(PLB4_ACR, reg);
+ reg = mfdcr(PLB4A0_ACR) & ~PLB4Ax_ACR_WRP_MASK;
+ mtdcr(PLB4A0_ACR, reg);
/*
* release IO-RST#
diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c
index dd97c7a462..4018a7d29f 100644
--- a/board/esd/pci405/pci405.c
+++ b/board/esd/pci405/pci405.c
@@ -281,7 +281,6 @@ int misc_init_r (void)
#define PCI0_BRDGOPT1 0x4a
pci_write_config_word(PCIDEVID_405GP, PCI0_BRDGOPT1, 0x3f20);
-#define PLB0_ACR 0x87
/*
* Enable fairness and high bus utilization
*/
diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c
index c907b85aee..8238c33c87 100644
--- a/board/esd/pmc440/pmc440.c
+++ b/board/esd/pmc440/pmc440.c
@@ -426,8 +426,8 @@ int misc_init_r(void)
* This fix will make the MAL burst disabling patch for the Linux
* EMAC driver obsolete.
*/
- reg = mfdcr(PLB4_ACR) & ~PLB4_ACR_WRP;
- mtdcr(PLB4_ACR, reg);
+ reg = mfdcr(PLB4A0_ACR) & ~PLB4Ax_ACR_WRP_MASK;
+ mtdcr(PLB4A0_ACR, reg);
#ifdef CONFIG_FPGA
pmc440_init_fpga();
OpenPOWER on IntegriCloud