From 989dd7ef05595c60d75b903e249d9a2129215f84 Mon Sep 17 00:00:00 2001
From: Bob Wilson <bwilson@heron.(none)>
Date: Fri, 1 Feb 2008 16:56:32 -0800
Subject: [PATCH] --- yaml --- r: 85947 b: refs/heads/master c:
 bdd362ff4ff8dc0c697ce87dbb337f3b7341fc46 h: refs/heads/master i:   85945:
 8b044035c44f42d2e15880c4dbefdba6a87439de   85943:
 c68a2d697f609a53e026b6f2c9dbdc3d1854a878 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/xtensa/boot/boot-elf/Makefile     | 4 ++--
 trunk/arch/xtensa/boot/boot-redboot/Makefile | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d306a413cb87..098ba58aff55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1088430626b2ec4cd64f2fb7d9fd7c6df5d5824
+refs/heads/master: bdd362ff4ff8dc0c697ce87dbb337f3b7341fc46
diff --git a/trunk/arch/xtensa/boot/boot-elf/Makefile b/trunk/arch/xtensa/boot/boot-elf/Makefile
index 9cf50ef465c1..08e8814f8c71 100644
--- a/trunk/arch/xtensa/boot/boot-elf/Makefile
+++ b/trunk/arch/xtensa/boot/boot-elf/Makefile
@@ -21,7 +21,7 @@ boot-y		:= bootstrap.o
 OBJS		:= $(addprefix $(obj)/,$(boot-y))
 
 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 .note.gnu.build-id -O binary \
 		vmlinux vmlinux.tmp
 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
 		--add-section image=vmlinux.tmp \
@@ -33,7 +33,7 @@ Image:	vmlinux $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds
 	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/trunk/arch/xtensa/boot/boot-redboot/Makefile b/trunk/arch/xtensa/boot/boot-redboot/Makefile
index 74d15d08077b..872029b84435 100644
--- a/trunk/arch/xtensa/boot/boot-redboot/Makefile
+++ b/trunk/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 \