kconfig: Do not print status messages in make -s mode

Add an -s option to the various frontends and pass it when make -s is
used. Also, use $(kecho) instead of @echo in the Makefile.

Signed-off-by: Michal Marek <mmarek@suse.cz>

1 files changed, 22 insertions, 18 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 1f5e45355731..d9b1fef0c67e 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -11,27 +11,31 @@ else
 Kconfig := Kconfig
 endif
 
+ifeq ($(quiet),silent_)
+silent := -s
+endif
+
 # We need this, in case the user has it in its environment
 unexport CONFIG_
 
 xconfig: $(obj)/qconf
-        $< $(Kconfig)
+        $< $(silent) $(Kconfig)
 
 gconfig: $(obj)/gconf
-        $< $(Kconfig)
+        $< $(silent) $(Kconfig)
 
 menuconfig: $(obj)/mconf
-        $< $(Kconfig)
+        $< $(silent) $(Kconfig)
 
 config: $(obj)/conf
-        $< --oldaskconfig $(Kconfig)
+        $< $(silent) --oldaskconfig $(Kconfig)
 
 nconfig: $(obj)/nconf
-        $< $(Kconfig)
+        $< $(silent) $(Kconfig)
 
 silentoldconfig: $(obj)/conf
         $(Q)mkdir -p include/config include/generated
-        $< --$@ $(Kconfig)
+        $< $(silent) --$@ $(Kconfig)
 
 localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
         $(Q)mkdir -p include/config include/generated
@@ -40,18 +44,18 @@ localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
                         cmp -s .tmp.config .config ||                   \
                         (mv -f .config .config.old.1;                   \
                          mv -f .tmp.config .config;                     \
-                         $(obj)/conf --silentoldconfig $(Kconfig);      \
+                         $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
                          mv -f .config.old.1 .config.old)               \
         else                                                            \
                         mv -f .tmp.config .config;                      \
-                        $(obj)/conf --silentoldconfig $(Kconfig);       \
+                        $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
         fi
         $(Q)rm -f .tmp.config
 
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
 update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
-        $(Q)echo "  GEN     config.pot"
+        $(Q)$(kecho) "  GEN     config.pot"
         $(Q)xgettext --default-domain=linux                         \
             --add-comments --keyword=_ --keyword=N_                 \
             --from-code=UTF-8                                       \
@@ -62,11 +66,11 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
         $(Q)(for i in `ls $(srctree)/arch/*/Kconfig      \
             $(srctree)/arch/*/um/Kconfig`;               \
             do                                           \
-                echo "  GEN     $$i";                    \
+                $(kecho) "  GEN     $$i";                    \
                 $(obj)/kxgettext $$i                     \
                      >> $(obj)/config.pot;               \
             done )
-        $(Q)echo "  GEN     linux.pot"
+        $(Q)$(kecho) "  GEN     linux.pot"
         $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
             --output $(obj)/linux.pot
         $(Q)rm -f $(obj)/config.pot
@@ -77,7 +81,7 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
 PHONY += $(simple-targets)
 
 $(simple-targets): $(obj)/conf
-        $< --$@ $(Kconfig)
+        $< $(silent) --$@ $(Kconfig)
 
 PHONY += oldnoconfig savedefconfig defconfig
 
@@ -87,18 +91,18 @@ PHONY += oldnoconfig savedefconfig defconfig
 oldnoconfig: olddefconfig
 
 savedefconfig: $(obj)/conf
-        $< --$@=defconfig $(Kconfig)
+        $< $(silent) --$@=defconfig $(Kconfig)
 
 defconfig: $(obj)/conf
 ifeq ($(KBUILD_DEFCONFIG),)
-        $< --defconfig $(Kconfig)
+        $< $(silent) --defconfig $(Kconfig)
 else
-        @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
-        $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+        @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
+        $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
 endif
 
 %_defconfig: $(obj)/conf
-        $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
+        $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
 
 configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
 
@@ -215,7 +219,7 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile
 
 # QT needs some extra effort...
 $(obj)/.tmp_qtcheck:
-        @set -e; echo "  CHECK   qt"; dir=""; pkg=""; \
+        @set -e; $(kecho) "  CHECK   qt"; dir=""; pkg=""; \
         if ! pkg-config --exists QtCore 2> /dev/null; then \
             echo "* Unable to find the QT4 tool qmake. Trying to use QT3"; \
             pkg-config --exists qt 2> /dev/null && pkg=qt; \