aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--arch/blackfin/boot/Makefile2
-rw-r--r--scripts/Kbuild.include11
3 files changed, 7 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 307558621913..3a6ac688f38d 100644
--- a/Makefile
+++ b/Makefile
@@ -926,7 +926,7 @@ PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3
926# 2) Create the include2 directory, used for the second asm symlink 926# 2) Create the include2 directory, used for the second asm symlink
927prepare3: include/config/kernel.release 927prepare3: include/config/kernel.release
928ifneq ($(KBUILD_SRC),) 928ifneq ($(KBUILD_SRC),)
929 @echo ' Using $(srctree) as source for kernel' 929 @$(kecho) ' Using $(srctree) as source for kernel'
930 $(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \ 930 $(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \
931 echo " $(srctree) is not clean, please run 'make mrproper'";\ 931 echo " $(srctree) is not clean, please run 'make mrproper'";\
932 echo " in the '$(srctree)' directory.";\ 932 echo " in the '$(srctree)' directory.";\
@@ -983,7 +983,7 @@ endef
983# directory for generated filesas used by some architectures. 983# directory for generated filesas used by some architectures.
984define create-symlink 984define create-symlink
985 if [ ! -L include/asm ]; then \ 985 if [ ! -L include/asm ]; then \
986 echo ' SYMLINK $@ -> include/asm-$(SRCARCH)'; \ 986 $(kecho) ' SYMLINK $@ -> include/asm-$(SRCARCH)'; \
987 if [ ! -d include/asm-$(SRCARCH) ]; then \ 987 if [ ! -d include/asm-$(SRCARCH) ]; then \
988 mkdir -p include/asm-$(SRCARCH); \ 988 mkdir -p include/asm-$(SRCARCH); \
989 fi; \ 989 fi; \
@@ -1096,7 +1096,7 @@ all: modules
1096PHONY += modules 1096PHONY += modules
1097modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) 1097modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
1098 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order 1098 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
1099 @echo ' Building modules, stage 2.'; 1099 @$(kecho) ' Building modules, stage 2.';
1100 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost 1100 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
1101 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild 1101 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
1102 1102
@@ -1360,7 +1360,7 @@ $(module-dirs): crmodverdir $(objtree)/Module.symvers
1360 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) 1360 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
1361 1361
1362modules: $(module-dirs) 1362modules: $(module-dirs)
1363 @echo ' Building modules, stage 2.'; 1363 @$(kecho) ' Building modules, stage 2.';
1364 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost 1364 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
1365 1365
1366PHONY += modules_install 1366PHONY += modules_install
diff --git a/arch/blackfin/boot/Makefile b/arch/blackfin/boot/Makefile
index 522f3c124060..e028d13481a9 100644
--- a/arch/blackfin/boot/Makefile
+++ b/arch/blackfin/boot/Makefile
@@ -25,7 +25,7 @@ $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE
25 25
26$(obj)/vmImage: $(obj)/vmlinux.gz 26$(obj)/vmImage: $(obj)/vmlinux.gz
27 $(call if_changed,uimage) 27 $(call if_changed,uimage)
28 @echo 'Kernel: $@ is ready' 28 @$(kecho) 'Kernel: $@ is ready'
29 29
30install: 30install:
31 sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" 31 sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 8cf87e815e51..c29be8f90248 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -46,22 +46,15 @@ kecho := $($(quiet)kecho)
46# - If they are equal no change, and no timestamp update 46# - If they are equal no change, and no timestamp update
47# - stdin is piped in from the first prerequisite ($<) so one has 47# - stdin is piped in from the first prerequisite ($<) so one has
48# to specify a valid file as first prerequisite (often the kbuild file) 48# to specify a valid file as first prerequisite (often the kbuild file)
49 chk_filechk = :
50 quiet_chk_filechk = echo ' CHK $@'
51silent_chk_filechk = :
52 upd_filechk = :
53 quiet_upd_filechk = echo ' UPD $@'
54silent_upd_filechk = :
55
56define filechk 49define filechk
57 $(Q)set -e; \ 50 $(Q)set -e; \
58 $($(quiet)chk_filechk); \ 51 $(kecho) ' CHK $@'; \
59 mkdir -p $(dir $@); \ 52 mkdir -p $(dir $@); \
60 $(filechk_$(1)) < $< > $@.tmp; \ 53 $(filechk_$(1)) < $< > $@.tmp; \
61 if [ -r $@ ] && cmp -s $@ $@.tmp; then \ 54 if [ -r $@ ] && cmp -s $@ $@.tmp; then \
62 rm -f $@.tmp; \ 55 rm -f $@.tmp; \
63 else \ 56 else \
64 $($(quiet)upd_filechk); \ 57 $(kecho) ' UPD $@'; \
65 mv -f $@.tmp $@; \ 58 mv -f $@.tmp $@; \
66 fi 59 fi
67endef 60endef