diff options
| author | Tom Rini <trini@kernel.crashing.org> | 2006-01-12 18:55:58 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-13 05:14:28 -0500 |
| commit | 135f0b17a7a146fa65ccd75704eecf77ee19d587 (patch) | |
| tree | 324f4f1f0cee2b7f1b9a5c9b6c09ad5520b7d05d /arch/powerpc | |
| parent | 610d91511f99f0a8325ad78fb7259c454b23e65a (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/powerpc')
| -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/ | |||
| 139 | 139 | ||
| 140 | drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ | 140 | drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ |
| 141 | 141 | ||
| 142 | defaultimage-$(CONFIG_PPC32) := zImage | 142 | # Default to zImage, override when needed |
| 143 | defaultimage-y := zImage | ||
| 143 | defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux | 144 | defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux |
| 144 | defaultimage-$(CONFIG_PPC_PSERIES) := zImage | ||
| 145 | KBUILD_IMAGE := $(defaultimage-y) | 145 | KBUILD_IMAGE := $(defaultimage-y) |
| 146 | all: $(KBUILD_IMAGE) | 146 | all: $(KBUILD_IMAGE) |
| 147 | 147 | ||