aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@kernel.crashing.org>2006-01-12 16:55:58 -0700
committerPaul Mackerras <paulus@samba.org>2006-01-13 21:14:28 +1100
commit135f0b17a7a146fa65ccd75704eecf77ee19d587 (patch)
tree324f4f1f0cee2b7f1b9a5c9b6c09ad5520b7d05d /arch
parent610d91511f99f0a8325ad78fb7259c454b23e65a (diff)
[PATCH] powerpc/boot: Better use of defaultimage-
The following reworks how defaultimage- is used. We default to zImage here and then override it on platforms that need something more (uImage in the future) or less (vmlinux on iSeries). Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 07b8e15b48f..44dd82b791d 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -139,9 +139,9 @@ drivers-$(CONFIG_CPM2) += arch/ppc/8260_io/
drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
-defaultimage-$(CONFIG_PPC32) := zImage
+# Default to zImage, override when needed
+defaultimage-y := zImage
defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux
-defaultimage-$(CONFIG_PPC_PSERIES) := zImage
KBUILD_IMAGE := $(defaultimage-y)
all: $(KBUILD_IMAGE)