Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db569afa authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Ingo Molnar
Browse files

x86: unify arch/x86/boot/compressed/Makefile(s) 



Trivial unification of the two Makefiles.
Tested doing a defconfig build for both 32 and 64 bit and
no build changes occured.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6b0c3d44

arch/x86/boot/compressed/Makefile

+60 −2
Original line number Diff line number Diff line 
#

# linux/arch/x86/boot/compressed/Makefile

#

# create a compressed vmlinux image from the original vmlinux

#



targets := vmlinux vmlinux.bin vmlinux.bin.gz head_$(BITS).o misc_$(BITS).o piggy.o



KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS += -fno-strict-aliasing -fPIC

cflags-$(CONFIG_X86_64) := -mcmodel=small

KBUILD_CFLAGS += $(cflags-y)

KBUILD_CFLAGS += $(call cc-option,-ffreestanding)

KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)



KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__



LDFLAGS := -m elf_$(UTS_MACHINE)

LDFLAGS_vmlinux := -T



$(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o $(obj)/misc_$(BITS).o $(obj)/piggy.o FORCE

	$(call if_changed,ld)

	@:



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)





ifeq ($(CONFIG_X86_32),y)

include ${srctree}/arch/x86/boot/compressed/Makefile_32

targets += vmlinux.bin.all vmlinux.relocs

hostprogs-y := relocs



quiet_cmd_relocs = RELOCS  $@

      cmd_relocs = $(obj)/relocs $< > $@;$(obj)/relocs --abs-relocs $<

$(obj)/vmlinux.relocs: vmlinux $(obj)/relocs FORCE

	$(call if_changed,relocs)



vmlinux.bin.all-y := $(obj)/vmlinux.bin

vmlinux.bin.all-$(CONFIG_RELOCATABLE) += $(obj)/vmlinux.relocs

quiet_cmd_relocbin = BUILD   $@

      cmd_relocbin = cat $(filter-out FORCE,$^) > $@

$(obj)/vmlinux.bin.all: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,relocbin)



ifdef CONFIG_RELOCATABLE

$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin.all FORCE

	$(call if_changed,gzip)

else

include ${srctree}/arch/x86/boot/compressed/Makefile_64

$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)

endif

LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T



else

$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T

endif





$(obj)/piggy.o: $(obj)/vmlinux_$(BITS).scr $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,ld)

arch/x86/boot/compressed/Makefile_32

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
#

# linux/arch/x86/boot/compressed/Makefile

#

# create a compressed vmlinux image from the original vmlinux

#



targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head_32.o misc_32.o piggy.o \

			vmlinux.bin.all vmlinux.relocs

EXTRA_AFLAGS	:= -traditional



LDFLAGS_vmlinux := -T

hostprogs-y	:= relocs



KBUILD_CFLAGS  := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -O2 \

	   -fno-strict-aliasing -fPIC \

	   $(call cc-option,-ffreestanding) \

	   $(call cc-option,-fno-stack-protector)

LDFLAGS := -m elf_i386



$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/misc_32.o $(obj)/piggy.o FORCE

	$(call if_changed,ld)

	@:



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



quiet_cmd_relocs = RELOCS  $@

      cmd_relocs = $(obj)/relocs $< > $@;$(obj)/relocs --abs-relocs $<

$(obj)/vmlinux.relocs: vmlinux $(obj)/relocs FORCE

	$(call if_changed,relocs)



vmlinux.bin.all-y := $(obj)/vmlinux.bin

vmlinux.bin.all-$(CONFIG_RELOCATABLE) += $(obj)/vmlinux.relocs

quiet_cmd_relocbin = BUILD   $@

      cmd_relocbin = cat $(filter-out FORCE,$^) > $@

$(obj)/vmlinux.bin.all: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,relocbin)



ifdef CONFIG_RELOCATABLE

$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin.all FORCE

	$(call if_changed,gzip)

else

$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)

endif



LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T



$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,ld)

arch/x86/boot/compressed/Makefile_64

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
#

# linux/arch/x86/boot/compressed/Makefile

#

# create a compressed vmlinux image from the original vmlinux

#



targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head_64.o misc_64.o piggy.o



KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2  \

	  -fno-strict-aliasing -fPIC -mcmodel=small \

	   $(call cc-option, -ffreestanding) \

	   $(call cc-option, -fno-stack-protector)

KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__

LDFLAGS := -m elf_x86_64



LDFLAGS_vmlinux := -T

$(obj)/vmlinux: $(src)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o $(obj)/piggy.o FORCE

	$(call if_changed,ld)

	@:



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T



$(obj)/piggy.o: $(obj)/vmlinux_64.scr $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,ld)