diff options
| author | Stefan Roese <sr@denx.de> | 2007-02-09 13:20:21 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-02-09 13:20:21 +0100 |
| commit | dd768162c2b3b17f4a350fe91424e06e2e8cbf54 (patch) | |
| tree | ad5e1d8f6fc06f72860401b874736ebea3b01e8e /cpu | |
| parent | e7511c266f6d47ec8d41bef301d9474776bfeedf (diff) | |
| parent | 5a753f98c6a01bd1c61a9a3f95e8329a35f62994 (diff) | |
| download | u-boot-imx-dd768162c2b3b17f4a350fe91424e06e2e8cbf54.zip u-boot-imx-dd768162c2b3b17f4a350fe91424e06e2e8cbf54.tar.gz u-boot-imx-dd768162c2b3b17f4a350fe91424e06e2e8cbf54.tar.bz2 | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/ppc4xx/cpu.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index 7c96ad8..b02f6f4 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -88,14 +88,18 @@ int pci_arbiter_enabled(void) return (mfdcr(cpc0_strp1) & CPC0_STRP1_PAE_MASK); #endif -#if defined(CONFIG_440GX) || \ - defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ - defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ - defined(CONFIG_440SP) || defined(CONFIG_440SPE) +#if defined(CONFIG_440GX) || defined(CONFIG_440SP) || defined(CONFIG_440SPE) unsigned long val; - mfsdr(sdr_sdstp1, val); - return (val & SDR0_SDSTP1_PAE_MASK); + mfsdr(sdr_xcr, val); + return (val & 0x80000000); +#endif +#if defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ + defined(CONFIG_440EPX) || defined(CONFIG_440GRX) + unsigned long val; + + mfsdr(sdr_pci0, val); + return (val & 0x80000000); #endif } #endif |