diff options
author | Chris Packham <judge.packham@gmail.com> | 2020-12-10 19:53:19 +1300 |
---|---|---|
committer | Chris Packham <judge.packham@gmail.com> | 2021-02-02 20:06:32 +1300 |
commit | 3bf9edb36c5f1ea9715de1a2a556390540398077 (patch) | |
tree | 7ba753be014eec77fae4fabe30dd8148b4c4c4bb /kconfig/conf.c | |
parent | acce58834d83602b5c97cb01f04c9f540e40792b (diff) | |
download | crosstool-ng-3bf9edb36c5f1ea9715de1a2a556390540398077.tar.gz crosstool-ng-3bf9edb36c5f1ea9715de1a2a556390540398077.tar.bz2 crosstool-ng-3bf9edb36c5f1ea9715de1a2a556390540398077.zip |
kconfig: Sync with upstream v5.6
This commit introduces the following upstream changes:
089b7d890f97 kconfig: Invalidate all symbols after changing to y or m.
5f2fb52fac15 kbuild: rename hostprogs-y/always to hostprogs/always-y
c8fb7d7e48d1 kconfig: fix broken dependency in randconfig-generated .config
ba82f52e2287 kconfig: fix an "implicit declaration of function" warning
a9609686042b kconfig: fix nesting of symbol help text
3460d0bc256a kconfig: distinguish between dependencies and visibility in help text
edda15f21974 kconfig: list all definitions of a symbol in help text
89b9060987d9 kconfig: Add yes2modconfig and mod2yesconfig targets.
c8138a57bbd1 kconfig: use $(PERL) in Makefile
1d1352373ebc kconfig: fix too deep indentation in Makefile
68f0d62746bc kconfig: localmodconfig: fix indentation for closing brace
5edcef8454a4 kconfig: localmodconfig: remove unused $config
adf7c5bd0674 kconfig: squash prop_alloc() into menu_add_prop()
6397d96ba5a5 kconfig: remove sym from struct property
2ffeef615b5e kconfig: remove 'prompt' argument from menu_add_prop()
024352ff8d69 kconfig: move prompt handling to menu_add_prompt() from menu_add_prop()
1be6e791383a kconfig: remove 'prompt' symbol
801b27db4638 kconfig: drop T_WORD from the RHS of 'prompt' symbol
de026ca9152c kconfig: use parent->dep as the parentdep of 'menu'
f64048a20b0c kconfig: remove the rootmenu check in menu_add_prop()
8b41fc4454e3 kbuild: create modules.builtin without Makefile.modbuiltin or tristate.conf
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'kconfig/conf.c')
-rw-r--r-- | kconfig/conf.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/kconfig/conf.c b/kconfig/conf.c index 393e96e4..422165dc 100644 --- a/kconfig/conf.c +++ b/kconfig/conf.c @@ -34,6 +34,8 @@ enum input_mode { listnewconfig, helpnewconfig, olddefconfig, + yes2modconfig, + mod2yesconfig, }; static enum input_mode input_mode = oldaskconfig; @@ -467,6 +469,8 @@ static struct option long_opts[] = { {"listnewconfig", no_argument, NULL, listnewconfig}, {"helpnewconfig", no_argument, NULL, helpnewconfig}, {"olddefconfig", no_argument, NULL, olddefconfig}, + {"yes2modconfig", no_argument, NULL, yes2modconfig}, + {"mod2yesconfig", no_argument, NULL, mod2yesconfig}, {NULL, 0, NULL, 0} }; @@ -532,6 +536,8 @@ int main(int ac, char **av) case listnewconfig: case helpnewconfig: case olddefconfig: + case yes2modconfig: + case mod2yesconfig: break; case '?': fprintf(stderr, "See README for usage info\n"); @@ -566,6 +572,8 @@ int main(int ac, char **av) case listnewconfig: case helpnewconfig: case olddefconfig: + case yes2modconfig: + case mod2yesconfig: conf_read(NULL); break; case allnoconfig: @@ -639,6 +647,12 @@ int main(int ac, char **av) break; case savedefconfig: break; + case yes2modconfig: + conf_rewrite_mod_or_yes(def_y2m); + break; + case mod2yesconfig: + conf_rewrite_mod_or_yes(def_m2y); + break; case oldaskconfig: rootEntry = &rootmenu; conf(&rootmenu); |