kconfig: split randconfig setup code into set_randconfig_seed()
Subsystems (4)
PATCH 1/13 kconfig: split randconfig setup code into set_randconfig_seed()
This code is too big to be placed in the switch statement.
Move the code into a new helper function. I slightly refactor the code without changing the behavior.
---
scripts/kconfig/conf.c | 54 ++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 23 deletions(-)
scripts/kconfig/conf.c +31 -23
@@ -82,6 +82,36 @@ static void xfgets(char *str, int size, FILE *in)printf ("%s" , str); } +static void set_randconfig_seed (void ) +{ +unsigned int seed; +char *env; +bool seed_set = false; + + env =getenv ("KCONFIG_SEED" ); +if (env && *env) { +char *endp; + + seed =strtol (env, &endp,0 ); +if (*endp =='\0' ) + seed_set = true; + } + +if (!seed_set) { +struct timeval now; + +/* +* Use microseconds derived seed, compensate for systems where it may +* be zero. +*/ +gettimeofday (&now,NULL ); + seed = (now.tv_sec +1 ) * (now.tv_usec +1 ); + } + +printf ("KCONFIG_SEED=0x%X\n" , seed); +srand (seed); +} +static int conf_askvalue (struct symbol *sym,const char *def) {if (!sym_has_value (sym))
@@ -515,30 +545,8 @@ int main(int ac, char **av) defconfig_file = optarg;break ;case randconfig: - { -struct timeval now; -unsigned int seed; -char *seed_env; - -/* -* Use microseconds derived seed, -* compensate for systems where it may be zero -*/ -gettimeofday (&now,NULL ); - seed = (unsigned int )((now.tv_sec +1 ) * (now.tv_usec +1 )); - - seed_env =getenv ("KCONFIG_SEED" ); -if ( seed_env && *seed_env ) { -char *endp; -int tmp = (int )strtol (seed_env, &endp,0 ); -if (*endp =='\0' ) { - seed = tmp; - } - } -fprintf ( stderr,"KCONFIG_SEED=0x%X\n" , seed ); -srand (seed); +set_randconfig_seed ();break ; - }case oldaskconfig:case oldconfig:case allnoconfig:
Signature · 1 line
2.27.0
PATCH 2/13 kconfig: refactor option parse
The current option parse code is clumsy.
The 's' option is separately handled in a if-conditional due to the following code:
input_mode = (enum input_mode)opt;
If 's' is moved the switch statement, the invalid value 's' would be assigned to the input_mode.
Another potential problem is that we are mixing 'enum input_mode' and ASCII characters. They could overwrap if we add more input modes.
To separate them out, set the flag field of long options to a pointer of input_mode_opt. For mode select options, getopt_long() returns 0, which never causes overwrap with ASCII characters that represent short options.
---
scripts/kconfig/conf.c | 91 ++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 48 deletions(-)
scripts/kconfig/conf.c +43 -48
@@ -37,7 +37,7 @@ enum input_mode { mod2yesconfig, };static enum input_mode input_mode = oldaskconfig; - +static int input_mode_opt;static int indent =1 ;static int tty_stdio;static int sync_kconfig;
@@ -474,21 +474,21 @@ static void check_conf(struct menu *menu) }static struct option long_opts[] = { - {"oldaskconfig" , no_argument,NULL , oldaskconfig}, - {"oldconfig" , no_argument,NULL , oldconfig}, - {"syncconfig" , no_argument,NULL , syncconfig}, - {"defconfig" , required_argument,NULL , defconfig}, - {"savedefconfig" , required_argument,NULL , savedefconfig}, - {"allnoconfig" , no_argument,NULL , allnoconfig}, - {"allyesconfig" , no_argument,NULL , allyesconfig}, - {"allmodconfig" , no_argument,NULL , allmodconfig}, - {"alldefconfig" , no_argument,NULL , alldefconfig}, - {"randconfig" , no_argument,NULL , randconfig}, - {"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}, + {"oldaskconfig" , no_argument, &input_mode_opt, oldaskconfig}, + {"oldconfig" , no_argument, &input_mode_opt, oldconfig}, + {"syncconfig" , no_argument, &input_mode_opt, syncconfig}, + {"defconfig" , required_argument, &input_mode_opt, defconfig}, + {"savedefconfig" , required_argument, &input_mode_opt, savedefconfig}, + {"allnoconfig" , no_argument, &input_mode_opt, allnoconfig}, + {"allyesconfig" , no_argument, &input_mode_opt, allyesconfig}, + {"allmodconfig" , no_argument, &input_mode_opt, allmodconfig}, + {"alldefconfig" , no_argument, &input_mode_opt, alldefconfig}, + {"randconfig" , no_argument, &input_mode_opt, randconfig}, + {"listnewconfig" , no_argument, &input_mode_opt, listnewconfig}, + {"helpnewconfig" , no_argument, &input_mode_opt, helpnewconfig}, + {"olddefconfig" , no_argument, &input_mode_opt, olddefconfig}, + {"yes2modconfig" , no_argument, &input_mode_opt, yes2modconfig}, + {"mod2yesconfig" , no_argument, &input_mode_opt, mod2yesconfig}, {NULL ,0 ,NULL ,0 } };
@@ -526,43 +526,38 @@ int main(int ac, char **av) tty_stdio =isatty (0 ) &&isatty (1 );while ((opt =getopt_long (ac, av,"hs" , long_opts,NULL )) !=-1 ) { -if (opt =='s' ) { -conf_set_message_callback (NULL ); -continue ; - } - 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: -case savedefconfig: - defconfig_file = optarg; -break ; -case randconfig: -set_randconfig_seed (); -break ; -case oldaskconfig: -case oldconfig: -case allnoconfig: -case allyesconfig: -case allmodconfig: -case alldefconfig: -case listnewconfig: -case helpnewconfig: -case olddefconfig: -case yes2modconfig: -case mod2yesconfig: -break ;case 'h' :conf_usage (progname);exit (1 );break ; +case 's' : +conf_set_message_callback (NULL ); +break ; +case 0 : + input_mode = input_mode_opt; +switch (input_mode) { +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: +case savedefconfig: + defconfig_file = optarg; +break ; +case randconfig: +set_randconfig_seed (); +break ; +default : +break ; + } +default : +break ; } }if (ac == optind) {
Signature · 1 line
2.27.0
PATCH 3/13 kconfig: add long options --help and --silent
In reply to Masahiro YamadaThey are long options for -h and -s, respectively.
---
scripts/kconfig/conf.c | 2 ++ 1 file changed, 2 insertions(+)
scripts/kconfig/conf.c +2 -0
@@ -474,6 +474,8 @@ static void check_conf(struct menu *menu) }static struct option long_opts[] = { + {"help" , no_argument,NULL ,'h' }, + {"silent" , no_argument,NULL ,'s' }, {"oldaskconfig" , no_argument, &input_mode_opt, oldaskconfig}, {"oldconfig" , no_argument, &input_mode_opt, oldconfig}, {"syncconfig" , no_argument, &input_mode_opt, syncconfig},
Signature · 1 line
2.27.0
PATCH 4/13 kconfig: add help messages for --help (-h) and --silent (-s)
In reply to Masahiro YamadaAdd missing options and make the help message more readable.
---
scripts/kconfig/conf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
scripts/kconfig/conf.c +7 -3
@@ -496,9 +496,13 @@ static struct option long_opts[] = {static void conf_usage (const char *progname) { - -printf ("Usage: %s [-s] [option] <kconfig-file>\n" , progname); -printf ("[option] is _one_ of the following:\n" ); +printf ("Usage: %s [options] <kconfig-file>\n" , progname); +printf ("\n" ); +printf ("Generic options:\n" ); +printf (" -h, --help Print this message and exit.\n" ); +printf (" -s, --silent Do not print log.\n" ); +printf ("\n" ); +printf ("Mode options:\n" );printf (" --listnewconfig List new options\n" );printf (" --helpnewconfig List new options and help text\n" );printf (" --oldaskconfig Start a new configuration using a line-oriented program\n" );
Signature · 1 line
2.27.0
PATCH 5/13 kconfig: remove assignment for Kconfig file
In reply to Masahiro YamadaPass av[optind] to conf_parse() directly.
---
scripts/kconfig/conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
scripts/kconfig/conf.c +1 -2
@@ -571,8 +571,7 @@ int main(int ac, char **av)conf_usage (progname);exit (1 ); } - name = av[optind]; -conf_parse (name); +conf_parse (av[optind]);//zconfdump(stdout); switch (input_mode) {
Signature · 1 line
2.27.0
PATCH 6/13 kconfig: move conf_rewrite_mod_or_yes() to conf.c
In reply to Masahiro YamadaThis function is only used in conf.c.
---
scripts/kconfig/conf.c | 15 +++++++++++++++ scripts/kconfig/confdata.c | 15 --------------- scripts/kconfig/lkc.h | 1 - 3 files changed, 15 insertions(+), 16 deletions(-)
scripts/kconfig/conf.c +15 -0
@@ -112,6 +112,21 @@ static void set_randconfig_seed(void)srand (seed); } +static void conf_rewrite_mod_or_yes (enum conf_def_mode mode) +{ +struct symbol *sym; +int i; +tristate old_val = (mode == def_y2m) ? yes : mod; +tristate new_val = (mode == def_y2m) ? mod : yes; + + for_all_symbols(i, sym) { +if (sym_get_type (sym) ==S_TRISTATE && + sym->def[S_DEF_USER ].tri == old_val) + sym->def[S_DEF_USER ].tri = new_val; + } +sym_clear_all_valid (); +} +static int conf_askvalue (struct symbol *sym,const char *def) {if (!sym_has_value (sym))
scripts/kconfig/confdata.c +0 -15
@@ -1322,18 +1322,3 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)return has_changed; } - -void conf_rewrite_mod_or_yes (enum conf_def_mode mode) -{ -struct symbol *sym; -int i; -tristate old_val = (mode == def_y2m) ? yes : mod; -tristate new_val = (mode == def_y2m) ? mod : yes; - - for_all_symbols(i, sym) { -if (sym_get_type (sym) ==S_TRISTATE && - sym->def[S_DEF_USER ].tri == old_val) - sym->def[S_DEF_USER ].tri = new_val; - } -sym_clear_all_valid (); -}
scripts/kconfig/lkc.h +0 -1
@@ -58,7 +58,6 @@ const char *conf_get_configname(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); -void conf_rewrite_mod_or_yes (enum conf_def_mode mode);void set_all_choice_values (struct symbol *csym);/* confdata.c and expr.c */
Signature · 1 line
2.27.0
PATCH 7/13 kconfig: move conf_set_all_new_symbols() to conf.c
In reply to Masahiro YamadaThis function is only used in conf.c. Move it there together with the randomize_choice_values() helper.
---
scripts/kconfig/conf.c | 183 +++++++++++++++++++++++++++++++++++++ scripts/kconfig/confdata.c | 176 ----------------------------------- scripts/kconfig/lkc.h | 1 - 3 files changed, 183 insertions(+), 177 deletions(-)
scripts/kconfig/conf.c +183 -0
@@ -112,6 +112,189 @@ static void set_randconfig_seed(void)srand (seed); } +static bool randomize_choice_values (struct symbol *csym) +{ +struct property *prop; +struct symbol *sym; +struct expr *e; +int cnt, def; + +/* +* If choice is mod then we may have more items selected +* and if no then no-one. +* In both cases stop. +*/ +if (csym->curr.tri != yes) +return false; + + prop =sym_get_choice_prop (csym); + +/* count entries in choice block */ + cnt =0 ; +expr_list_for_each_sym (prop->expr, e, sym) + cnt++; + +/* +* find a random value and set it to yes, +* set the rest to no so we have only one set +*/ + def =rand () % cnt; + + cnt =0 ; +expr_list_for_each_sym (prop->expr, e, sym) { +if (def == cnt++) { + sym->def[S_DEF_USER ].tri = yes; + csym->def[S_DEF_USER ].val = sym; + }else { + sym->def[S_DEF_USER ].tri = no; + } + sym->flags |=SYMBOL_DEF_USER ; +/* clear VALID to get value calculated */ + sym->flags &= ~SYMBOL_VALID ; + } + csym->flags |=SYMBOL_DEF_USER ; +/* clear VALID to get value calculated */ + csym->flags &= ~SYMBOL_VALID ; + +return true; +} + +static bool conf_set_all_new_symbols (enum conf_def_mode mode) +{ +struct symbol *sym, *csym; +int i, cnt; +/* +* can't go as the default in switch-case below, otherwise gcc whines +* about -Wmaybe-uninitialized +*/ +int pby =50 ;/* probability of bool = y */ +int pty =33 ;/* probability of tristate = y */ +int ptm =33 ;/* probability of tristate = m */ +bool has_changed = false; + +if (mode == def_random) { +int n, p[3 ]; +char *env =getenv ("KCONFIG_PROBABILITY" ); + + n =0 ; +while (env && *env) { +char *endp; +int tmp =strtol (env, &endp,10 ); + +if (tmp >=0 && tmp <=100 ) { + p[n++] = tmp; + }else { + errno =ERANGE ; +perror ("KCONFIG_PROBABILITY" ); +exit (1 ); + } + env = (*endp ==':' ) ? endp +1 : endp; +if (n >=3 ) +break ; + } +switch (n) { +case 1 : + pby = p[0 ]; + ptm = pby /2 ; + pty = pby - ptm; +break ; +case 2 : + pty = p[0 ]; + ptm = p[1 ]; + pby = pty + ptm; +break ; +case 3 : + pby = p[0 ]; + pty = p[1 ]; + ptm = p[2 ]; +break ; + } + +if (pty + ptm >100 ) { + errno =ERANGE ; +perror ("KCONFIG_PROBABILITY" ); +exit (1 ); + } + } + + for_all_symbols(i, sym) { +if (sym_has_value (sym) || sym->flags &SYMBOL_VALID ) +continue ; +switch (sym_get_type (sym)) { +case S_BOOLEAN : +case S_TRISTATE : + has_changed = true; +switch (mode) { +case def_yes: + sym->def[S_DEF_USER ].tri = yes; +break ; +case def_mod: + sym->def[S_DEF_USER ].tri = mod; +break ; +case def_no: +if (sym->flags &SYMBOL_ALLNOCONFIG_Y ) + sym->def[S_DEF_USER ].tri = yes; +else + sym->def[S_DEF_USER ].tri = no; +break ; +case def_random: + sym->def[S_DEF_USER ].tri = no; + cnt =rand () %100 ; +if (sym->type ==S_TRISTATE ) { +if (cnt < pty) + sym->def[S_DEF_USER ].tri = yes; +else if (cnt < pty + ptm) + sym->def[S_DEF_USER ].tri = mod; + }else if (cnt < pby) + sym->def[S_DEF_USER ].tri = yes; +break ; +default : +continue ; + } +if (!(sym_is_choice (sym) && mode == def_random)) + sym->flags |=SYMBOL_DEF_USER ; +break ; +default : +break ; + } + + } + +sym_clear_all_valid (); + +/* +* We have different type of choice blocks. +* If curr.tri equals to mod then we can select several +* choice symbols in one block. +* In this case we do nothing. +* If curr.tri equals yes then only one symbol can be +* selected in a choice block and we set it to yes, +* and the rest to no. +*/ +if (mode != def_random) { + for_all_symbols(i, csym) { +if ((sym_is_choice (csym) && !sym_has_value (csym)) || +sym_is_choice_value (csym)) + csym->flags |=SYMBOL_NEED_SET_CHOICE_VALUES ; + } + } + + for_all_symbols(i, csym) { +if (sym_has_value (csym) || !sym_is_choice (csym)) +continue ; + +sym_calc_value (csym); +if (mode == def_random) + has_changed |=randomize_choice_values (csym); +else { +set_all_choice_values (csym); + has_changed = true; + } + } + +return has_changed; +} +static void conf_rewrite_mod_or_yes (enum conf_def_mode mode) {struct symbol *sym;
scripts/kconfig/confdata.c +0 -176
185 lines not on this page · raw message
scripts/kconfig/lkc.h +0 -1
@@ -57,7 +57,6 @@ const char *zconf_curname(void);const char *conf_get_configname (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);void set_all_choice_values (struct symbol *csym);/* confdata.c and expr.c */
Signature · 1 line
2.27.0
Re: [PATCH 07/13] kconfig: move conf_set_all_new_symbols() to conf.c
Quoted 10 lines · Masahiro Yamada
This function is only used in
conf.c. Move it there together with therandomize_choice_values()helper.[...]
scripts/kconfig/lkc.h +0
-0
scripts/kconfig/lkc.h const char *zconf_curname(void); · line 60
Quoted 5 lines
scripts/kconfig/lkc.h +0
-1@@ -57,7 +57,6 @@ const char *zconf_curname(void);const char *conf_get_configname (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);void set_all_choice_values (struct symbol *csym);
A number of people package kconfig as a library that is then used in various projects outside of the Linux kernel. Removing this function breaks the library ABI and potentially such project. For example, I call conf_set_all_new_symbols() from my libbuild2-kconfig build system module[1].
I know you don't care much for such out-of-kernel usage, still, this (and the previous commit) feels like superficial reshuffling of code and perhaps it's worth not breaking things unless there is something substantial to gain?
Re: [PATCH 07/13] kconfig: move conf_set_all_new_symbols() to conf.c
Quoted 8 lines · Boris Kolpackov
Quoted 5 lines · Masahiro Yamada
This function is only used in
conf.c. Move it there together with therandomize_choice_values()helper.[...]
Quoted 16 lines
scripts/kconfig/lkc.h const char *zconf_curname(void); · line 60
Quoted 10 lines
scripts/kconfig/lkc.h +0
-1@@ -57,7 +57,6 @@ const char *zconf_curname(void);const char *conf_get_configname (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);void set_all_choice_values (struct symbol *csym);A number of people package kconfig as a library that is then used in various projects outside of the Linux kernel. Removing this function breaks the library ABI and potentially such project. For example, I call
conf_set_all_new_symbols()from my libbuild2-kconfig build system module[1].
There is no such ABI in Kconfig.
Quoted 6 lines
I know you don't care much for such out-of-kernel usage, still, this (and the previous commit) feels like superficial reshuffling of code and perhaps it's worth not breaking things unless there is something substantial to gain?
confdata.c is linked to all flavors of Kconfig
(conf, mconf, gconf, and qconf).
conf_set_all_new_symbols() and randomize_choice_values() are apparently only used by the text-base conf. They need to go to the correct location.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 8/13 kconfig: move JUMP_NB to mconf.c
In reply to Masahiro YamadaThis macro is only used in mconf.c.
---
scripts/kconfig/expr.h | 2 -- scripts/kconfig/mconf.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
scripts/kconfig/expr.h +0 -2
@@ -281,8 +281,6 @@ struct jump_key {int index; }; -#define JUMP_NB 9 -extern struct file *file_list;extern struct file *current_file;struct file *lookup_file (const char *name);
scripts/kconfig/mconf.c +2 -0
@@ -22,6 +22,8 @@#include "lkc.h" #include "lxdialog/dialog.h" +#define JUMP_NB 9 +static const char mconf_readme[] ="Overview\n" "--------\n"
Signature · 1 line
2.27.0
PATCH 9/13 kconfig: change defconfig_list option to environment variable
In reply to Masahiro Yamada"defconfig_list" is a weird option that defines static symbol that declares the list of base config files in case the .config does not exist yet.
This is quite different from other normal symbols; we just abused the "string" type and the "default" properties to list out the input files. They must be fixed values since these are searched for and loaded in the parse stage.
It is an ugly hack, and should not exist in the first place. Providing this features as an environment variable is a saner approach.
---
Documentation/kbuild/kconfig-language.rst | 5 --- Documentation/kbuild/kconfig.rst | 8 +++++ init/Kconfig | 9 ------ scripts/kconfig/Makefile | 10 ++++++ scripts/kconfig/confdata.c | 38 +++++++++++++++++------ scripts/kconfig/expr.h | 1 - scripts/kconfig/lexer.l | 1 - scripts/kconfig/lkc.h | 1 - scripts/kconfig/menu.c | 9 ------ scripts/kconfig/parser.y | 6 ---- scripts/kconfig/symbol.c | 1 - scripts/kconfig/tests/conftest.py | 4 +++ 12 files changed, 50 insertions(+), 43 deletions(-)
Documentation/kbuild/kconfig-language.rst +0 -5
@@ -229,11 +229,6 @@ applicable everywhere (see syntax). which can modify the behaviour of the menu entry and its config symbol. These options are currently possible: - - "defconfig_list" - This declares a list of default entries which can be used when - looking for the default configuration (which is used when the main - .config doesn't exists yet.) - - "modules" This declares the symbol to be used as the MODULES symbol, which enables the third modular state for all config symbols.
Documentation/kbuild/kconfig.rst +8 -0
@@ -41,6 +41,14 @@ KCONFIG_CONFIG This environment variable can be used to specify a default kernel config file name to override the default name of ".config". +KCONFIG_DEFCONFIG_LIST +---------------------- + +This environment variable specifies a list of config files which can be used +as a base configuration in case the .config does not exist yet. Entries in +the list are separated with whitespaces to each other, and the first one +that exists is used. + KCONFIG_OVERWRITECONFIG ----------------------- If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not
init/Kconfig +0 -9
@@ -1,13 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -config DEFCONFIG_LIST - string - depends on !UML - option defconfig_list - default "/lib/modules/$(shell,uname -r)/.config" - default "/etc/kernel-config" - default "/boot/config-$(shell,uname -r)" - default "arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)" - config CC_VERSION_TEXT string default "$(CC_VERSION_TEXT)"
scripts/kconfig/Makefile +10 -0
@@ -13,6 +13,16 @@ ifeq ($(quiet),silent_) silent := -s endif +export KCONFIG_DEFCONFIG_LIST := +ifneq ($(SRCARCH),um) +kernel-release := $(shell uname -r) +KCONFIG_DEFCONFIG_LIST := \ + /lib/modules/$(kernel-release)/.config \ + /etc/kernel-config \ + /boot/config-$(kernel-release) \ + arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) +endif + # We need this, in case the user has it in its environment unexport CONFIG_
scripts/kconfig/confdata.c +28 -10
@@ -360,28 +360,46 @@ int conf_read_simple(const char *name, int def)if (name) { in =zconf_fopen (name); }else { -struct property *prop; +char *env; name =conf_get_configname (); in =zconf_fopen (name);if (in) goto load;sym_add_change_count (1 ); -if (!sym_defconfig_list) + + env =getenv ("KCONFIG_DEFCONFIG_LIST" ); +if (!env)return 1 ; - for_all_defaults(sym_defconfig_list, prop) { -if (expr_calc_value (prop->visible.expr) == no || - prop->expr->type !=E_SYMBOL ) -continue ; -sym_calc_value (prop->expr->left.sym); - name =sym_get_string_value (prop->expr->left.sym); - in =zconf_fopen (name); +while (1 ) { +bool is_last; + +while (isspace (*env)) + env++; + +if (!*env) +break ; + + p = env; +while (*p && !isspace (*p)) + p++; + + is_last = (*p =='\0' ); + + *p ='\0' ; + + in =zconf_fopen (env);if (in) {conf_message ("using defaults found in %s" , - name); + env); goto load; } + +if (is_last) +break ; + + env = p +1 ; } }if (!in)
scripts/kconfig/expr.h +0 -1
@@ -287,7 +287,6 @@ struct file *lookup_file(const char *name);extern struct symbol symbol_yes, symbol_no, symbol_mod;extern struct symbol *modules_sym; -extern struct symbol *sym_defconfig_list;extern int cdebug;struct expr *expr_alloc_symbol (struct symbol *sym);struct expr *expr_alloc_one (enum expr_type type,struct expr *ce);
scripts/kconfig/lexer.l +0 -1
@@ -99,7 +99,6 @@ n [A-Za-z0-9_-] "def_bool" return T_DEF_BOOL; "def_tristate" return T_DEF_TRISTATE; "default" return T_DEFAULT; -"defconfig_list" return T_DEFCONFIG_LIST; "depends" return T_DEPENDS; "endchoice" return T_ENDCHOICE; "endif" return T_ENDIF;
scripts/kconfig/lkc.h +0 -1
@@ -106,7 +106,6 @@ struct property *menu_add_prompt(enum prop_type type, char *prompt, struct exprvoid menu_add_expr (enum prop_type type,struct expr *expr,struct expr *dep);void menu_add_symbol (enum prop_type type,struct symbol *sym,struct expr *dep);void menu_add_option_modules (void ); -void menu_add_option_defconfig_list (void );void menu_add_option_allnoconfig_y (void );void menu_finalize (struct menu *parent);void menu_set_type (int type);
scripts/kconfig/menu.c +0 -9
@@ -219,15 +219,6 @@ void menu_add_option_modules(void) modules_sym = current_entry->sym; } -void menu_add_option_defconfig_list (void ) -{ -if (!sym_defconfig_list) - sym_defconfig_list = current_entry->sym; -else if (sym_defconfig_list != current_entry->sym) -zconf_error ("trying to redefine defconfig symbol" ); - sym_defconfig_list->flags |=SYMBOL_NO_WRITE ; -} -void menu_add_option_allnoconfig_y (void ) { current_entry->sym->flags |=SYMBOL_ALLNOCONFIG_Y ;
scripts/kconfig/parser.y +0 -6
@@ -53,7 +53,6 @@ static struct menu *current_menu, *current_entry; %token T_COMMENT %token T_CONFIG %token T_DEFAULT -%token T_DEFCONFIG_LIST %token T_DEF_BOOL %token T_DEF_TRISTATE %token T_DEPENDS
@@ -223,11 +222,6 @@ config_option: T_OPTION T_MODULES T_EOL menu_add_option_modules(); }; -config_option: T_OPTION T_DEFCONFIG_LIST T_EOL -{ - menu_add_option_defconfig_list(); -}; - config_option: T_OPTION T_ALLNOCONFIG_Y T_EOL { menu_add_option_allnoconfig_y();
scripts/kconfig/symbol.c +0 -1
@@ -35,7 +35,6 @@ static struct symbol symbol_empty = { .flags = SYMBOL_VALID, }; -struct symbol *sym_defconfig_list;struct symbol *modules_sym;static tristate modules_val;
scripts/kconfig/tests/conftest.py +4 -0
@@ -53,6 +53,10 @@ class Conf: # Override 'srctree' environment to make the test as the top directory extra_env['srctree'] = self._test_dir + # Clear KCONFIG_DEFCONFIG_LIST to keep unit tests from being affected + # by the user's environment. + extra_env['KCONFIG_DEFCONFIG_LIST'] = '' + # Run Kconfig in a temporary directory. # This directory is automatically removed when done. with tempfile.TemporaryDirectory() as temp_dir:
Signature · 1 line
2.27.0
PATCH 10/13 kconfig: move default KBUILD_DEFCONFIG back to scripts/kconfig/Makefile
In reply to Masahiro YamadaThis is a partial revert of commit 2a86f6612164 ("kbuild: use KBUILD_DEFCONFIG as the fallback for DEFCONFIG_LIST").
Now that the reference to $(DEFCONFIG_LIST) was removed from init/Kconfig, the default KBUILD_DEFCONFIG can go back home.
---
Makefile | 3 --- scripts/kconfig/Makefile | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-)
Makefile +0 -3
@@ -395,9 +395,6 @@ endif KCONFIG_CONFIG ?= .config export KCONFIG_CONFIG -# Default file for 'make defconfig'. This may be overridden by arch-Makefile. -export KBUILD_DEFCONFIG := defconfig - # SHELL used by kbuild CONFIG_SHELL := sh
scripts/kconfig/Makefile +4 -0
@@ -9,6 +9,10 @@ else Kconfig := Kconfig endif +ifndef KBUILD_DEFCONFIG +KBUILD_DEFCONFIG := defconfig +endif + ifeq ($(quiet),silent_) silent := -s endif
Signature · 1 line
2.27.0
PATCH 11/13 kconfig: do not use allnoconfig_y option
In reply to Masahiro Yamadaallnoconfig_y is a bad hack that sets a symbol to 'y' by allnoconfig.
allnoconfig does not mean a minimum set of CONFIG options because a bunch of prompts are hidden by 'if EMBEDDED' or 'if EXPERT', but I do not like to do a workaround this way.
Use the pre-existing feature, KCONFIG_ALLCONFIG, to provide a one liner config fragment. CONFIG_EMBEDDED=y is still forced under allnoconfig.
No change in the .config file produced by 'make tinyconfig'.
The output of 'make allnoconfig' will be changed; we will get CONFIG_EMBEDDED=n because allnoconfig literally sets all symbols to n.
---
init/Kconfig | 1 - kernel/configs/tiny-base.config | 1 + scripts/kconfig/Makefile | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 kernel/configs/tiny-base.config
init/Kconfig +0 -1
@@ -1769,7 +1769,6 @@ config DEBUG_RSEQ config EMBEDDED bool "Embedded system" - option allnoconfig_y select EXPERT help This option should be enabled if compiling the kernel for
kernel/configs/tiny-base.config new file +1 -0
@@ -0,0 +1 @@ +CONFIG_EMBEDDED=y
scripts/kconfig/Makefile +2 -1
@@ -102,7 +102,8 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c PHONY += tinyconfig tinyconfig: - $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config + $(Q)KCONFIG_ALLCONFIG=kernel/configs/tiny-base.config $(MAKE) -f $(srctree)/Makefile allnoconfig + $(Q)$(MAKE) -f $(srctree)/Makefile tiny.config # CHECK: -o cache_dir=<path> working? PHONY += testconfig
Signature · 1 line
2.27.0
Re: [PATCH 11/13] kconfig: do not use allnoconfig_y option
Quoted 10 lines · Masahiro Yamada
allnoconfig_yis a bad hack that sets a symbol to 'y' by allnoconfig.allnoconfig does not mean a minimum set of CONFIG options because a bunch of prompts are hidden by 'if EMBEDDED' or 'if EXPERT', but I do not like to do a workaround this way.
Use the pre-existing feature,
KCONFIG_ALLCONFIG, to provide a one liner config fragment.CONFIG_EMBEDDED=yis still forced under allnoconfig.
Quoted 6 lines
No change in the .config file produced by 'make tinyconfig'.
The output of 'make allnoconfig' will be changed; we will get
CONFIG_EMBEDDED=nbecause allnoconfig literally sets all symbols to n.Signed-off-by Masahiro Yamada <[email protected]>
With this patch in place, mips:allnoconfig fails to build with the following error.
Error log:
WARNING: modpost: vmlinux.o(.text+0x9c70): Section mismatch in reference from the function reserve_exception_space() to the function .meminit.text:memblock_reserve() The function reserve_exception_space() references
the function __meminit memblock_reserve().
This is often because reserve_exception_space lacks a __meminit
annotation or the annotation of memblock_reserve is wrong.
ERROR: modpost: Section mismatches detected.
Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.
make[2]: *** [scripts/Makefile.modpost:62: vmlinux.symvers] Error 1
make[2]: *** Deleting file 'vmlinux.symvers'
make[1]: *** [Makefile:1292: vmlinux] Error 2
make: *** [Makefile:222: __sub-make] Error 2
Guenter
Quoted 44 lines
---
init/Kconfig | 1 - kernel/configs/tiny-base.config | 1 + scripts/kconfig/Makefile | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 kernel/configs/tiny-base.configinit/Kconfig +0
-1@@ -1769,7 +1769,6 @@ config DEBUG_RSEQ config EMBEDDED bool "Embedded system" - option allnoconfig_y select EXPERT help This option should be enabled if compiling the kernel forkernel/configs/tiny-base.config new file +1
-0@@ -0,0 +1 @@ +CONFIG_EMBEDDED=yscripts/kconfig/Makefile +2
-1@@ -102,7 +102,8 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c PHONY += tinyconfig tinyconfig: - $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config + $(Q)KCONFIG_ALLCONFIG=kernel/configs/tiny-base.config $(MAKE) -f $(srctree)/Makefile allnoconfig + $(Q)$(MAKE) -f $(srctree)/Makefile tiny.config # CHECK: -o cache_dir=<path> working? PHONY += testconfigSignature · 1 line
2.27.0
Re: [PATCH 11/13] kconfig: do not use allnoconfig_y option
Quoted 22 lines · Guenter Roeck
Quoted 10 lines · Masahiro Yamada
allnoconfig_yis a bad hack that sets a symbol to 'y' by allnoconfig.allnoconfig does not mean a minimum set of CONFIG options because a bunch of prompts are hidden by 'if EMBEDDED' or 'if EXPERT', but I do not like to do a workaround this way.
Use the pre-existing feature,
KCONFIG_ALLCONFIG, to provide a one liner config fragment.CONFIG_EMBEDDED=yis still forced under allnoconfig.Quoted 6 lines
No change in the .config file produced by 'make tinyconfig'.
The output of 'make allnoconfig' will be changed; we will get
CONFIG_EMBEDDED=nbecause allnoconfig literally sets all symbols to n.Signed-off-by Masahiro Yamada <[email protected]>With this patch in place, mips:allnoconfig fails to build with the following error.
Quoted 12 lines
Error log:
WARNING: modpost:vmlinux.o(.text+0x9c70): Section mismatch in reference from the functionreserve_exception_space()to the function .meminit.text:memblock_reserve() The functionreserve_exception_space()references
the function__meminitmemblock_reserve().
This is often becausereserve_exception_spacelacks a__meminit
annotation or the annotation ofmemblock_reserveis wrong.
ERROR: modpost: Section mismatches detected.
SetCONFIG_SECTION_MISMATCH_WARN_ONLY=yto allow them.
make[2]: *** [scripts/Makefile.modpost:62: vmlinux.symvers] Error 1
make[2]: *** Deleting file 'vmlinux.symvers'
make[1]: *** [Makefile:1292: vmlinux] Error 2
make: *** [Makefile:222: __sub-make] Error 2
Thanks for the report. I suspect this is related to allnoconfig disabling CONFIG_ARCH_KEEP_MEMBLOCK, which changes the definition of __init_memblock in include/linux/memblock.h.
So allnoconfig would unselect CONFIG_ARCH_KEEP_MEMBLOCK, making __init_memblock equivalent to __meminit triggering the above warning.
arch/mips/Kconfig
14: select ARCH_KEEP_MEMBLOCK if DEBUG_KERNEL
so DEBUG_KERNEL is probably also disabled by allnoconfig.
commit a8c0f1c634507 ("MIPS: Select ARCH_KEEP_MEMBLOCK if DEBUG_KERNEL to enable sysfs memblock debug")
probably should drop the if DEBUG_KERNEL part.
Quoted 47 lines
Guenter
Quoted 44 lines
---
init/Kconfig | 1 - kernel/configs/tiny-base.config | 1 + scripts/kconfig/Makefile | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 kernel/configs/tiny-base.configinit/Kconfig +0
-1@@ -1769,7 +1769,6 @@ config DEBUG_RSEQ config EMBEDDED bool "Embedded system" - option allnoconfig_y select EXPERT help This option should be enabled if compiling the kernel forkernel/configs/tiny-base.config new file +1
-0@@ -0,0 +1 @@ +CONFIG_EMBEDDED=yscripts/kconfig/Makefile +2
-2@@ -102,7 +102,8 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c PHONY += tinyconfig tinyconfig: - $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config + $(Q)KCONFIG_ALLCONFIG=kernel/configs/tiny-base.config $(MAKE) -f $(srctree)/Makefile allnoconfig + $(Q)$(MAKE) -f $(srctree)/Makefile tiny.config # CHECK: -o cache_dir=<path> working? PHONY += testconfig --2.27.0
Signature · 2 lines
Thanks, ~Nick Desaulniers
Re: [PATCH 11/13] kconfig: do not use allnoconfig_y option
Quoted 46 lines · Nick Desaulniers
Quoted 22 lines · Guenter Roeck
Quoted 10 lines · Masahiro Yamada
allnoconfig_yis a bad hack that sets a symbol to 'y' by allnoconfig.allnoconfig does not mean a minimum set of CONFIG options because a bunch of prompts are hidden by 'if EMBEDDED' or 'if EXPERT', but I do not like to do a workaround this way.
Use the pre-existing feature,
KCONFIG_ALLCONFIG, to provide a one liner config fragment.CONFIG_EMBEDDED=yis still forced under allnoconfig.Quoted 6 lines
No change in the .config file produced by 'make tinyconfig'.
The output of 'make allnoconfig' will be changed; we will get
CONFIG_EMBEDDED=nbecause allnoconfig literally sets all symbols to n.Signed-off-by Masahiro Yamada <[email protected]>With this patch in place, mips:allnoconfig fails to build with the following error.
Quoted 12 lines
Error log:
WARNING: modpost:vmlinux.o(.text+0x9c70): Section mismatch in reference from the functionreserve_exception_space()to the function .meminit.text:memblock_reserve() The functionreserve_exception_space()references
the function__meminitmemblock_reserve().
This is often becausereserve_exception_spacelacks a__meminit
annotation or the annotation ofmemblock_reserveis wrong.
ERROR: modpost: Section mismatches detected.
SetCONFIG_SECTION_MISMATCH_WARN_ONLY=yto allow them.
make[2]: *** [scripts/Makefile.modpost:62: vmlinux.symvers] Error 1
make[2]: *** Deleting file 'vmlinux.symvers'
make[1]: *** [Makefile:1292: vmlinux] Error 2
make: *** [Makefile:222: __sub-make] Error 2Thanks for the report. I suspect this is related to allnoconfig disabling
CONFIG_ARCH_KEEP_MEMBLOCK, which changes the definition of__init_memblockininclude/linux/memblock.h.So allnoconfig would unselect
CONFIG_ARCH_KEEP_MEMBLOCK, making__init_memblockequivalent to__meminittriggering the above warning.
arch/mips/Kconfig
14: selectARCH_KEEP_MEMBLOCKifDEBUG_KERNEL
Quoted 7 lines
so
DEBUG_KERNELis probably also disabled by allnoconfig.commit
a8c0f1c634507("MIPS: SelectARCH_KEEP_MEMBLOCKifDEBUG_KERNELto enable sysfs memblock debug")probably should drop the
if DEBUG_KERNELpart.
Agreed.
Guenter
Quoted 50 lines
Quoted 47 lines
Guenter
Quoted 44 lines
---
init/Kconfig | 1 - kernel/configs/tiny-base.config | 1 + scripts/kconfig/Makefile | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 kernel/configs/tiny-base.configinit/Kconfig +0
-1@@ -1769,7 +1769,6 @@ config DEBUG_RSEQ config EMBEDDED bool "Embedded system" - option allnoconfig_y select EXPERT help This option should be enabled if compiling the kernel forkernel/configs/tiny-base.config new file +1
-0@@ -0,0 +1 @@ +CONFIG_EMBEDDED=yscripts/kconfig/Makefile +2
-2@@ -102,7 +102,8 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c PHONY += tinyconfig tinyconfig: - $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config + $(Q)KCONFIG_ALLCONFIG=kernel/configs/tiny-base.config $(MAKE) -f $(srctree)/Makefile allnoconfig + $(Q)$(MAKE) -f $(srctree)/Makefile tiny.config # CHECK: -o cache_dir=<path> working? PHONY += testconfig --2.27.0
Re: [PATCH 11/13] kconfig: do not use allnoconfig_y option
In reply to Nick DesaulniersQuoted 47 lines · Nick Desaulniers
Quoted 22 lines · Guenter Roeck
Quoted 10 lines · Masahiro Yamada
allnoconfig_yis a bad hack that sets a symbol to 'y' by allnoconfig.allnoconfig does not mean a minimum set of CONFIG options because a bunch of prompts are hidden by 'if EMBEDDED' or 'if EXPERT', but I do not like to do a workaround this way.
Use the pre-existing feature,
KCONFIG_ALLCONFIG, to provide a one liner config fragment.CONFIG_EMBEDDED=yis still forced under allnoconfig.Quoted 6 lines
No change in the .config file produced by 'make tinyconfig'.
The output of 'make allnoconfig' will be changed; we will get
CONFIG_EMBEDDED=nbecause allnoconfig literally sets all symbols to n.Signed-off-by Masahiro Yamada <[email protected]>With this patch in place, mips:allnoconfig fails to build with the following error.
Quoted 12 lines
Error log:
WARNING: modpost:vmlinux.o(.text+0x9c70): Section mismatch in reference from the functionreserve_exception_space()to the function .meminit.text:memblock_reserve() The functionreserve_exception_space()references
the function__meminitmemblock_reserve().
This is often becausereserve_exception_spacelacks a__meminit
annotation or the annotation ofmemblock_reserveis wrong.
ERROR: modpost: Section mismatches detected.
SetCONFIG_SECTION_MISMATCH_WARN_ONLY=yto allow them.
make[2]: *** [scripts/Makefile.modpost:62: vmlinux.symvers] Error 1
make[2]: *** Deleting file 'vmlinux.symvers'
make[1]: *** [Makefile:1292: vmlinux] Error 2
make: *** [Makefile:222: __sub-make] Error 2Thanks for the report. I suspect this is related to allnoconfig disabling
CONFIG_ARCH_KEEP_MEMBLOCK, which changes the definition of__init_memblockininclude/linux/memblock.h.So allnoconfig would unselect
CONFIG_ARCH_KEEP_MEMBLOCK, making__init_memblockequivalent to__meminittriggering the above warning.
arch/mips/Kconfig
14: selectARCH_KEEP_MEMBLOCKifDEBUG_KERNEL
Quoted 6 lines
so
DEBUG_KERNELis probably also disabled by allnoconfig.commit
a8c0f1c634507("MIPS: SelectARCH_KEEP_MEMBLOCKifDEBUG_KERNELto enable sysfs memblock debug")probably should drop the
if DEBUG_KERNELpart.
Thanks.
Could you please send a patch to mips ML?
Quoted 53 lines
Quoted 42 lines
Guenter
Quoted 39 lines
---
init/Kconfig | 1 - kernel/configs/tiny-base.config | 1 + scripts/kconfig/Makefile | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 kernel/configs/tiny-base.configinit/Kconfig +0
-1@@ -1769,7 +1769,6 @@ config DEBUG_RSEQ config EMBEDDED bool "Embedded system" - option allnoconfig_y select EXPERT help This option should be enabled if compiling the kernel forkernel/configs/tiny-base.config new file +1
-0@@ -0,0 +1 @@ +CONFIG_EMBEDDED=yscripts/kconfig/Makefile +2
-1@@ -102,7 +102,8 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c PHONY += tinyconfig tinyconfig: - $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config + $(Q)KCONFIG_ALLCONFIG=kernel/configs/tiny-base.config $(MAKE) -f $(srctree)/Makefile allnoconfig + $(Q)$(MAKE) -f $(srctree)/Makefile tiny.configQuoted 5 lines
Quoted 5 lines
scripts/kconfig/Makefile +0
-1# CHECK: -o cache_dir=<path> working? PHONY += testconfig --2.27.0
--
Thanks,
~Nick Desaulniers
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 12/13 kconfig: remove allnoconfig_y option
In reply to Masahiro YamadaNow that the only user CONFIG_EMBEDDED has stopped using this option, remove it entirely.
---
Documentation/kbuild/kconfig-language.rst | 4 ---- scripts/kconfig/conf.c | 5 +---- scripts/kconfig/expr.h | 3 --- scripts/kconfig/lexer.l | 1 - scripts/kconfig/lkc.h | 1 - scripts/kconfig/menu.c | 5 ----- scripts/kconfig/parser.y | 6 ------ 7 files changed, 1 insertion(+), 24 deletions(-)
Documentation/kbuild/kconfig-language.rst +0 -4
@@ -234,10 +234,6 @@ applicable everywhere (see syntax). enables the third modular state for all config symbols. At most one symbol may have the "modules" option set. - - "allnoconfig_y" - This declares the symbol as one that should have the value y when - using "allnoconfig". Used for symbols that hide other symbols. - Menu dependencies -----------------
scripts/kconfig/conf.c +1 -4
@@ -232,10 +232,7 @@ static bool conf_set_all_new_symbols(enum conf_def_mode mode) sym->def[S_DEF_USER ].tri = mod;break ;case def_no: -if (sym->flags &SYMBOL_ALLNOCONFIG_Y ) - sym->def[S_DEF_USER ].tri = yes; -else - sym->def[S_DEF_USER ].tri = no; + sym->def[S_DEF_USER ].tri = no;break ;case def_random: sym->def[S_DEF_USER ].tri = no;
scripts/kconfig/expr.h +0 -3
@@ -156,9 +156,6 @@ struct symbol {/* choice values need to be set before calculating this symbol value */ #define SYMBOL_NEED_SET_CHOICE_VALUES 0x100000 -/* Set symbol to y if allnoconfig; used for symbols that hide others */ -#define SYMBOL_ALLNOCONFIG_Y 0x200000 -#define SYMBOL_MAXLENGTH 256#define SYMBOL_HASHSIZE 9973
scripts/kconfig/lexer.l +0 -1
@@ -91,7 +91,6 @@ n [A-Za-z0-9_-] [ \t]* /* whitespaces */ \\\n /* escaped new line */ \n return T_EOL; -"allnoconfig_y" return T_ALLNOCONFIG_Y; "bool" return T_BOOL; "choice" return T_CHOICE; "comment" return T_COMMENT;
scripts/kconfig/lkc.h +0 -1
@@ -106,7 +106,6 @@ struct property *menu_add_prompt(enum prop_type type, char *prompt, struct exprvoid menu_add_expr (enum prop_type type,struct expr *expr,struct expr *dep);void menu_add_symbol (enum prop_type type,struct symbol *sym,struct expr *dep);void menu_add_option_modules (void ); -void menu_add_option_allnoconfig_y (void );void menu_finalize (struct menu *parent);void menu_set_type (int type);
scripts/kconfig/menu.c +0 -5
@@ -219,11 +219,6 @@ void menu_add_option_modules(void) modules_sym = current_entry->sym; } -void menu_add_option_allnoconfig_y (void ) -{ - current_entry->sym->flags |=SYMBOL_ALLNOCONFIG_Y ; -} -static int menu_validate_number (struct symbol *sym,struct symbol *sym2) { return sym2->type == S_INT || sym2->type == S_HEX ||
scripts/kconfig/parser.y +0 -6
@@ -45,7 +45,6 @@ static struct menu *current_menu, *current_entry; %token <string> T_HELPTEXT %token <string> T_WORD %token <string> T_WORD_QUOTE -%token T_ALLNOCONFIG_Y %token T_BOOL %token T_CHOICE %token T_CLOSE_PAREN
@@ -222,11 +221,6 @@ config_option: T_OPTION T_MODULES T_EOL menu_add_option_modules(); }; -config_option: T_OPTION T_ALLNOCONFIG_Y T_EOL -{ - menu_add_option_allnoconfig_y(); -}; - /* choice entry */ choice: T_CHOICE word_opt T_EOL
Signature · 1 line
2.27.0
PATCH 13/13 kconfig: change "modules" from sub-option to first-level attribute
In reply to Masahiro YamadaNow "modules" is the only member of the "option" property.
Remove "option", and move "modules" to the top level property.
---
Documentation/kbuild/kconfig-language.rst | 14 ++++---------- init/Kconfig | 2 +- scripts/kconfig/lexer.l | 1 - scripts/kconfig/lkc.h | 1 - scripts/kconfig/menu.c | 8 -------- scripts/kconfig/parser.y | 8 +++++--- scripts/kconfig/tests/choice/Kconfig | 2 +- .../kconfig/tests/choice_value_with_m_dep/Kconfig | 2 +- scripts/kconfig/tests/inter_choice/Kconfig | 2 +- 9 files changed, 13 insertions(+), 27 deletions(-)
Documentation/kbuild/kconfig-language.rst +4 -10
@@ -223,16 +223,10 @@ applicable everywhere (see syntax). the indentation level, this means it ends at the first line which has a smaller indentation than the first line of the help text. -- misc options: "option" <symbol>[=<value>] - - Various less common options can be defined via this option syntax, - which can modify the behaviour of the menu entry and its config - symbol. These options are currently possible: - - - "modules" - This declares the symbol to be used as the MODULES symbol, which - enables the third modular state for all config symbols. - At most one symbol may have the "modules" option set. +- module attribute: "modules" + This declares the symbol to be used as the MODULES symbol, which + enables the third modular state for all config symbols. + At most one symbol may have the "modules" option set. Menu dependencies -----------------
init/Kconfig +1 -1
@@ -2043,7 +2043,7 @@ config MODULE_SIG_FORMAT menuconfig MODULES bool "Enable loadable module support" - option modules + modules help Kernel modules are small pieces of compiled code which can be inserted in the running kernel, rather than being
scripts/kconfig/lexer.l +0 -1
@@ -112,7 +112,6 @@ n [A-Za-z0-9_-] "menuconfig" return T_MENUCONFIG; "modules" return T_MODULES; "on" return T_ON; -"option" return T_OPTION; "optional" return T_OPTIONAL; "prompt" return T_PROMPT; "range" return T_RANGE;
scripts/kconfig/lkc.h +0 -1
@@ -105,7 +105,6 @@ void menu_add_visibility(struct expr *dep);struct property *menu_add_prompt (enum prop_type type,char *prompt,struct expr *dep);void menu_add_expr (enum prop_type type,struct expr *expr,struct expr *dep);void menu_add_symbol (enum prop_type type,struct symbol *sym,struct expr *dep); -void menu_add_option_modules (void );void menu_finalize (struct menu *parent);void menu_set_type (int type);
scripts/kconfig/menu.c +0 -8
@@ -211,14 +211,6 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep)menu_add_prop (type,expr_alloc_symbol (sym), dep); } -void menu_add_option_modules (void ) -{ -if (modules_sym) -zconf_error ("symbol '%s' redefines option 'modules' already defined by symbol '%s'" , - current_entry->sym->name, modules_sym->name); - modules_sym = current_entry->sym; -} -static int menu_validate_number (struct symbol *sym,struct symbol *sym2) { return sym2->type == S_INT || sym2->type == S_HEX ||
scripts/kconfig/parser.y +5 -3
@@ -69,7 +69,6 @@ static struct menu *current_menu, *current_entry; %token T_MODULES %token T_ON %token T_OPEN_PAREN -%token T_OPTION %token T_OPTIONAL %token T_PLUS_EQUAL %token T_PROMPT
@@ -216,9 +215,12 @@ config_option: T_RANGE symbol symbol if_expr T_EOL printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno()); }; -config_option: T_OPTION T_MODULES T_EOL +config_option: T_MODULES T_EOL { - menu_add_option_modules(); + if (modules_sym) + zconf_error("symbol '%s' redefines option 'modules' already defined by symbol '%s'", + current_entry->sym->name, modules_sym->name); + modules_sym = current_entry->sym; }; /* choice entry */
scripts/kconfig/tests/choice/Kconfig +1 -1
@@ -2,7 +2,7 @@ config MODULES bool "Enable loadable module support" - option modules + modules default y choice
scripts/kconfig/tests/choice_value_with_m_dep/Kconfig +1 -1
@@ -2,7 +2,7 @@ config MODULES def_bool y - option modules + modules config DEP tristate
scripts/kconfig/tests/inter_choice/Kconfig +1 -1
@@ -2,7 +2,7 @@ config MODULES def_bool y - option modules + modules choice prompt "Choice"
Signature · 1 line
2.27.0
Quoted 8 lines · Masahiro Yamada
This code is too big to be placed in the switch statement.
Move the code into a new helper function. I slightly refactor the code without changing the behavior.
Signed-off-by Masahiro Yamada <[email protected]>---
All applied to linux-kbuild/kconfig.
Quoted 79 lines
scripts/kconfig/conf.c | 54 ++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 23 deletions(-)scripts/kconfig/conf.c +31
-24@@ -82,6 +82,36 @@ static void xfgets(char *str, int size, FILE *in)printf ("%s" , str); } +static void set_randconfig_seed (void ) +{ +unsigned int seed; +char *env; +bool seed_set = false; + + env =getenv ("KCONFIG_SEED" ); +if (env && *env) { +char *endp; + + seed =strtol (env, &endp,0 ); +if (*endp =='\0' ) + seed_set = true; + } + +if (!seed_set) { +struct timeval now; + +/* +* Use microseconds derived seed, compensate for systems where it may +* be zero. +*/ +gettimeofday (&now,NULL ); + seed = (now.tv_sec +1 ) * (now.tv_usec +1 ); + } + +printf ("KCONFIG_SEED=0x%X\n" , seed); +srand (seed); +} +static int conf_askvalue (struct symbol *sym,const char *def) {if (!sym_has_value (sym))@@ -515,30 +545,8 @@ int main(int ac, char **av) defconfig_file = optarg;break ;case randconfig: - { -struct timeval now; -unsigned int seed; -char *seed_env; - -/* -* Use microseconds derived seed, -* compensate for systems where it may be zero -*/ -gettimeofday (&now,NULL ); - seed = (unsigned int )((now.tv_sec +1 ) * (now.tv_usec +1 )); - - seed_env =getenv ("KCONFIG_SEED" ); -if ( seed_env && *seed_env ) { -char *endp; -int tmp = (int )strtol (seed_env, &endp,0 ); -if (*endp =='\0' ) { - seed = tmp; - } - } -fprintf ( stderr,"KCONFIG_SEED=0x%X\n" , seed ); -srand (seed); +set_randconfig_seed ();break ; - }case oldaskconfig:case oldconfig:case allnoconfig: --2.27.0
Signature · 2 lines
Best Regards Masahiro Yamada