diff options
author | Tom Rini <trini@kernel.crashing.org> | 2005-04-16 18:24:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:24:25 -0400 |
commit | ef2f3253f061cbb86da25411a6e6e6a69a84b6ac (patch) | |
tree | 4cc7f6529b1a50a862c8b5c02c05a1ca0a371714 /arch/ppc/boot | |
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>
Diffstat (limited to 'arch/ppc/boot')
-rw-r--r-- | arch/ppc/boot/simple/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile index d8d801fcee10..c28061ad5982 100644 --- a/arch/ppc/boot/simple/Makefile +++ b/arch/ppc/boot/simple/Makefile | |||
@@ -123,10 +123,13 @@ zimageinitrd-$(pcore) := zImage.initrd-STRIPELF | |||
123 | end-$(pcore) := pcore | 123 | end-$(pcore) := pcore |
124 | cacheflag-$(pcore) := -include $(clear_L2_L3) | 124 | cacheflag-$(pcore) := -include $(clear_L2_L3) |
125 | 125 | ||
126 | # Really only valid if CONFIG_6xx=y | ||
126 | zimage-$(CONFIG_PPC_PREP) := zImage-PPLUS | 127 | zimage-$(CONFIG_PPC_PREP) := zImage-PPLUS |
127 | zimageinitrd-$(CONFIG_PPC_PREP) := zImage.initrd-PPLUS | 128 | zimageinitrd-$(CONFIG_PPC_PREP) := zImage.initrd-PPLUS |
129 | ifeq ($(CONFIG_6xx),y) | ||
128 | extra.o-$(CONFIG_PPC_PREP) := prepmap.o | 130 | extra.o-$(CONFIG_PPC_PREP) := prepmap.o |
129 | misc-$(CONFIG_PPC_PREP) += misc-prep.o mpc10x_memory.o | 131 | misc-$(CONFIG_PPC_PREP) += misc-prep.o mpc10x_memory.o |
132 | endif | ||
130 | end-$(CONFIG_PPC_PREP) := prep | 133 | end-$(CONFIG_PPC_PREP) := prep |
131 | 134 | ||
132 | end-$(CONFIG_SANDPOINT) := sandpoint | 135 | end-$(CONFIG_SANDPOINT) := sandpoint |