diff options
Diffstat (limited to 'scripts/kconfig/confdata.c')
| -rw-r--r-- | scripts/kconfig/confdata.c | 38 | 
1 files changed, 2 insertions, 36 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 0586085136d..52577f052bc 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -540,35 +540,6 @@ static struct conf_printer header_printer_cb =  };  /* - * 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. - */ -static void -header_print__enabled_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) -{ - -	switch (sym->type) { -	case S_BOOLEAN: -	case S_TRISTATE: { -		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; -	} -	default: -		break; -	} -} - -static struct conf_printer header__enabled_printer_cb = -{ -	.print_symbol = header_print__enabled_symbol, -	.print_comment = header_print_comment, -}; - -/*   * Tristate printer   *   * This printer is used when generating the `include/config/tristate.conf' file. @@ -949,16 +920,11 @@ int conf_write_autoconf(void)  	conf_write_heading(out_h, &header_printer_cb, NULL);  	for_all_symbols(i, sym) { -		if (!sym->name) -			continue; -  		sym_calc_value(sym); - -		conf_write_symbol(out_h, sym, &header__enabled_printer_cb, NULL); - -		if (!(sym->flags & SYMBOL_WRITE)) +		if (!(sym->flags & SYMBOL_WRITE) || !sym->name)  			continue; +		/* write symbol to auto.conf, tristate and header files */  		conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1);  		conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1);  |