diff options
| author | marcel <marcel@FreeBSD.org> | 2009-11-06 06:09:04 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2009-11-06 06:09:04 +0000 |
| commit | 632be2941cd3f940b7f465970dfc8ae0e361d158 (patch) | |
| tree | 56701eb734ef2e59f048af588c6d3e32e2904a99 /sys/powerpc | |
| parent | 20a11d2e7f2db5a8af9cdecaa06da89bd66aaacd (diff) | |
| download | FreeBSD-src-632be2941cd3f940b7f465970dfc8ae0e361d158.zip FreeBSD-src-632be2941cd3f940b7f465970dfc8ae0e361d158.tar.gz | |
Unbreak E500 builds. The inline assembly for the 970 CPUs
is invalid when compiling for BookE.
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/powerpc/cpu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c index 1325207..b4224a4 100644 --- a/sys/powerpc/powerpc/cpu.c +++ b/sys/powerpc/powerpc/cpu.c @@ -118,7 +118,9 @@ static void cpu_print_speed(void); static void cpu_6xx_setup(int cpuid, uint16_t vers); static void cpu_6xx_print_cacheinfo(u_int, uint16_t); static void cpu_e500_setup(int cpuid, uint16_t vers); +#ifndef E500 static void cpu_970_setup(int cpuid, uint16_t vers); +#endif void cpu_setup(u_int cpuid) @@ -195,12 +197,14 @@ cpu_setup(u_int cpuid) cpu_6xx_setup(cpuid, vers); break; +#ifndef E500 case IBM970: case IBM970FX: case IBM970GX: case IBM970MP: cpu_970_setup(cpuid, vers); break; +#endif case FSL_E500v1: case FSL_E500v2: @@ -429,6 +433,7 @@ cpu_e500_setup(int cpuid, uint16_t vers) printf("cpu%d: HID0 %b", cpuid, (int)hid0, HID0_E500_BITMASK); } +#ifndef E500 static void cpu_970_setup(int cpuid, uint16_t vers) { @@ -458,4 +463,4 @@ cpu_970_setup(int cpuid, uint16_t vers) : "=r" (hid0_hi) : "K" (SPR_HID0)); printf("cpu%d: HID0 %b", cpuid, (int)(hid0_hi), HID0_970_BITMASK); } - +#endif |
