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, 21 insertions, 10 deletions

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 4dd37552abc2..315ce2c7cb9d 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -279,6 +279,7 @@ static int child_count;
 static int single_menu_mode;
 static int show_all_options;
 static int save_and_exit;
+static int silent;
 
 static void conf(struct menu *menu, struct menu *active_menu);
 static void conf_choice(struct menu *menu);
@@ -777,10 +778,12 @@ static void conf_message_callback(const char *fmt, va_list ap)
         char buf[PATH_MAX+1];
 
         vsnprintf(buf, sizeof(buf), fmt, ap);
-        if (save_and_exit)
-                printf("%s", buf);
-        else
+        if (save_and_exit) {
+                if (!silent)
+                        printf("%s", buf);
+        } else {
                 show_textbox(NULL, buf, 6, 60);
+        }
 }
 
 static void show_help(struct menu *menu)
@@ -977,16 +980,18 @@ static int handle_exit(void)
                 }
                 /* fall through */
         case -1:
-                printf(_("\n\n"
-                         "*** End of the configuration.\n"
-                         "*** Execute 'make' to start the build or try 'make help'."
-                         "\n\n"));
+                if (!silent)
+                        printf(_("\n\n"
+                                 "*** End of the configuration.\n"
+                                 "*** Execute 'make' to start the build or try 'make help'."
+                                 "\n\n"));
                 res = 0;
                 break;
         default:
-                fprintf(stderr, _("\n\n"
-                                  "Your configuration changes were NOT saved."
-                                  "\n\n"));
+                if (!silent)
+                        fprintf(stderr, _("\n\n"
+                                          "Your configuration changes were NOT saved."
+                                          "\n\n"));
                 if (res != KEY_ESC)
                         res = 0;
         }
@@ -1010,6 +1015,12 @@ int main(int ac, char **av)
 
         signal(SIGINT, sig_handler);
 
+        if (ac > 1 && strcmp(av[1], "-s") == 0) {
+                silent = 1;
+                /* Silence conf_read() until the real callback is set up */
+                conf_set_message_callback(NULL);
+                av++;
+        }
         conf_parse(av[1]);
         conf_read(NULL);