diff options
| author | Bob Wilson <bwilson@heron.(none)> | 2008-02-01 19:56:32 -0500 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2008-02-13 20:45:05 -0500 |
| commit | bdd362ff4ff8dc0c697ce87dbb337f3b7341fc46 (patch) | |
| tree | 638650c47d44bc536151d6655e9c43d7a77200e6 /arch | |
| parent | e1088430626b2ec4cd64f2fb7d9fd7c6df5d5824 (diff) | |
[XTENSA] Fix makefile to work with binutils-2.18.
When building with binutils-2.18, vmlinux includes .note.gnu.build-id
sections that need to be stripped out when building the binary image.
The old .xt.insn sections haven't been used for a long time, so don't
bother stripping them.
Signed-off-by: Bob Wilson <bob.wilson@acm.org>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/xtensa/boot/boot-elf/Makefile | 4 | ||||
| -rw-r--r-- | arch/xtensa/boot/boot-redboot/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/xtensa/boot/boot-elf/Makefile b/arch/xtensa/boot/boot-elf/Makefile index 9cf50ef465c1..08e8814f8c71 100644 --- a/arch/xtensa/boot/boot-elf/Makefile +++ b/arch/xtensa/boot/boot-elf/Makefile | |||
| @@ -21,7 +21,7 @@ boot-y := bootstrap.o | |||
| 21 | OBJS := $(addprefix $(obj)/,$(boot-y)) | 21 | OBJS := $(addprefix $(obj)/,$(boot-y)) |
| 22 | 22 | ||
| 23 | Image: vmlinux $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds | 23 | Image: vmlinux $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds |
| 24 | $(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \ | 24 | $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \ |
| 25 | vmlinux vmlinux.tmp | 25 | vmlinux vmlinux.tmp |
| 26 | $(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \ | 26 | $(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \ |
| 27 | --add-section image=vmlinux.tmp \ | 27 | --add-section image=vmlinux.tmp \ |
| @@ -33,7 +33,7 @@ Image: vmlinux $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds | |||
| 33 | rm -f $@.tmp vmlinux.tmp | 33 | rm -f $@.tmp vmlinux.tmp |
| 34 | 34 | ||
| 35 | Image.initrd: vmlinux $(OBJS) | 35 | Image.initrd: vmlinux $(OBJS) |
| 36 | $(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \ | 36 | $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \ |
| 37 | --add-section .initrd=arch/$(ARCH)/boot/ramdisk \ | 37 | --add-section .initrd=arch/$(ARCH)/boot/ramdisk \ |
| 38 | --set-section-flags .initrd=contents,alloc,load,load,data \ | 38 | --set-section-flags .initrd=contents,alloc,load,load,data \ |
| 39 | vmlinux vmlinux.tmp | 39 | vmlinux vmlinux.tmp |
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 | |||
| 22 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) | 22 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) |
| 23 | 23 | ||
| 24 | zImage: vmlinux $(OBJS) $(LIBS) | 24 | zImage: vmlinux $(OBJS) $(LIBS) |
| 25 | $(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \ | 25 | $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \ |
| 26 | vmlinux vmlinux.tmp | 26 | vmlinux vmlinux.tmp |
| 27 | gzip -vf9 vmlinux.tmp | 27 | gzip -vf9 vmlinux.tmp |
| 28 | $(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \ | 28 | $(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \ |