diff options
author | Wolfgang Denk <wd@denx.de> | 2009-09-15 21:43:25 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-09-15 21:43:25 +0200 |
commit | cae26e2fdd9934644086fda9f7cbc336a1fe5ce8 (patch) | |
tree | 5f9ae145135d5583fadff9564196fbf5f10e34ea /board/amcc/katmai | |
parent | 6c7bc91fb3dba186d3398a1653f6db236510ffa7 (diff) | |
parent | 4c1883670acbf1cc83c04df1876235c3aedde128 (diff) | |
download | u-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.zip u-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.tar.gz u-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'board/amcc/katmai')
-rw-r--r-- | board/amcc/katmai/katmai.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c index e078ba4..1a45056 100644 --- a/board/amcc/katmai/katmai.c +++ b/board/amcc/katmai/katmai.c @@ -220,9 +220,9 @@ int board_early_init_f (void) mtdcr (uic0sr, 0x00000000); /* clear all interrupts*/ mtdcr (uic0sr, 0xffffffff); /* clear all interrupts*/ - mfsdr(sdr_mfr, mfr); + mfsdr(SDR0_MFR, mfr); mfr |= SDR0_MFR_FIXD; /* Workaround for PCI/DMA */ - mtsdr(sdr_mfr, mfr); + mtsdr(SDR0_MFR, mfr); mtsdr(SDR0_PFC0, CONFIG_SYS_PFC0); @@ -280,7 +280,7 @@ int pci_pre_init(struct pci_controller * hose ) * The katmai board is always configured as the host & requires the * PCI arbiter to be enabled. *-------------------------------------------------------------------*/ - mfsdr(sdr_sdstp1, strap); + mfsdr(SDR0_SDSTP1, strap); if( (strap & SDR0_SDSTP1_PAE_MASK) == 0 ) { printf("PCI: SDR0_STRP1[%08lX] - PCI Arbiter disabled.\n",strap); return 0; |