summaryrefslogtreecommitdiff
path: root/arch/x86/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-03-12 12:50:33 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-03-12 12:50:33 -0700
commitf9c5107c2bcad91dd56d23888653d7bfa1a9696e (patch)
treea548fb8fbe08f8c61a5491a34cc78a1158f5d38b /arch/x86/Makefile
parent5e47c478b0b69bc9bc3ba544e4b1ca3268f98fef (diff)
downloadlinux-3.10-f9c5107c2bcad91dd56d23888653d7bfa1a9696e.tar.gz
linux-3.10-f9c5107c2bcad91dd56d23888653d7bfa1a9696e.tar.bz2
linux-3.10-f9c5107c2bcad91dd56d23888653d7bfa1a9696e.zip
x86: remove additional vestiges of the zImage/bzImage split
Impact: cleanup Remove targets that were used for zImage only, and Makefile infrastructure that was there to support the zImage/bzImage split. Reported-by: Paul Bolle <pebolle@tiscali.nl> LKML-Reference: <1236879901.24144.26.camel@test.thuisdomein> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/Makefile')
-rw-r--r--arch/x86/Makefile27
1 files changed, 8 insertions, 19 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 1836191839e..43bd89c67e3 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -153,34 +153,23 @@ endif
boot := arch/x86/boot
-PHONY += zImage bzImage compressed zlilo bzlilo \
- zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install
+BOOT_TARGETS = bzlilo bzdisk fdimage fdimage144 fdimage288 isoimage install
+
+PHONY += bzImage $(BOOT_TARGETS)
# Default kernel to build
all: bzImage
# KBUILD_IMAGE specify target image being built
- KBUILD_IMAGE := $(boot)/bzImage
-zImage zlilo zdisk: KBUILD_IMAGE := $(boot)/zImage
+KBUILD_IMAGE := $(boot)/bzImage
-zImage bzImage: vmlinux
+bzImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)
$(Q)mkdir -p $(objtree)/arch/$(UTS_MACHINE)/boot
$(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/$(UTS_MACHINE)/boot/$@
-compressed: zImage
-
-zlilo bzlilo: vmlinux
- $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) zlilo
-
-zdisk bzdisk: vmlinux
- $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) zdisk
-
-fdimage fdimage144 fdimage288 isoimage: vmlinux
- $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@
-
-install:
- $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
+$(BOOT_TARGETS): vmlinux
+ $(Q)$(MAKE) $(build)=$(boot) $@
PHONY += vdso_install
vdso_install:
@@ -208,4 +197,4 @@ endef
CLEAN_FILES += arch/x86/boot/fdimage \
arch/x86/boot/image.iso \
- arch/x86/boot/mtools.conf
+ arch/x86/boot/mtools.conf \ No newline at end of file