---

yaml --- r: 85940 b: refs/heads/master c: 36dffad h: refs/heads/master v: v3
git-mirror · Feb 14, 2008 · dbc3b99 · dbc3b99
1 parent 001f1ff
commit dbc3b99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d15d109632ff01e13c26893030e2ed9e6c4e3fd
+refs/heads/master: 36dffadb7f19671aab58be43c5896ea87d5fb1bf
diff --git a/trunk/arch/xtensa/boot/boot-elf/Makefile b/trunk/arch/xtensa/boot/boot-elf/Makefile
@@ -14,20 +14,21 @@ 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 \
 		--add-section image=vmlinux.tmp \
 		--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
 

diff --git a/trunk/arch/xtensa/boot/boot-elf/boot.ld → trunk/arch/xtensa/boot/boot-elf/boot.lds.S b/trunk/arch/xtensa/boot/boot-elf/boot.ld → trunk/arch/xtensa/boot/boot-elf/boot.lds.S
@@ -1,3 +1,4 @@
+#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)
 	}