efi_loader: fix 'efidebug boot dump'

[oweals/u-boot.git] / scripts / kconfig / conf.c

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 671ff53644978e1179b5ec080e991acfb84a09de..c54ff0453c34978513c41c9c0e1b9b045bf5d23a 100644 (file)
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -496,6 +496,7 @@ int main(int ac, char **av)
        int opt;
        const char *name, *defconfig_file = NULL /* gcc uninit */;
        struct stat tmpstat;
+       int no_conf_write = 0;
 
        tty_stdio = isatty(0) && isatty(1);
 
@@ -507,6 +508,11 @@ int main(int ac, char **av)
                input_mode = (enum input_mode)opt;
                switch (opt) {
                case syncconfig:
+                       /*
+                        * syncconfig is invoked during the build stage.
+                        * Suppress distracting "configuration written to ..."
+                        */
+                       conf_set_message_callback(NULL);
                        sync_kconfig = 1;
                        break;
                case defconfig:
@@ -633,13 +639,14 @@ int main(int ac, char **av)
        }
 
        if (sync_kconfig) {
-               if (conf_get_changed()) {
-                       name = getenv("KCONFIG_NOSILENTUPDATE");
-                       if (name && *name) {
+               name = getenv("KCONFIG_NOSILENTUPDATE");
+               if (name && *name) {
+                       if (conf_get_changed()) {
                                fprintf(stderr,
                                        "\n*** The configuration requires explicit update.\n\n");
                                return 1;
                        }
+                       no_conf_write = 1;
                }
        }
 
@@ -688,7 +695,7 @@ int main(int ac, char **av)
                /* syncconfig is used during the build so we shall update autoconf.
                 * All other commands are only used to generate a config.
                 */
-               if (conf_get_changed() && conf_write(NULL)) {
+               if (!no_conf_write && conf_write(NULL)) {
                        fprintf(stderr, "\n*** Error during writing of the configuration.\n\n");
                        exit(1);
                }