[PATCH] kconfig: preset config during all*config

[firefly-linux-kernel-4.4.55.git] / scripts / kconfig / confdata.c

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 02f670cc6bb9350f6db1ea2ecd14513565ca3746..4bba6202b79e6e6603db197934b387257be82909 100644 (file)
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -69,15 +69,13 @@ char *conf_get_default_confname(void)
        return name;
 }
 
-int conf_read(const char *name)
+int conf_read_simple(const char *name)
 {
        FILE *in = NULL;
        char line[1024];
        char *p, *p2;
        int lineno = 0;
        struct symbol *sym;
-       struct property *prop;
-       struct expr *e;
        int i;
 
        if (name) {
@@ -232,6 +230,19 @@ int conf_read(const char *name)
 
        if (modules_sym)
                sym_calc_value(modules_sym);
+       return 0;
+}
+
+int conf_read(const char *name)
+{
+       struct symbol *sym;
+       struct property *prop;
+       struct expr *e;
+       int i;
+
+       if (conf_read_simple(name))
+               return 1;
+
        for_all_symbols(i, sym) {
                sym_calc_value(sym);
                if (sym_has_value(sym) && !sym_is_choice_value(sym)) {