[XTENSA] Use preprocessor to generate the linker script for the ELF boot image
Signed-off-by: Marc Gauthier <marc@tensilica.com> Signed-off-by: Chris Zankel <chris@zankel.net>
This commit is contained in:
parent
6d15d10963
commit
36dffadb7f
2 changed files with 5 additions and 3 deletions
|
@ -14,12 +14,13 @@ OBJCOPY_ARGS := -O elf32-xtensa-le
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export OBJCOPY_ARGS
|
export OBJCOPY_ARGS
|
||||||
|
export CPPFLAGS_boot.lds += -P -C
|
||||||
|
|
||||||
boot-y := bootstrap.o
|
boot-y := bootstrap.o
|
||||||
|
|
||||||
OBJS := $(addprefix $(obj)/,$(boot-y))
|
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 \
|
$(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \
|
||||||
vmlinux vmlinux.tmp
|
vmlinux vmlinux.tmp
|
||||||
$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
|
$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
|
||||||
|
@ -27,7 +28,7 @@ Image: vmlinux $(OBJS)
|
||||||
--set-section-flags image=contents,alloc,load,load,data \
|
--set-section-flags image=contents,alloc,load,load,data \
|
||||||
$(OBJS) $@.tmp
|
$(OBJS) $@.tmp
|
||||||
$(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \
|
$(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
|
-o arch/$(ARCH)/boot/$@.elf $@.tmp
|
||||||
rm -f $@.tmp vmlinux.tmp
|
rm -f $@.tmp vmlinux.tmp
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#include <asm/variant/core.h>
|
||||||
OUTPUT_ARCH(xtensa)
|
OUTPUT_ARCH(xtensa)
|
||||||
ENTRY(_ResetVector)
|
ENTRY(_ResetVector)
|
||||||
|
|
||||||
|
@ -62,7 +63,7 @@ SECTIONS
|
||||||
_end = .;
|
_end = .;
|
||||||
_param_start = .;
|
_param_start = .;
|
||||||
|
|
||||||
.ResetVector.text 0xfe000020 :
|
.ResetVector.text XCHAL_RESET_VECTOR_VADDR :
|
||||||
{
|
{
|
||||||
*(.ResetVector.text)
|
*(.ResetVector.text)
|
||||||
}
|
}
|
Reference in a new issue