diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2008-10-04 21:18:51 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-04 22:08:46 +0200 |
| commit | d960c9ce47c5360b39e47c064818e91c89df0e21 (patch) | |
| tree | 8bba8f4e153b235bbc59a991f2b5503553ab7308 /arch/x86/boot/Makefile | |
| parent | x86 setup: remove DEF_INITSEG and DEF_SETUPSEG (diff) | |
| download | linux-d960c9ce47c5360b39e47c064818e91c89df0e21.tar.xz linux-d960c9ce47c5360b39e47c064818e91c89df0e21.zip | |
x86 setup: remove IMAGE_OFFSET
After commit 968de4f ("i386: Relocatable kernel support") IMAGE_OFFSET wasn't
actually used anymore in the (current) X86 build system. Now remove its last
traces.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/Makefile')
| -rw-r--r-- | arch/x86/boot/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index cceba1f46365..cd48c7210016 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -72,9 +72,7 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ KBUILD_CFLAGS += $(call cc-option,-m32) KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ -$(obj)/zImage: IMAGE_OFFSET := 0x1000 $(obj)/zImage: asflags-y := $(SVGA_MODE) $(RAMDISK) -$(obj)/bzImage: IMAGE_OFFSET := 0x100000 $(obj)/bzImage: ccflags-y := -D__BIG_KERNEL__ $(obj)/bzImage: asflags-y := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__ $(obj)/bzImage: BUILDFLAGS := -b @@ -117,7 +115,7 @@ $(obj)/setup.bin: $(obj)/setup.elf FORCE $(call if_changed,objcopy) $(obj)/compressed/vmlinux: FORCE - $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@ + $(Q)$(MAKE) $(build)=$(obj)/compressed $@ # Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel FDARGS = |