diff options
| author | Tom Rini <trini@kernel.crashing.org> | 2005-04-16 15:24:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:25 -0700 |
| commit | ef2f3253f061cbb86da25411a6e6e6a69a84b6ac (patch) | |
| tree | 4cc7f6529b1a50a862c8b5c02c05a1ca0a371714 | |
| parent | 54095a6ec7b11a008c07c5016b025206a051f560 (diff) | |
[PATCH] ppc32: Fix building 32bit kernel for 64bit machines
When building a ppc32 MULTIPLATFORM kernel for a 64bit pmac, we try and
build certain files or use certain functions that make no sense in that
context. This catches the last of these.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/ppc/boot/simple/Makefile | 3 | ||||
| -rw-r--r-- | arch/ppc/platforms/pmac_cache.S | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile index d8d801fcee1..c28061ad598 100644 --- a/arch/ppc/boot/simple/Makefile +++ b/arch/ppc/boot/simple/Makefile @@ -123,10 +123,13 @@ zimageinitrd-$(pcore) := zImage.initrd-STRIPELF end-$(pcore) := pcore cacheflag-$(pcore) := -include $(clear_L2_L3) +# Really only valid if CONFIG_6xx=y zimage-$(CONFIG_PPC_PREP) := zImage-PPLUS zimageinitrd-$(CONFIG_PPC_PREP) := zImage.initrd-PPLUS +ifeq ($(CONFIG_6xx),y) extra.o-$(CONFIG_PPC_PREP) := prepmap.o misc-$(CONFIG_PPC_PREP) += misc-prep.o mpc10x_memory.o +endif end-$(CONFIG_PPC_PREP) := prep end-$(CONFIG_SANDPOINT) := sandpoint diff --git a/arch/ppc/platforms/pmac_cache.S b/arch/ppc/platforms/pmac_cache.S index c00e0352044..da34a9bc929 100644 --- a/arch/ppc/platforms/pmac_cache.S +++ b/arch/ppc/platforms/pmac_cache.S @@ -28,6 +28,9 @@ */ _GLOBAL(flush_disable_caches) +#ifndef CONFIG_6xx + blr +#else BEGIN_FTR_SECTION b flush_disable_745x END_FTR_SECTION_IFSET(CPU_FTR_SPEC7450) @@ -323,3 +326,4 @@ END_FTR_SECTION_IFSET(CPU_FTR_L3CR) mtmsr r11 /* restore DR and EE */ isync blr +#endif /* CONFIG_6xx */ |