diff options
| author | Stefan Roese <sr@denx.de> | 2010-09-11 09:31:43 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2010-09-23 09:02:05 +0200 |
| commit | 5e7abce99163a00b8d267cc8045f06b498728288 (patch) | |
| tree | 33da20a6f8524f7a8929cc4f8c003708a5f0a6e8 /arch/powerpc/cpu/ppc4xx/cpu.c | |
| parent | 098877628888f28f321b8a61a9b0b982a969e415 (diff) | |
| download | talos-obmc-uboot-5e7abce99163a00b8d267cc8045f06b498728288.tar.gz talos-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 'arch/powerpc/cpu/ppc4xx/cpu.c')
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/cpu.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/cpu.c b/arch/powerpc/cpu/ppc4xx/cpu.c index 39b8e2f542..84852184de 100644 --- a/arch/powerpc/cpu/ppc4xx/cpu.c +++ b/arch/powerpc/cpu/ppc4xx/cpu.c @@ -98,8 +98,8 @@ int pci_arbiter_enabled(void) #if defined(CONFIG_440GX) || defined(CONFIG_440SP) || defined(CONFIG_440SPE) unsigned long val; - mfsdr(SDR0_XCR, val); - return (val & 0x80000000); + mfsdr(SDR0_XCR0, val); + return (val & SDR0_XCR0_PAE_MASK); #endif #if defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ @@ -107,7 +107,7 @@ int pci_arbiter_enabled(void) unsigned long val; mfsdr(SDR0_PCI0, val); - return (val & 0x80000000); + return (val & SDR0_PCI0_PAE_MASK); #endif } #endif @@ -262,7 +262,7 @@ static int bootstrap_option(void) #endif /* SDR0_PINSTP_SHIFT */ -#if defined(CONFIG_440) +#if defined(CONFIG_440GP) static int do_chip_reset (unsigned long sys0, unsigned long sys1) { /* Changes to CPC0_SYS0 and CPC0_SYS1 require chip @@ -276,7 +276,7 @@ static int do_chip_reset (unsigned long sys0, unsigned long sys1) return 1; } -#endif +#endif /* CONFIG_440GP */ int checkcpu (void) @@ -417,6 +417,7 @@ int checkcpu (void) break; #if defined(CONFIG_440) +#if defined(CONFIG_440GP) case PVR_440GP_RB: puts("GP Rev. B"); /* See errata 1.12: CHIP_4 */ @@ -433,6 +434,7 @@ int checkcpu (void) case PVR_440GP_RC: puts("GP Rev. C"); break; +#endif /* CONFIG_440GP */ case PVR_440GX_RA: puts("GX Rev. A"); |
