| Message ID | 1459736970-21876-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Superseded |
| Headers | show |
Hi. Assuming no objection to this patch, I will put it into Russell's patch tracker after v4.7-rc1 is out. 2016-04-04 11:29 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>: > Commit 3939f3345050 ("ARM: 8418/1: add boot image dependencies to not > generate invalid images") fixed bad image generation in case of > parallel building, but as a side effect, Kbuild now descends into > arch/arm/boot/ again and again, duplicating the log messages. It is > clumsy, so let's display the same message only once. > > I moved the log rules from arch/arm/boot/Makefile to arch/arm/Makefile > rather than completely deleting them, 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 > <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp] > <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp] > 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: > > $ 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 > <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp] > <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp] > CHK include/generated/compile.h > Kernel: Image is ready > Kernel: zImage is ready > Kernel: uImage is ready > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> -- Best Regards Masahiro Yamada
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8c3ce2a..2c4eb54 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -326,6 +326,7 @@ zImage: Image $(BOOT_TARGETS): vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + @$(kecho) ' Kernel: $@ is ready' $(INSTALL_TARGETS): $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index 5be33a2..bdc1d5a 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -31,7 +31,7 @@ ifeq ($(CONFIG_XIP_KERNEL),y) $(obj)/xipImage: vmlinux FORCE $(call if_changed,objcopy) - @$(kecho) ' Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))' + @$(kecho) ' Physical Address of xipImage: $(CONFIG_XIP_PHYS_ADDR)' $(obj)/Image $(obj)/zImage: FORCE @echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)' @@ -46,14 +46,12 @@ $(obj)/xipImage: FORCE $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy) - @$(kecho) ' Kernel: $@ is ready' $(obj)/compressed/vmlinux: $(obj)/Image FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE $(call if_changed,objcopy) - @$(kecho) ' Kernel: $@ is ready' endif @@ -78,14 +76,12 @@ fi $(obj)/uImage: $(obj)/zImage FORCE @$(check_for_multiple_loadaddr) $(call if_changed,uimage) - @$(kecho) ' Image $@ is ready' $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE $(Q)$(MAKE) $(build)=$(obj)/bootp $@ $(obj)/bootpImage: $(obj)/bootp/bootp FORCE $(call if_changed,objcopy) - @$(kecho) ' Kernel: $@ is ready' PHONY += initrd install zinstall uinstall initrd:
Commit 3939f3345050 ("ARM: 8418/1: add boot image dependencies to not generate invalid images") fixed bad image generation in case of parallel building, but as a side effect, Kbuild now descends into arch/arm/boot/ again and again, duplicating the log messages. It is clumsy, so let's display the same message only once. I moved the log rules from arch/arm/boot/Makefile to arch/arm/Makefile rather than completely deleting them, 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 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp] <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp] 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: $ 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 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp] <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp] CHK include/generated/compile.h Kernel: Image is ready Kernel: zImage is ready Kernel: uImage is ready Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: - Do not delete, but move log rules arch/arm/Makefile | 1 + arch/arm/boot/Makefile | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) -- 1.9.1