Merge branch 'master' into for-linus

1 files changed, 152 insertions, 69 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index c4dec80cfd8e..f81f263b64f2 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -170,8 +170,11 @@ int conf_read_simple(const char *name, int def)
                 if (in)
                         goto load;
                 sym_add_change_count(1);
-                if (!sym_defconfig_list)
+                if (!sym_defconfig_list) {
+                        if (modules_sym)
+                                sym_calc_value(modules_sym);
                         return 1;
+                }
 
                 for_all_defaults(sym_defconfig_list, prop) {
                         if (expr_calc_value(prop->visible.expr) == no ||
@@ -396,15 +399,149 @@ int conf_read(const char *name)
         return 0;
 }
 
+/* Write a S_STRING */
+static void conf_write_string(bool headerfile, const char *name,
+                              const char *str, FILE *out)
+{
+        int l;
+        if (headerfile)
+                fprintf(out, "#define CONFIG_%s \"", name);
+        else
+                fprintf(out, "CONFIG_%s=\"", name);
+
+        while (1) {
+                l = strcspn(str, "\"\\");
+                if (l) {
+                        fwrite(str, l, 1, out);
+                        str += l;
+                }
+                if (!*str)
+                        break;
+                fprintf(out, "\\%c", *str++);
+        }
+        fputs("\"\n", out);
+}
+
+static void conf_write_symbol(struct symbol *sym, enum symbol_type type,
+                              FILE *out, bool write_no)
+{
+        const char *str;
+
+        switch (type) {
+        case S_BOOLEAN:
+        case S_TRISTATE:
+                switch (sym_get_tristate_value(sym)) {
+                case no:
+                        if (write_no)
+                                fprintf(out, "# CONFIG_%s is not set\n", sym->name);
+                        break;
+                case mod:
+                        fprintf(out, "CONFIG_%s=m\n", sym->name);
+                        break;
+                case yes:
+                        fprintf(out, "CONFIG_%s=y\n", sym->name);
+                        break;
+                }
+                break;
+        case S_STRING:
+                conf_write_string(false, sym->name, sym_get_string_value(sym), out);
+                break;
+        case S_HEX:
+        case S_INT:
+                str = sym_get_string_value(sym);
+                fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
+                break;
+        case S_OTHER:
+        case S_UNKNOWN:
+                break;
+        }
+}
+
+/*
+ * Write out a minimal config.
+ * All values that has default values are skipped as this is redundant.
+ */
+int conf_write_defconfig(const char *filename)
+{
+        struct symbol *sym;
+        struct menu *menu;
+        FILE *out;
+
+        out = fopen(filename, "w");
+        if (!out)
+                return 1;
+
+        sym_clear_all_valid();
+
+        /* Traverse all menus to find all relevant symbols */
+        menu = rootmenu.list;
+
+        while (menu != NULL)
+        {
+                sym = menu->sym;
+                if (sym == NULL) {
+                        if (!menu_is_visible(menu))
+                                goto next_menu;
+                } else if (!sym_is_choice(sym)) {
+                        sym_calc_value(sym);
+                        if (!(sym->flags & SYMBOL_WRITE))
+                                goto next_menu;
+                        sym->flags &= ~SYMBOL_WRITE;
+                        /* If we cannot change the symbol - skip */
+                        if (!sym_is_changable(sym))
+                                goto next_menu;
+                        /* If symbol equals to default value - skip */
+                        if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0)
+                                goto next_menu;
+
+                        /*
+                         * If symbol is a choice value and equals to the
+                         * default for a choice - skip.
+                         * But only if value equal to "y".
+                         */
+                        if (sym_is_choice_value(sym)) {
+                                struct symbol *cs;
+                                struct symbol *ds;
+
+                                cs = prop_get_symbol(sym_get_choice_prop(sym));
+                                ds = sym_choice_default(cs);
+                                if (sym == ds) {
+                                        if ((sym->type == S_BOOLEAN ||
+                                        sym->type == S_TRISTATE) &&
+                                        sym_get_tristate_value(sym) == yes)
+                                                goto next_menu;
+                                }
+                        }
+                        conf_write_symbol(sym, sym->type, out, true);
+                }
+next_menu:
+                if (menu->list != NULL) {
+                        menu = menu->list;
+                }
+                else if (menu->next != NULL) {
+                        menu = menu->next;
+                } else {
+                        while ((menu = menu->parent)) {
+                                if (menu->next != NULL) {
+                                        menu = menu->next;
+                                        break;
+                                }
+                        }
+                }
+        }
+        fclose(out);
+        return 0;
+}
+
 int conf_write(const char *name)
 {
         FILE *out;
         struct symbol *sym;
         struct menu *menu;
         const char *basename;
-        char dirname[128], tmpname[128], newname[128];
-        int type, l;
         const char *str;
+        char dirname[128], tmpname[128], newname[128];
+        enum symbol_type type;
         time_t now;
         int use_timestamp = 1;
         char *env;
@@ -484,50 +621,11 @@ int conf_write(const char *name)
                                 if (modules_sym->curr.tri == no)
                                         type = S_BOOLEAN;
                         }
-                        switch (type) {
-                        case S_BOOLEAN:
-                        case S_TRISTATE:
-                                switch (sym_get_tristate_value(sym)) {
-                                case no:
-                                        fprintf(out, "# CONFIG_%s is not set\n", sym->name);
-                                        break;
-                                case mod:
-                                        fprintf(out, "CONFIG_%s=m\n", sym->name);
-                                        break;
-                                case yes:
-                                        fprintf(out, "CONFIG_%s=y\n", sym->name);
-                                        break;
-                                }
-                                break;
-                        case S_STRING:
-                                str = sym_get_string_value(sym);
-                                fprintf(out, "CONFIG_%s=\"", sym->name);
-                                while (1) {
-                                        l = strcspn(str, "\"\\");
-                                        if (l) {
-                                                fwrite(str, l, 1, out);
-                                                str += l;
-                                        }
-                                        if (!*str)
-                                                break;
-                                        fprintf(out, "\\%c", *str++);
-                                }
-                                fputs("\"\n", out);
-                                break;
-                        case S_HEX:
-                                str = sym_get_string_value(sym);
-                                if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
-                                        fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
-                                        break;
-                                }
-                        case S_INT:
-                                str = sym_get_string_value(sym);
-                                fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
-                                break;
-                        }
+                        /* Write config symbol to file */
+                        conf_write_symbol(sym, type, out, true);
                 }
 
-        next:
+next:
                 if (menu->list) {
                         menu = menu->list;
                         continue;
@@ -679,7 +777,7 @@ int conf_write_autoconf(void)
         const char *name;
         FILE *out, *tristate, *out_h;
         time_t now;
-        int i, l;
+        int i;
 
         sym_clear_all_valid();
 
@@ -729,6 +827,11 @@ int conf_write_autoconf(void)
                 sym_calc_value(sym);
                 if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
                         continue;
+
+                /* write symbol to config file */
+                conf_write_symbol(sym, sym->type, out, false);
+
+                /* update autoconf and tristate files */
                 switch (sym->type) {
                 case S_BOOLEAN:
                 case S_TRISTATE:
@@ -736,12 +839,10 @@ int conf_write_autoconf(void)
                         case no:
                                 break;
                         case mod:
-                                fprintf(out, "CONFIG_%s=m\n", sym->name);
                                 fprintf(tristate, "CONFIG_%s=M\n", sym->name);
                                 fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
                                 break;
                         case yes:
-                                fprintf(out, "CONFIG_%s=y\n", sym->name);
                                 if (sym->type == S_TRISTATE)
                                         fprintf(tristate, "CONFIG_%s=Y\n",
                                                         sym->name);
@@ -750,35 +851,16 @@ int conf_write_autoconf(void)
                         }
                         break;
                 case S_STRING:
-                        str = sym_get_string_value(sym);
-                        fprintf(out, "CONFIG_%s=\"", sym->name);
-                        fprintf(out_h, "#define CONFIG_%s \"", sym->name);
-                        while (1) {
-                                l = strcspn(str, "\"\\");
-                                if (l) {
-                                        fwrite(str, l, 1, out);
-                                        fwrite(str, l, 1, out_h);
-                                        str += l;
-                                }
-                                if (!*str)
-                                        break;
-                                fprintf(out, "\\%c", *str);
-                                fprintf(out_h, "\\%c", *str);
-                                str++;
-                        }
-                        fputs("\"\n", out);
-                        fputs("\"\n", out_h);
+                        conf_write_string(true, sym->name, sym_get_string_value(sym), out_h);
                         break;
                 case S_HEX:
                         str = sym_get_string_value(sym);
                         if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
-                                fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
                                 fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);
                                 break;
                         }
                 case S_INT:
                         str = sym_get_string_value(sym);
-                        fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
                         fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);
                         break;
                 default:
@@ -862,7 +944,8 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
                                 sym->def[S_DEF_USER].tri = no;
                                 break;
                         case def_random:
-                                sym->def[S_DEF_USER].tri = (tristate)(rand() % 3);
+                                cnt = sym_get_type(sym) == S_TRISTATE ? 3 : 2;
+                                sym->def[S_DEF_USER].tri = (tristate)(rand() % cnt);
                                 break;
                         default:
                                 continue;