diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-05-29 22:01:23 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-06-22 14:55:12 -0400 |
commit | c6bbfbb729e88188b7c9113d58647766db03f1d4 (patch) | |
tree | a63fee6615a7e94a2cc2be3c794c6f565adef8e0 /arch/arm/boot/Makefile | |
parent | cb6f8344f8780d75929c6a20f1f094d2585003f4 (diff) |
ARM: 8576/1: avoid duplicating "Kernel: arch/arm/boot/*Image is ready"
Commit 3939f3345050 ("ARM: 8418/1: add boot image dependencies to
not generate invalid images") fixed bad image generation for the
parallel building, but as its side effect, Kbuild now descends into
arch/arm/boot/ again and again, duplicating the log messages.
It looks clumsy, so let's display the same message only once.
This commit moves the log rules from arch/arm/boot/Makefile to
arch/arm/Makefile. I did not delete them completely because *Image
are the final targets that users are interested in.
Without this commit, the log of incremental build is like follows:
$ make ARCH=arm UIMAGE_LOADADDR=0x80208000 uImage
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CHK include/generated/compile.h
Kernel: arch/arm/boot/Image is ready
Kernel: arch/arm/boot/Image is ready
Kernel: arch/arm/boot/zImage is ready
Kernel: arch/arm/boot/Image is ready
Kernel: arch/arm/boot/zImage is ready
Image arch/arm/boot/uImage is ready
With this commit, it will look like follows:
$ make ARCH=arm UIMAGE_LOADADDR=0x80208000 uImage
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CHK include/generated/compile.h
Kernel: arch/arm/boot/Image is ready
Kernel: arch/arm/boot/zImage is ready
Kernel: arch/arm/boot/uImage is ready
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot/Makefile')
-rw-r--r-- | arch/arm/boot/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index 5be33a2d59a9..bdc1d5af03d2 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile | |||
@@ -31,7 +31,7 @@ ifeq ($(CONFIG_XIP_KERNEL),y) | |||
31 | 31 | ||
32 | $(obj)/xipImage: vmlinux FORCE | 32 | $(obj)/xipImage: vmlinux FORCE |
33 | $(call if_changed,objcopy) | 33 | $(call if_changed,objcopy) |
34 | @$(kecho) ' Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))' | 34 | @$(kecho) ' Physical Address of xipImage: $(CONFIG_XIP_PHYS_ADDR)' |
35 | 35 | ||
36 | $(obj)/Image $(obj)/zImage: FORCE | 36 | $(obj)/Image $(obj)/zImage: FORCE |
37 | @echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)' | 37 | @echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)' |
@@ -46,14 +46,12 @@ $(obj)/xipImage: FORCE | |||
46 | 46 | ||
47 | $(obj)/Image: vmlinux FORCE | 47 | $(obj)/Image: vmlinux FORCE |
48 | $(call if_changed,objcopy) | 48 | $(call if_changed,objcopy) |
49 | @$(kecho) ' Kernel: $@ is ready' | ||
50 | 49 | ||
51 | $(obj)/compressed/vmlinux: $(obj)/Image FORCE | 50 | $(obj)/compressed/vmlinux: $(obj)/Image FORCE |
52 | $(Q)$(MAKE) $(build)=$(obj)/compressed $@ | 51 | $(Q)$(MAKE) $(build)=$(obj)/compressed $@ |
53 | 52 | ||
54 | $(obj)/zImage: $(obj)/compressed/vmlinux FORCE | 53 | $(obj)/zImage: $(obj)/compressed/vmlinux FORCE |
55 | $(call if_changed,objcopy) | 54 | $(call if_changed,objcopy) |
56 | @$(kecho) ' Kernel: $@ is ready' | ||
57 | 55 | ||
58 | endif | 56 | endif |
59 | 57 | ||
@@ -78,14 +76,12 @@ fi | |||
78 | $(obj)/uImage: $(obj)/zImage FORCE | 76 | $(obj)/uImage: $(obj)/zImage FORCE |
79 | @$(check_for_multiple_loadaddr) | 77 | @$(check_for_multiple_loadaddr) |
80 | $(call if_changed,uimage) | 78 | $(call if_changed,uimage) |
81 | @$(kecho) ' Image $@ is ready' | ||
82 | 79 | ||
83 | $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE | 80 | $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE |
84 | $(Q)$(MAKE) $(build)=$(obj)/bootp $@ | 81 | $(Q)$(MAKE) $(build)=$(obj)/bootp $@ |
85 | 82 | ||
86 | $(obj)/bootpImage: $(obj)/bootp/bootp FORCE | 83 | $(obj)/bootpImage: $(obj)/bootp/bootp FORCE |
87 | $(call if_changed,objcopy) | 84 | $(call if_changed,objcopy) |
88 | @$(kecho) ' Kernel: $@ is ready' | ||
89 | 85 | ||
90 | PHONY += initrd install zinstall uinstall | 86 | PHONY += initrd install zinstall uinstall |
91 | initrd: | 87 | initrd: |