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

Commit c79bf928 authored by Russell King's avatar Russell King
Browse files

ARM: simplify generation of compressed vmlinux.lds file 



As we are now using the C preprocessor, we do not need to use sed to
edit constants in this file, and then pass the resulting file through
the C preprocessor.  Instead, rely solely on the C preprocessor to
rewrite TEXT_START and BSS_ADDR.

Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 33656d56

arch/arm/boot/compressed/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ piggy.xzkern 
piggy.lz4

vmlinux

vmlinux.lds

vmlinux.lds.S



# borrowed libfdt files

fdt.c

arch/arm/boot/compressed/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ ZTEXTADDR := 0 
ZBSSADDR	:= ALIGN(8)

endif



SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/

CPPFLAGS_vmlinux.lds := -DTEXT_START="$(ZTEXTADDR)" -DBSS_START="$(ZBSSADDR)"



suffix_$(CONFIG_KERNEL_GZIP) = gzip

suffix_$(CONFIG_KERNEL_LZO)  = lzo
@@ -114,7 +114,7 @@ targets := vmlinux vmlinux.lds \ 
# Make sure files are removed during clean

extra-y       += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern piggy.lz4 \

		 lib1funcs.S ashldi3.S bswapsdi2.S $(libfdt) $(libfdt_hdrs) \

		 hyp-stub.S vmlinux.lds.S

		 hyp-stub.S



ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)
@@ -199,8 +199,5 @@ CFLAGS_font.o := -Dstatic= 
$(obj)/font.c: $(FONTC)

	$(call cmd,shipped)



$(obj)/vmlinux.lds.S: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile $(KCONFIG_CONFIG)

	@sed "$(SEDFLAGS)" < $< > $@



$(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S

	$(call cmd,shipped)

arch/arm/boot/compressed/vmlinux.lds.in→arch/arm/boot/compressed/vmlinux.lds.S

+0 −3
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/boot/compressed/vmlinux.lds.in

 *

 *  Copyright (C) 2000 Russell King

 *

 * This program is free software; you can redistribute it and/or modify
@@ -87,4 +85,3 @@ SECTIONS 
  .stab.indexstr 0	: { *(.stab.indexstr) }

  .comment 0		: { *(.comment) }

}