Merge branch 'master' of ../linux-2.6/

4 files changed, 10 insertions, 7 deletions

diff --git a/arch/xtensa/boot/boot-elf/Makefile b/arch/xtensa/boot/boot-elf/Makefile
index 734db7f76583..08e8814f8c71 100644
--- a/arch/xtensa/boot/boot-elf/Makefile
+++ b/arch/xtensa/boot/boot-elf/Makefile
@@ -14,25 +14,26 @@ 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)
-        $(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \
+Image:  vmlinux $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds
+        $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -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
 
 Image.initrd:   vmlinux $(OBJS)
-        $(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \
+        $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \
                 --add-section .initrd=arch/$(ARCH)/boot/ramdisk \
                 --set-section-flags .initrd=contents,alloc,load,load,data \
                 vmlinux vmlinux.tmp
diff --git a/arch/xtensa/boot/boot-elf/boot.ld b/arch/xtensa/boot/boot-elf/boot.lds.S
index 4ab06a0a7a6b..849dfcafd518 100644
--- a/arch/xtensa/boot/boot-elf/boot.ld
+++ b/arch/xtensa/boot/boot-elf/boot.lds.S
@@ -1,4 +1,6 @@
+#include <asm/variant/core.h>
 OUTPUT_ARCH(xtensa)
+ENTRY(_ResetVector)
 
 SECTIONS
 {
@@ -61,7 +63,7 @@ SECTIONS
         _end = .;
         _param_start = .;
 
-        .ResetVector.text 0xfe000020 :
+        .ResetVector.text XCHAL_RESET_VECTOR_VADDR :
         {
                 *(.ResetVector.text)
         }
diff --git a/arch/xtensa/boot/boot-redboot/Makefile b/arch/xtensa/boot/boot-redboot/Makefile
index 74d15d08077b..872029b84435 100644
--- a/arch/xtensa/boot/boot-redboot/Makefile
+++ b/arch/xtensa/boot/boot-redboot/Makefile
@@ -22,7 +22,7 @@ LIBS	:= arch/xtensa/boot/lib/lib.a arch/xtensa/lib/lib.a
 LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
 zImage: vmlinux $(OBJS) $(LIBS)
-        $(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \
+        $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \
                 vmlinux vmlinux.tmp
         gzip -vf9 vmlinux.tmp
         $(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
diff --git a/arch/xtensa/boot/boot-redboot/boot.ld b/arch/xtensa/boot/boot-redboot/boot.ld
index 65b726410e8a..774db20d11f7 100644
--- a/arch/xtensa/boot/boot-redboot/boot.ld
+++ b/arch/xtensa/boot/boot-redboot/boot.ld
@@ -2,7 +2,7 @@ OUTPUT_ARCH(xtensa)
 
 SECTIONS
 {
-        .start 0xD0200000 : { *(.start) }
+        .start 0xD1000000 : { *(.start) }
 
         .text :
         {