Kbuild: kconfig: Verbose version of --listnewconfig
PATCH v3 1/1 Kbuild: kconfig: Verbose version of --listnewconfig
If the KCONFIG_VERBOSE environment variable is set, show the default values of new symbols and not just their names.
Based on work by Bastian Blank <[email protected]> and maximilian attems <[email protected]>. Simplified by Michal Marek <[email protected]>.
---
I believe this incorporates all the comments made on v2.
Ben.
scripts/kconfig/conf.c | 37 +++++++++++++++++++++++++++---------- scripts/kconfig/confdata.c | 5 +++-- scripts/kconfig/expr.h | 2 ++ scripts/kconfig/lkc_proto.h | 1 + 4 files changed, 33 insertions(+), 12 deletions(-)
scripts/kconfig/conf.c +27 -10
@@ -363,7 +363,6 @@ static void conf(struct menu *menu)switch (prop->type) {case P_MENU :if ((input_mode == silentoldconfig || - input_mode == listnewconfig || input_mode == oldnoconfig) && rootEntry != menu) {check_conf (menu);
@@ -423,11 +422,7 @@ static void check_conf(struct menu *menu)if (sym && !sym_has_value (sym)) {if (sym_is_changable (sym) || (sym_is_choice (sym) &&sym_get_tristate_value (sym) == yes)) { -if (input_mode == listnewconfig) { -if (sym->name && !sym_is_choice_value (sym)) { -printf ("%s%s\n" ,CONFIG_ , sym->name); - } - }else if (input_mode != oldnoconfig) { +if (input_mode != oldnoconfig) {if (!conf_cnt++)printf (_ ("*\n* Restart config...\n*\n" )); rootEntry =menu_get_parent_menu (menu);
@@ -440,6 +435,27 @@ static void check_conf(struct menu *menu)check_conf (child); } +static void report_conf (struct menu *menu,bool verbose) +{ +struct symbol *sym; +struct menu *child; + +if (!menu_is_visible (menu)) +return ; + + sym = menu->sym; +if (sym && (sym->flags &SYMBOL_NEW ) && +sym_is_changable (sym) && sym->name && !sym_is_choice_value (sym)) { +if (verbose) +conf_write_symbol (sym, sym->type, stdout, true); +else +printf ("%s%s\n" ,CONFIG_ , sym->name); + } + +for (child = menu->list; child; child = child->next) +report_conf (child, verbose); +} +static struct option long_opts[] = { {"oldaskconfig" , no_argument,NULL , oldaskconfig}, {"oldconfig" , no_argument,NULL , oldconfig},
@@ -604,16 +620,17 @@ int main(int ac, char **av) input_mode = silentoldconfig;/* fall through */ case oldconfig: -case listnewconfig:case oldnoconfig:case silentoldconfig:/* Update until a loop caused no more changes */ do { conf_cnt =0 ;check_conf (&rootmenu); - }while (conf_cnt && - (input_mode != listnewconfig && - input_mode != oldnoconfig)); + }while (conf_cnt && input_mode != oldnoconfig); +break ; +case listnewconfig: +conf_set_all_new_symbols (def_default); +report_conf (&rootmenu,getenv ("KCONFIG_VERBOSE" ) !=NULL );break ; }
scripts/kconfig/confdata.c +3 -2
@@ -440,8 +440,8 @@ static void conf_write_string(bool headerfile, const char *name,fputs ("\"\n" , out); } -static void conf_write_symbol (struct symbol *sym,enum symbol_type type, -FILE *out,bool write_no) +void conf_write_symbol (struct symbol *sym,enum symbol_type type, +FILE *out,bool write_no) {const char *str;
@@ -1009,6 +1009,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) for_all_symbols(i, sym) {if (sym_has_value (sym))continue ; + sym->flags |=SYMBOL_NEW ;switch (sym_get_type (sym)) {case S_BOOLEAN :case S_TRISTATE :
scripts/kconfig/expr.h +2 -0
@@ -108,6 +108,8 @@ struct symbol {#define SYMBOL_DEF3 0x40000/* symbol.def[S_DEF_3] is valid */ #define SYMBOL_DEF4 0x80000/* symbol.def[S_DEF_4] is valid */ +#define SYMBOL_NEW 0x100000/* symbol is new (loaded config did not provide a value) */ +#define SYMBOL_MAXLENGTH 256#define SYMBOL_HASHSIZE 9973
scripts/kconfig/lkc_proto.h +1 -0
@@ -7,6 +7,7 @@ P(conf_read_simple,int,(const char *name, int)); P(conf_write_defconfig,int,(const char *name)); P(conf_write,int,(const char *name)); P(conf_write_autoconf,int,(void)); +P(conf_write_symbol, void,(struct symbol*, enum symbol_type, FILE*, bool)); P(conf_get_changed,bool,(void)); P(conf_set_changed_callback, void,(void (*fn)(void))); P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap)));
Signature · 1 line
1.7.2.3
Quoted 10 lines · Ben Hutchings
If the
KCONFIG_VERBOSEenvironment variable is set, show the default values of new symbols and not just their names.Based on work by Bastian Blank <[email protected]> and maximilian attems <[email protected]>. Simplified by Michal Marek <[email protected]>.
Signed-off-by Ben Hutchings <[email protected]>---
I believe this incorporates all the comments made on v2.
Thanks, applied to kbuild-2.6.git#kconfig.
Michal
Hi,
Quoted 8 lines · Michal Marek
Quoted 7 lines · Ben Hutchings
If the
KCONFIG_VERBOSEenvironment variable is set, show the default values of new symbols and not just their names.Based on work by Bastian Blank <[email protected]> and maximilian attems <[email protected]>. Simplified by Michal Marek <[email protected]>.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Ben Hutchings <[email protected]>---
I believe this incorporates all the comments made on v2.Thanks, applied to kbuild-2.6.git#kconfig.
Did you look at the factorization and abstraction of I proposed ?
- Arnaud
Quoted 11 lines · Arnaud Lacombe
Hi,
Quoted 8 lines · Michal Marek
Quoted 7 lines · Ben Hutchings
If the
KCONFIG_VERBOSEenvironment variable is set, show the default values of new symbols and not just their names.Based on work by Bastian Blank <[email protected]> and maximilian attems <[email protected]>. Simplified by Michal Marek <[email protected]>.
Quoted 7 lines
Quoted 6 lines
Quoted 3 lines
Signed-off-by Ben Hutchings <[email protected]>---
I believe this incorporates all the comments made on v2.Thanks, applied to kbuild-2.6.git#kconfig.
Did you look at the factorization and abstraction of I proposed ?
Not yet. OK, I'll have a look at it now and decide what to do. I haven't pushed out the kbuild tree yet.
Michal