diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2012-09-17 05:44:49 +0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2012-10-03 15:12:29 -0700 |
| commit | 7c94fe4a012e6d0858b9a80cbc18b7ee788f572d (patch) | |
| tree | 4d1263bbc227bf9049c072badc8af4086a6034a4 | |
| parent | d0fccc0446800a746d109d5c202a4a550036d923 (diff) | |
| download | linux-7c94fe4a012e6d0858b9a80cbc18b7ee788f572d.tar.gz linux-7c94fe4a012e6d0858b9a80cbc18b7ee788f572d.tar.bz2 linux-7c94fe4a012e6d0858b9a80cbc18b7ee788f572d.zip | |
xtensa: fix parallel make
Make vmlinux.tmp and vmlinux.tmp.gz separate build targets, avoid
removing vmlinux.tmp during vmlinux.tmp.gz build.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
| -rw-r--r-- | arch/xtensa/boot/boot-elf/Makefile | 9 | ||||
| -rw-r--r-- | arch/xtensa/boot/boot-redboot/Makefile | 12 |
2 files changed, 12 insertions, 9 deletions
diff --git a/arch/xtensa/boot/boot-elf/Makefile b/arch/xtensa/boot/boot-elf/Makefile index 08e8814f8c71..4bbc26f797f1 100644 --- a/arch/xtensa/boot/boot-elf/Makefile +++ b/arch/xtensa/boot/boot-elf/Makefile @@ -20,9 +20,11 @@ boot-y := bootstrap.o OBJS := $(addprefix $(obj)/,$(boot-y)) -Image: vmlinux $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds +vmlinux.tmp: vmlinux $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \ - vmlinux vmlinux.tmp + $^ $@ + +Image: vmlinux.tmp $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds $(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \ --add-section image=vmlinux.tmp \ --set-section-flags image=contents,alloc,load,load,data \ @@ -30,7 +32,6 @@ Image: vmlinux $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \ -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 .note.gnu.build-id -O binary \ @@ -44,7 +45,7 @@ Image.initrd: vmlinux $(OBJS) $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \ -T $(srctree)/arch/$(ARCH)/boot/boot-elf/boot.ld \ -o arch/$(ARCH)/boot/$@.elf $@.tmp - rm -f $@.tmp vmlinux.tmp +#rm -f $@.tmp vmlinux.tmp zImage: Image diff --git a/arch/xtensa/boot/boot-redboot/Makefile b/arch/xtensa/boot/boot-redboot/Makefile index 872029b84435..25a78c6b1530 100644 --- a/arch/xtensa/boot/boot-redboot/Makefile +++ b/arch/xtensa/boot/boot-redboot/Makefile @@ -21,15 +21,17 @@ 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) +vmlinux.tmp: vmlinux $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \ - vmlinux vmlinux.tmp - gzip -vf9 vmlinux.tmp + $^ $@ + +vmlinux.tmp.gz: vmlinux.tmp + $(GZIP) $(GZIP_FLAGS) $^ > $@ + +zImage: vmlinux.tmp.gz $(OBJS) $(LIBS) $(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \ --add-section image=vmlinux.tmp.gz \ --set-section-flags image=contents,alloc,load,load,data \ $(OBJS) $@.tmp $(LD) $(LD_ARGS) -o $@.elf $@.tmp $(LIBS) -L/xtensa-elf/lib $(LIBGCC) $(OBJCOPY) -S -O binary $@.elf arch/$(ARCH)/boot/$@.redboot - rm -f $@.tmp $@.elf vmlinux.tmp.gz - |