Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6722df86 authored by Josh Cartwright's avatar Josh Cartwright Committed by Russell King
Browse files

ARM: 7570/1: quiet down the non make -s output 



Commit edc88ceb silenced the make -s build, but
inadvertently made louder the non-silent build.  Fix by prepending '@' to each
of the added $(kecho) statements.

Build with edc88ceb:

  CHK     include/generated/compile.h
echo '  Kernel: arch/arm/boot/Image is ready'
  Kernel: arch/arm/boot/Image is ready
  LD      arch/arm/boot/compressed/vmlinux
  OBJCOPY arch/arm/boot/zImage
echo '  Kernel: arch/arm/boot/zImage is ready'
  Kernel: arch/arm/boot/zImage is ready

Build with this fix:
  CHK     include/generated/compile.h
  Kernel: arch/arm/boot/Image is ready
  LD      arch/arm/boot/compressed/vmlinux
  OBJCOPY arch/arm/boot/zImage
  Kernel: arch/arm/boot/zImage is ready

Signed-off-by: default avatarJosh Cartwright <josh.cartwright@ni.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6404f0b7

arch/arm/boot/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,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) '  Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))'



$(obj)/Image $(obj)/zImage: FORCE

	@echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)'
@@ -48,14 +48,14 @@ $(obj)/xipImage: FORCE 


$(obj)/Image: vmlinux FORCE

	$(call if_changed,objcopy)

	$(kecho) '  Kernel: $@ is ready'

	@$(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'

	@$(kecho) '  Kernel: $@ is ready'



endif
@@ -90,7 +90,7 @@ fi 
$(obj)/uImage:	$(obj)/zImage FORCE

	@$(check_for_multiple_loadaddr)

	$(call if_changed,uimage)

	$(kecho) '  Image $@ is ready'

	@$(kecho) '  Image $@ is ready'



$(obj)/bootp/bootp: $(obj)/zImage initrd FORCE

	$(Q)$(MAKE) $(build)=$(obj)/bootp $@
@@ -98,7 +98,7 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE 


$(obj)/bootpImage: $(obj)/bootp/bootp FORCE

	$(call if_changed,objcopy)

	$(kecho) '  Kernel: $@ is ready'

	@$(kecho) '  Kernel: $@ is ready'



PHONY += initrd FORCE

initrd:

arch/arm/tools/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ 
#



include/generated/mach-types.h: $(src)/gen-mach-types $(src)/mach-types

	$(kecho) '  Generating $@'

	@$(kecho) '  Generating $@'

	@mkdir -p $(dir $@)

	$(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }