1 files changed, 5 insertions, 4 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