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

Commit 36dffadb authored by Chris Zankel's avatar Chris Zankel
Browse files

[XTENSA] Use preprocessor to generate the linker script for the ELF boot image 



Signed-off-by: default avatarMarc Gauthier <marc@tensilica.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent 6d15d109

arch/xtensa/boot/boot-elf/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -14,12 +14,13 @@ OBJCOPY_ARGS := -O elf32-xtensa-le 
endif



export OBJCOPY_ARGS

export CPPFLAGS_boot.lds += -P -C



boot-y		:= bootstrap.o



OBJS		:= $(addprefix $(obj)/,$(boot-y))



Image:	vmlinux $(OBJS)

Image:	vmlinux $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds

	$(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \

		vmlinux vmlinux.tmp

	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
@@ -27,7 +28,7 @@ Image: vmlinux $(OBJS) 
		--set-section-flags image=contents,alloc,load,load,data \

		$(OBJS) $@.tmp

	$(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \

		-T $(srctree)/arch/$(ARCH)/boot/boot-elf/boot.ld \

		-T arch/$(ARCH)/boot/boot-elf/boot.lds \

		-o arch/$(ARCH)/boot/$@.elf $@.tmp

	rm -f $@.tmp vmlinux.tmp

arch/xtensa/boot/boot-elf/boot.ld→arch/xtensa/boot/boot-elf/boot.lds.S

+2 −1
Original line number Diff line number Diff line 
#include <asm/variant/core.h>

OUTPUT_ARCH(xtensa)

ENTRY(_ResetVector)
@@ -62,7 +63,7 @@ SECTIONS 
	_end = .;

	_param_start = .;



	.ResetVector.text 0xfe000020 :

	.ResetVector.text XCHAL_RESET_VECTOR_VADDR :

	{

		*(.ResetVector.text)

	}