Merge tag 'kconfig-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kconfig updates from Masahiro Yamada:

 - always require argument for --defconfig and remove the hard-coded
   arch/$(ARCH)/defconfig path

 - make arch/$(SRCARCH)/configs/defconfig the new default of defconfig

 - some code cleanups

* tag 'kconfig-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: remove meaningless if-conditional in conf_read()
  kconfig: Fix spelling of sym_is_changable
  unicore32: rename unicore32_defconfig to defconfig
  kconfig: make arch/*/configs/defconfig the default of KBUILD_DEFCONFIG
  kconfig: add static qualifier to expand_string()
  kconfig: require the argument of --defconfig
  kconfig: remove always false ifeq ($(KBUILD_DEFCONFIG,) conditional

10 files changed, 27 insertions, 47 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 3f327e21f60e..ab30fe724c43 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -12,6 +12,10 @@ else
 Kconfig := Kconfig
 endif
 
+ifndef KBUILD_DEFCONFIG
+KBUILD_DEFCONFIG := defconfig
+endif
+
 ifeq ($(quiet),silent_)
 silent := -s
 endif
@@ -74,9 +78,7 @@ savedefconfig: $(obj)/conf
         $< $(silent) --$@=defconfig $(Kconfig)
 
 defconfig: $(obj)/conf
-ifeq ($(KBUILD_DEFCONFIG),)
-        $< $(silent) --defconfig $(Kconfig)
-else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
         @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
         $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
 else
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index ef3678c24bab..40e16e871ae2 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -90,7 +90,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
         line[0] = '\n';
         line[1] = 0;
 
-        if (!sym_is_changable(sym)) {
+        if (!sym_is_changeable(sym)) {
                 printf("%s\n", def);
                 line[0] = '\n';
                 line[1] = 0;
@@ -234,7 +234,7 @@ static int conf_choice(struct menu *menu)
 
         sym = menu->sym;
         is_new = !sym_has_value(sym);
-        if (sym_is_changable(sym)) {
+        if (sym_is_changeable(sym)) {
                 conf_sym(menu);
                 sym_calc_value(sym);
                 switch (sym_get_tristate_value(sym)) {
@@ -418,7 +418,7 @@ static void check_conf(struct menu *menu)
 
         sym = menu->sym;
         if (sym && !sym_has_value(sym)) {
-                if (sym_is_changable(sym) ||
+                if (sym_is_changeable(sym) ||
                     (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
                         if (input_mode == listnewconfig) {
                                 if (sym->name) {
@@ -451,7 +451,7 @@ static struct option long_opts[] = {
         {"oldaskconfig",    no_argument,       NULL, oldaskconfig},
         {"oldconfig",       no_argument,       NULL, oldconfig},
         {"syncconfig",      no_argument,       NULL, syncconfig},
-        {"defconfig",       optional_argument, NULL, defconfig},
+        {"defconfig",       required_argument, NULL, defconfig},
         {"savedefconfig",   required_argument, NULL, savedefconfig},
         {"allnoconfig",     no_argument,       NULL, allnoconfig},
         {"allyesconfig",    no_argument,       NULL, allyesconfig},
@@ -562,8 +562,6 @@ int main(int ac, char **av)
 
         switch (input_mode) {
         case defconfig:
-                if (!defconfig_file)
-                        defconfig_file = conf_get_default_confname();
                 if (conf_read(defconfig_file)) {
                         fprintf(stderr,
                                 "***\n"
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 6006154d36bd..501fdcc5e999 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -177,8 +177,6 @@ static void conf_message(const char *fmt, ...)
 static const char *conf_filename;
 static int conf_lineno, conf_warnings;
 
-const char conf_defname[] = "arch/$(ARCH)/defconfig";
-
 static void conf_warning(const char *fmt, ...)
 {
         va_list ap;
@@ -233,21 +231,6 @@ static const char *conf_get_autoconfig_name(void)
         return name ? name : "include/config/auto.conf";
 }
 
-char *conf_get_default_confname(void)
-{
-        static char fullname[PATH_MAX+1];
-        char *env, *name;
-
-        name = expand_string(conf_defname);
-        env = getenv(SRCTREE);
-        if (env) {
-                snprintf(fullname, sizeof(fullname), "%s/%s", env, name);
-                if (is_present(fullname))
-                        return fullname;
-        }
-        return name;
-}
-
 static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 {
         char *p2;
@@ -551,11 +534,9 @@ int conf_read(const char *name)
                         switch (sym->type) {
                         case S_BOOLEAN:
                         case S_TRISTATE:
-                                if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym))
-                                        break;
-                                if (!sym_is_choice(sym))
+                                if (sym->def[S_DEF_USER].tri == sym_get_tristate_value(sym))
                                         continue;
-                                /* fall through */
+                                break;
                         default:
                                 if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val))
                                         continue;
@@ -813,7 +794,7 @@ int conf_write_defconfig(const char *filename)
                                 goto next_menu;
                         sym->flags &= ~SYMBOL_WRITE;
                         /* If we cannot change the symbol - skip */
-                        if (!sym_is_changable(sym))
+                        if (!sym_is_changeable(sym))
                                 goto next_menu;
                         /* If symbol equals to default value - skip */
                         if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0)
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index cbc7658ee27d..4fb16f316626 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -49,7 +49,6 @@ const char *zconf_curname(void);
 
 /* confdata.c */
 const char *conf_get_configname(void);
-char *conf_get_default_confname(void);
 void sym_set_change_count(int count);
 void sym_add_change_count(int count);
 bool conf_set_all_new_symbols(enum conf_def_mode mode);
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index 86c267540ccc..f9ab98238aef 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -42,7 +42,7 @@ tristate sym_toggle_tristate_value(struct symbol *sym);
 bool sym_string_valid(struct symbol *sym, const char *newval);
 bool sym_string_within_range(struct symbol *sym, const char *str);
 bool sym_set_string_value(struct symbol *sym, const char *newval);
-bool sym_is_changable(struct symbol *sym);
+bool sym_is_changeable(struct symbol *sym);
 struct property * sym_get_choice_prop(struct symbol *sym);
 const char * sym_get_string_value(struct symbol *sym);
 
@@ -58,7 +58,6 @@ void env_write_dep(FILE *f, const char *auto_conf_name);
 void variable_add(const char *name, const char *value,
                   enum variable_flavor flavor);
 void variable_all_del(void);
-char *expand_string(const char *in);
 char *expand_dollar(const char **str);
 char *expand_one_token(const char **str);
 
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 694091f3ef9d..49c26ea9dd98 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -536,7 +536,7 @@ static void build_conf(struct menu *menu)
                 }
 
                 val = sym_get_tristate_value(sym);
-                if (sym_is_changable(sym)) {
+                if (sym_is_changeable(sym)) {
                         switch (type) {
                         case S_BOOLEAN:
                                 item_make("[%c]", val == no ? ' ' : '*');
@@ -587,7 +587,7 @@ static void build_conf(struct menu *menu)
                 } else {
                         switch (type) {
                         case S_BOOLEAN:
-                                if (sym_is_changable(sym))
+                                if (sym_is_changeable(sym))
                                         item_make("[%c]", val == no ? ' ' : '*');
                                 else
                                         item_make("-%c-", val == no ? ' ' : '*');
@@ -600,7 +600,7 @@ static void build_conf(struct menu *menu)
                                 case mod: ch = 'M'; break;
                                 default:  ch = ' '; break;
                                 }
-                                if (sym_is_changable(sym)) {
+                                if (sym_is_changeable(sym)) {
                                         if (sym->rev_dep.tri == mod)
                                                 item_make("{%c}", ch);
                                         else
@@ -617,7 +617,7 @@ static void build_conf(struct menu *menu)
                                 if (tmp < 0)
                                         tmp = 0;
                                 item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
-                                             (sym_has_value(sym) || !sym_is_changable(sym)) ?
+                                             (sym_has_value(sym) || !sym_is_changeable(sym)) ?
                                              "" : " (NEW)");
                                 item_set_tag('s');
                                 item_set_data(menu);
@@ -625,7 +625,7 @@ static void build_conf(struct menu *menu)
                         }
                 }
                 item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
-                          (sym_has_value(sym) || !sym_is_changable(sym)) ?
+                          (sym_has_value(sym) || !sym_is_changeable(sym)) ?
                           "" : " (NEW)");
                 if (menu->prompt->type == P_MENU) {
                         item_add_str("  %s", menu_is_empty(menu) ? "----" : "--->");
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index cbafe3bf082e..b7c1ef757178 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -803,7 +803,7 @@ static void build_conf(struct menu *menu)
                 }
 
                 val = sym_get_tristate_value(sym);
-                if (sym_is_changable(sym)) {
+                if (sym_is_changeable(sym)) {
                         switch (type) {
                         case S_BOOLEAN:
                                 item_make(menu, 't', "[%c]",
@@ -857,7 +857,7 @@ static void build_conf(struct menu *menu)
                 } else {
                         switch (type) {
                         case S_BOOLEAN:
-                                if (sym_is_changable(sym))
+                                if (sym_is_changeable(sym))
                                         item_make(menu, 't', "[%c]",
                                                 val == no ? ' ' : '*');
                                 else
@@ -876,7 +876,7 @@ static void build_conf(struct menu *menu)
                                         ch = ' ';
                                         break;
                                 }
-                                if (sym_is_changable(sym)) {
+                                if (sym_is_changeable(sym)) {
                                         if (sym->rev_dep.tri == mod)
                                                 item_make(menu,
                                                         't', "{%c}", ch);
@@ -896,14 +896,14 @@ static void build_conf(struct menu *menu)
                                 item_add_str("%*c%s%s", tmp, ' ',
                                                 menu_get_prompt(menu),
                                                 (sym_has_value(sym) ||
-                                                 !sym_is_changable(sym)) ? "" :
+                                                 !sym_is_changeable(sym)) ? "" :
                                                 " (NEW)");
                                 goto conf_childs;
                         }
                 }
                 item_add_str("%*c%s%s", indent + 1, ' ',
                                 menu_get_prompt(menu),
-                                (sym_has_value(sym) || !sym_is_changable(sym)) ?
+                                (sym_has_value(sym) || !sym_is_changeable(sym)) ?
                                 "" : " (NEW)");
                 if (menu->prompt && menu->prompt->type == P_MENU) {
                         item_add_str("  %s", menu_is_empty(menu) ? "----" : "--->");
diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c
index 592dfbfa9fb3..0243086fb168 100644
--- a/scripts/kconfig/preprocess.c
+++ b/scripts/kconfig/preprocess.c
@@ -15,6 +15,7 @@
 #define ARRAY_SIZE(arr)         (sizeof(arr) / sizeof((arr)[0]))
 
 static char *expand_string_with_args(const char *in, int argc, char *argv[]);
+static char *expand_string(const char *in);
 
 static void __attribute__((noreturn)) pperror(const char *format, ...)
 {
@@ -550,7 +551,7 @@ static char *expand_string_with_args(const char *in, int argc, char *argv[])
         return __expand_string(&in, is_end_of_str, argc, argv);
 }
 
-char *expand_string(const char *in)
+static char *expand_string(const char *in)
 {
         return expand_string_with_args(in, 0, NULL);
 }
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index ce7fc87a49a7..82773cc35d35 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -152,7 +152,7 @@ void ConfigItem::updateMenu(void)
         case S_TRISTATE:
                 char ch;
 
-                if (!sym_is_changable(sym) && list->optMode == normalOpt) {
+                if (!sym_is_changeable(sym) && list->optMode == normalOpt) {
                         setPixmap(promptColIdx, QIcon());
                         setText(noColIdx, QString::null);
                         setText(modColIdx, QString::null);
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 09fd6fa18e1a..f56eec5ea4c7 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -785,7 +785,7 @@ const char *sym_get_string_value(struct symbol *sym)
         return (const char *)sym->curr.val;
 }
 
-bool sym_is_changable(struct symbol *sym)
+bool sym_is_changeable(struct symbol *sym)
 {
         return sym->visible > sym->rev_dep.tri;
 }