diff options
| author | Tom Rini <trini@kernel.crashing.org> | 2006-01-13 00:55:58 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-13 11:14:28 +0100 |
| commit | 135f0b17a7a146fa65ccd75704eecf77ee19d587 (patch) | |
| tree | 324f4f1f0cee2b7f1b9a5c9b6c09ad5520b7d05d /arch | |
| parent | [PATCH] powerpc: Add support for changing properties from userspace (diff) | |
| download | linux-135f0b17a7a146fa65ccd75704eecf77ee19d587.tar.xz linux-135f0b17a7a146fa65ccd75704eecf77ee19d587.zip | |
[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/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 07b8e15b48fa..44dd82b791d1 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) |