aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-05-17 17:31:53 +0200
committerMichal Marek <mmarek@suse.cz>2011-05-25 15:26:25 +0200
commit4c54f0f846102b05efcc99114ada2b913baab161 (patch)
treedcecc20a8a60594e2feda5e300257a6b4c86d9e7 /scripts
parent51f31afd12b28eddccd29a94ffbd41cb15eadd39 (diff)
downloadautogen-4c54f0f846102b05efcc99114ada2b913baab161.tar.gz
autogen-4c54f0f846102b05efcc99114ada2b913baab161.tar.xz
autogen-4c54f0f846102b05efcc99114ada2b913baab161.zip
kconfig: Only generate config_is_xxx for bool and tristate options
For strings and integers, the config_is_xxx macros are useless and sometimes misleading: #define CONFIG_INITRAMFS_SOURCE "" #define config_is_initramfs_source() 1 Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/confdata.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index a1a9872e4a2..d01f962e879 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -798,7 +798,6 @@ int conf_write_autoconf(void)
const char *name;
FILE *out, *tristate, *out_h;
int i;
- int fct_val;
sym_clear_all_valid();
@@ -839,7 +838,7 @@ int conf_write_autoconf(void)
rootmenu.prompt->text);
for_all_symbols(i, sym) {
- fct_val = 1;
+ int fct_val = 0;
sym_calc_value(sym);
if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
continue;
@@ -853,7 +852,6 @@ int conf_write_autoconf(void)
case S_TRISTATE:
switch (sym_get_tristate_value(sym)) {
case no:
- fct_val = 0;
break;
case mod:
fprintf(tristate, "%s%s=M\n",
@@ -868,8 +866,10 @@ int conf_write_autoconf(void)
CONFIG_, sym->name);
fprintf(out_h, "#define %s%s 1\n",
CONFIG_, sym->name);
+ fct_val = 1;
break;
}
+ conf_write_function_autoconf(out_h, CONFIG_, sym->name, fct_val);
break;
case S_STRING:
conf_write_string(true, sym->name, sym_get_string_value(sym), out_h);
@@ -887,10 +887,8 @@ int conf_write_autoconf(void)
CONFIG_, sym->name, str);
break;
default:
- fct_val = 0;
break;
}
- conf_write_function_autoconf(out_h, CONFIG_, sym->name, fct_val);
}
fclose(out);
fclose(tristate);