summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/confdata.c
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-07-20 17:38:57 +0200
committerMichal Marek <mmarek@suse.cz>2011-07-29 21:53:30 +0200
commit2a11c8ea20bf850b3a2c60db8c2e7497d28aba99 (patch)
tree975a44ccb84f5fb182fa1d6d58025b0cde381965 /scripts/kconfig/confdata.c
parentbac6aa865b3dc98e9fbc17f11d4d513d6b0bc435 (diff)
downloadlinux-2a11c8ea20bf850b3a2c60db8c2e7497d28aba99.tar.gz
linux-2a11c8ea20bf850b3a2c60db8c2e7497d28aba99.tar.bz2
linux-2a11c8ea20bf850b3a2c60db8c2e7497d28aba99.zip
kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()
Replace the config_is_*() macros with a variant that allows for grepping for usage of CONFIG_* options in the code. Usage: if (IS_ENABLED(CONFIG_NUMA)) or #if IS_ENABLED(CONFIG_NUMA) The IS_ENABLED() macro evaluates to 1 if the argument is set (to either 'y' or 'm'), IS_BUILTIN() tests if the option is 'y' and IS_MODULE() test if the option is 'm'. Only boolean and tristate options are supported. Reviewed-by: Arnaud Lacombe <lacombar@gmail.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig/confdata.c')
-rw-r--r--scripts/kconfig/confdata.c71
1 files changed, 14 insertions, 57 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index df629ecb4fdf..59b667cae5f3 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -495,15 +495,25 @@ header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
switch (*value) {
case 'n':
- return;
+ break;
case 'm':
suffix = "_MODULE";
/* fall through */
default:
- value = "1";
+ fprintf(fp, "#define %s%s%s 1\n",
+ CONFIG_, sym->name, suffix);
}
- fprintf(fp, "#define %s%s%s %s\n",
- CONFIG_, sym->name, suffix, value);
+ /*
+ * Generate the __enabled_CONFIG_* and
+ * __enabled_CONFIG_*_MODULE macros for use by the
+ * IS_{ENABLED,BUILTIN,MODULE} macros. The _MODULE variant is
+ * generated even for booleans so that the IS_ENABLED() macro
+ * works.
+ */
+ fprintf(fp, "#define __enabled_" CONFIG_ "%s %d\n",
+ sym->name, (*value == 'y'));
+ fprintf(fp, "#define __enabled_" CONFIG_ "%s_MODULE %d\n",
+ sym->name, (*value == 'm'));
break;
}
case S_HEX: {
@@ -555,58 +565,6 @@ static struct conf_printer header_printer_cb =
};
/*
- * Function-style header printer
- *
- * This printer is used to generate the config_is_xxx() function-style macros
- * in `include/generated/autoconf.h'
- */
-static void
-header_function_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
-{
- int val = 0;
- char c;
- char *tmp, *d;
-
- switch (sym->type) {
- case S_BOOLEAN:
- case S_TRISTATE:
- break;
- default:
- return;
- }
- if (*value == 'm')
- val = 2;
- else if (*value == 'y')
- val = 1;
-
- d = strdup(CONFIG_);
- tmp = d;
- while ((c = *d)) {
- *d = tolower(c);
- d++;
- }
-
- fprintf(fp, "#define %sis_", tmp);
- free(tmp);
-
- d = strdup(sym->name);
- tmp = d;
- while ((c = *d)) {
- *d = tolower(c);
- d++;
- }
- fprintf(fp, "%s%s() %d\n", tmp, (val > 1) ? "_module" : "",
- val ? 1 : 0);
- free(tmp);
-}
-
-static struct conf_printer header_function_printer_cb =
-{
- .print_symbol = header_function_print_symbol,
-};
-
-
-/*
* Tristate printer
*
* This printer is used when generating the `include/config/tristate.conf' file.
@@ -997,7 +955,6 @@ int conf_write_autoconf(void)
conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1);
conf_write_symbol(out_h, sym, &header_printer_cb, NULL);
- conf_write_symbol(out_h, sym, &header_function_printer_cb, NULL);
}
fclose(out);
fclose(tristate);