Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4d6152b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (26 commits)
  kconfig: add savedefconfig
  kconfig: code refactoring in confdata.c
  kconfig: refactor code in symbol.c
  kconfig: add alldefconfig
  kconfig: print more info when we see a recursive dependency
  kconfig: save location of config symbols
  kconfig: change nonint_oldconfig to listnewconfig
  kconfig: rename loose_nonint_oldconfig => oldnoconfig
  kconfig: use long options in conf
  kconfig: fix MODULES-related bug in case of no .config
  kconfig: make randconfig fair for booleans
  kconfig: Don't write invisible choice values
  kbuild: Warn on selecting symbols with unmet direct dependencies
  scripts:conf.c Fix warning: variable 'type' set but not used
  menuconfig: truncate list items
  menuconfig: fix to center checklist correctly in a corner case
  xconfig: add support to show hidden options which have prompts
  xconfig: remove unused function
  xconfig: clean up
  gconfig: fix null pointer warning
  ...
parents da9e82b3 7a996d3a

Documentation/kbuild/kconfig.txt

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ also use the environment variable KCONFIG_ALLCONFIG as a flag or a 
filename that contains config symbols that the user requires to be

set to a specific value.  If KCONFIG_ALLCONFIG is used without a

filename, "make *config" checks for a file named

"all{yes/mod/no/random}.config" (corresponding to the *config command

"all{yes/mod/no/def/random}.config" (corresponding to the *config command

that was used) for symbol values that are to be forced.  If this file

is not found, it checks for a file named "all.config" to contain forced

values.

scripts/kconfig/Makefile

+40 −37
Original line number Diff line number Diff line
@@ -21,17 +21,17 @@ menuconfig: $(obj)/mconf 
	$< $(Kconfig)



config: $(obj)/conf

	$< $(Kconfig)

	$< --oldaskconfig $(Kconfig)



nconfig: $(obj)/nconf

	$< $(Kconfig)



oldconfig: $(obj)/conf

	$< -o $(Kconfig)

	$< --$@ $(Kconfig)



silentoldconfig: $(obj)/conf

	$(Q)mkdir -p include/generated

	$< -s $(Kconfig)

	$< --$@ $(Kconfig)



# if no path is given, then use src directory to find file

ifdef LSMOD
@@ -48,11 +48,11 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 
			cmp -s .tmp.config .config ||			\

			(mv -f .config .config.old.1;			\

			 mv -f .tmp.config .config;			\

			 $(obj)/conf -s $(Kconfig);		\

			 $(obj)/conf --silentoldconfig $(Kconfig);	\

			 mv -f .config.old.1 .config.old)		\

	else								\

			mv -f .tmp.config .config;			\

			$(obj)/conf -s $(Kconfig);		\

			$(obj)/conf --silentoldconfig $(Kconfig);	\

	fi

	$(Q)rm -f .tmp.config
@@ -64,11 +64,11 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf 
			cmp -s .tmp.config .config ||			\

			(mv -f .config .config.old.1;			\

			 mv -f .tmp.config .config;			\

			 $(obj)/conf -s $(Kconfig);		\

			 $(obj)/conf --silentoldconfig $(Kconfig);	\

			 mv -f .config.old.1 .config.old)		\

	else								\

			mv -f .tmp.config .config;			\

			$(obj)/conf -s $(Kconfig);		\

			$(obj)/conf --silentoldconfig $(Kconfig);	\

	fi

	$(Q)rm -f .tmp.config
@@ -95,30 +95,29 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h 
	$(Q)rm -f arch/um/Kconfig.arch

	$(Q)rm -f $(obj)/config.pot



PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig

PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig



randconfig: $(obj)/conf

	$< -r $(Kconfig)

allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf

	$< --$@ $(Kconfig)



allyesconfig: $(obj)/conf

	$< -y $(Kconfig)

PHONY += listnewconfig oldnoconfig savedefconfig defconfig



allnoconfig: $(obj)/conf

	$< -n $(Kconfig)

listnewconfig oldnoconfig: $(obj)/conf

	$< --$@ $(Kconfig)



allmodconfig: $(obj)/conf

	$< -m $(Kconfig)

savedefconfig: $(obj)/conf

	$< --$@=defconfig $(Kconfig)



defconfig: $(obj)/conf

ifeq ($(KBUILD_DEFCONFIG),)

	$< -d $(Kconfig)

	$< --defconfig $(Kconfig)

else

	@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"

	$(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)

	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)

endif



%_defconfig: $(obj)/conf

	$(Q)$< -D arch/$(SRCARCH)/configs/$@ $(Kconfig)

	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)



# Help text used by make help

help:
@@ -131,11 +130,15 @@ help: 
	@echo  '  localmodconfig  - Update current config disabling modules not loaded'

	@echo  '  localyesconfig  - Update current config converting local mods to core'

	@echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'

	@echo  '  randconfig	  - New config with random answer to all options'

	@echo  '  defconfig	  - New config with default answer to all options'

	@echo  '  allmodconfig	  - New config selecting modules when possible'

	@echo  '  allyesconfig	  - New config where all options are accepted with yes'

	@echo  '  defconfig	  - New config with default from ARCH supplied defconfig'

	@echo  '  savedefconfig   - Save current config as ./defconfig (minimal config)'

	@echo  '  allnoconfig	  - New config where all options are answered with no'

	@echo  '  allyesconfig	  - New config where all options are accepted with yes'

	@echo  '  allmodconfig	  - New config selecting modules when possible'

	@echo  '  alldefconfig    - New config with all symbols set to default'

	@echo  '  randconfig	  - New config with random answer to all options'

	@echo  '  listnewconfig   - List new options'

	@echo  '  oldnoconfig     - Same as silentoldconfig but set new symbols to n (unset)'



# lxdialog stuff

check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh

scripts/kconfig/conf.c

+105 −76
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <string.h>

#include <time.h>

#include <unistd.h>

#include <getopt.h>

#include <sys/stat.h>

#include <sys/time.h>
@@ -19,16 +20,21 @@ 
static void conf(struct menu *menu);

static void check_conf(struct menu *menu);



enum {

	ask_all,

	ask_new,

	ask_silent,

	set_default,

	set_yes,

	set_mod,

	set_no,

	set_random

} input_mode = ask_all;

enum input_mode {

	oldaskconfig,

	silentoldconfig,

	oldconfig,

	allnoconfig,

	allyesconfig,

	allmodconfig,

	alldefconfig,

	randconfig,

	defconfig,

	savedefconfig,

	listnewconfig,

	oldnoconfig,

} input_mode = oldaskconfig;



char *defconfig_file;



static int indent = 1;
@@ -93,14 +99,14 @@ static int conf_askvalue(struct symbol *sym, const char *def) 
	}



	switch (input_mode) {

	case ask_new:

	case ask_silent:

	case oldconfig:

	case silentoldconfig:

		if (sym_has_value(sym)) {

			printf("%s\n", def);

			return 0;

		}

		check_stdin();

	case ask_all:

	case oldaskconfig:

		fflush(stdout);

		fgets(line, 128, stdin);

		return 1;
@@ -156,14 +162,12 @@ static int conf_string(struct menu *menu) 
static int conf_sym(struct menu *menu)

{

	struct symbol *sym = menu->sym;

	int type;

	tristate oldval, newval;



	while (1) {

		printf("%*s%s ", indent - 1, "", _(menu->prompt->text));

		if (sym->name)

			printf("(%s) ", sym->name);

		type = sym_get_type(sym);

		putchar('[');

		oldval = sym_get_tristate_value(sym);

		switch (oldval) {
@@ -228,11 +232,9 @@ static int conf_choice(struct menu *menu) 
{

	struct symbol *sym, *def_sym;

	struct menu *child;

	int type;

	bool is_new;



	sym = menu->sym;

	type = sym_get_type(sym);

	is_new = !sym_has_value(sym);

	if (sym_is_changable(sym)) {

		conf_sym(menu);
@@ -294,15 +296,15 @@ static int conf_choice(struct menu *menu) 
			printf("?");

		printf("]: ");

		switch (input_mode) {

		case ask_new:

		case ask_silent:

		case oldconfig:

		case silentoldconfig:

			if (!is_new) {

				cnt = def;

				printf("%d\n", cnt);

				break;

			}

			check_stdin();

		case ask_all:

		case oldaskconfig:

			fflush(stdout);

			fgets(line, 128, stdin);

			strip(line);
@@ -360,7 +362,10 @@ static void conf(struct menu *menu) 


		switch (prop->type) {

		case P_MENU:

			if (input_mode == ask_silent && rootEntry != menu) {

			if ((input_mode == silentoldconfig ||

			     input_mode == listnewconfig ||

			     input_mode == oldnoconfig) &&

			    rootEntry != menu) {

				check_conf(menu);

				return;

			}
@@ -418,17 +423,39 @@ 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("CONFIG_%s\n", sym->name);

				}

			} else {

				if (!conf_cnt++)

					printf(_("*\n* Restart config...\n*\n"));

				rootEntry = menu_get_parent_menu(menu);

				conf(rootEntry);

			}

		}

	}



	for (child = menu->list; child; child = child->next)

		check_conf(child);

}



static struct option long_opts[] = {

	{"oldaskconfig",    no_argument,       NULL, oldaskconfig},

	{"oldconfig",       no_argument,       NULL, oldconfig},

	{"silentoldconfig", no_argument,       NULL, silentoldconfig},

	{"defconfig",       optional_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},

	{"oldnoconfig",     no_argument,       NULL, oldnoconfig},

	{NULL, 0, NULL, 0}

};



int main(int ac, char **av)

{

	int opt;
@@ -439,32 +466,17 @@ int main(int ac, char **av) 
	bindtextdomain(PACKAGE, LOCALEDIR);

	textdomain(PACKAGE);



	while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {

	while ((opt = getopt_long_only(ac, av, "", long_opts, NULL)) != -1) {

		input_mode = (enum input_mode)opt;

		switch (opt) {

		case 'o':

			input_mode = ask_silent;

			break;

		case 's':

			input_mode = ask_silent;

		case silentoldconfig:

			sync_kconfig = 1;

			break;

		case 'd':

			input_mode = set_default;

			break;

		case 'D':

			input_mode = set_default;

		case defconfig:

		case savedefconfig:

			defconfig_file = optarg;

			break;

		case 'n':

			input_mode = set_no;

			break;

		case 'm':

			input_mode = set_mod;

			break;

		case 'y':

			input_mode = set_yes;

			break;

		case 'r':

		case randconfig:

		{

			struct timeval now;

			unsigned int seed;
@@ -477,17 +489,12 @@ int main(int ac, char **av) 


			seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));

			srand(seed);



			input_mode = set_random;

			break;

		}

		case 'h':

			printf(_("See README for usage info\n"));

			exit(0);

			break;

		default:

		case '?':

			fprintf(stderr, _("See README for usage info\n"));

			exit(1);

			break;

		}

	}

	if (ac == optind) {
@@ -512,7 +519,7 @@ int main(int ac, char **av) 
	}



	switch (input_mode) {

	case set_default:

	case defconfig:

		if (!defconfig_file)

			defconfig_file = conf_get_default_confname();

		if (conf_read(defconfig_file)) {
@@ -522,25 +529,32 @@ int main(int ac, char **av) 
			exit(1);

		}

		break;

	case ask_silent:

	case ask_all:

	case ask_new:

	case savedefconfig:

		conf_read(NULL);

		break;

	case silentoldconfig:

	case oldaskconfig:

	case oldconfig:

	case listnewconfig:

	case oldnoconfig:

		conf_read(NULL);

		break;

	case set_no:

	case set_mod:

	case set_yes:

	case set_random:

	case allnoconfig:

	case allyesconfig:

	case allmodconfig:

	case alldefconfig:

	case randconfig:

		name = getenv("KCONFIG_ALLCONFIG");

		if (name && !stat(name, &tmpstat)) {

			conf_read_simple(name, S_DEF_USER);

			break;

		}

		switch (input_mode) {

		case set_no:	 name = "allno.config"; break;

		case set_mod:	 name = "allmod.config"; break;

		case set_yes:	 name = "allyes.config"; break;

		case set_random: name = "allrandom.config"; break;

		case allnoconfig:	name = "allno.config"; break;

		case allyesconfig:	name = "allyes.config"; break;

		case allmodconfig:	name = "allmod.config"; break;

		case alldefconfig:	name = "alldef.config"; break;

		case randconfig:	name = "allrandom.config"; break;

		default: break;

		}

		if (!stat(name, &tmpstat))
@@ -565,33 +579,42 @@ int main(int ac, char **av) 
	}



	switch (input_mode) {

	case set_no:

	case allnoconfig:

		conf_set_all_new_symbols(def_no);

		break;

	case set_yes:

	case allyesconfig:

		conf_set_all_new_symbols(def_yes);

		break;

	case set_mod:

	case allmodconfig:

		conf_set_all_new_symbols(def_mod);

		break;

	case set_random:

	case alldefconfig:

		conf_set_all_new_symbols(def_default);

		break;

	case randconfig:

		conf_set_all_new_symbols(def_random);

		break;

	case set_default:

	case defconfig:

		conf_set_all_new_symbols(def_default);

		break;

	case ask_new:

	case ask_all:

	case savedefconfig:

		break;

	case oldconfig:

	case oldaskconfig:

		rootEntry = &rootmenu;

		conf(&rootmenu);

		input_mode = ask_silent;

		input_mode = silentoldconfig;

		/* fall through */

	case ask_silent:

	case listnewconfig:

	case oldnoconfig:

	case silentoldconfig:

		/* Update until a loop caused no more changes */

		do {

			conf_cnt = 0;

			check_conf(&rootmenu);

		} while (conf_cnt);

		} while (conf_cnt &&

			 (input_mode != listnewconfig &&

			  input_mode != oldnoconfig));

		break;

	}
@@ -607,7 +630,13 @@ int main(int ac, char **av) 
			fprintf(stderr, _("\n*** Error during update of the kernel configuration.\n\n"));

			return 1;

		}

	} else {

	} else if (input_mode == savedefconfig) {

		if (conf_write_defconfig(defconfig_file)) {

			fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),

			        defconfig_file);

			return 1;

		}

	} else if (input_mode != listnewconfig) {

		if (conf_write(NULL)) {

			fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));

			exit(1);

scripts/kconfig/confdata.c

+152 −69
Original line number Diff line number Diff line
@@ -170,8 +170,11 @@ int conf_read_simple(const char *name, int def) 
		if (in)

			goto load;

		sym_add_change_count(1);

		if (!sym_defconfig_list)

		if (!sym_defconfig_list) {

			if (modules_sym)

				sym_calc_value(modules_sym);

			return 1;

		}



		for_all_defaults(sym_defconfig_list, prop) {

			if (expr_calc_value(prop->visible.expr) == no ||
@@ -396,15 +399,149 @@ int conf_read(const char *name) 
	return 0;

}



/* Write a S_STRING */

static void conf_write_string(bool headerfile, const char *name,

                              const char *str, FILE *out)

{

	int l;

	if (headerfile)

		fprintf(out, "#define CONFIG_%s \"", name);

	else

		fprintf(out, "CONFIG_%s=\"", name);



	while (1) {

		l = strcspn(str, "\"\\");

		if (l) {

			fwrite(str, l, 1, out);

			str += l;

		}

		if (!*str)

			break;

		fprintf(out, "\\%c", *str++);

	}

	fputs("\"\n", out);

}



static void conf_write_symbol(struct symbol *sym, enum symbol_type type,

                              FILE *out, bool write_no)

{

	const char *str;



	switch (type) {

	case S_BOOLEAN:

	case S_TRISTATE:

		switch (sym_get_tristate_value(sym)) {

		case no:

			if (write_no)

				fprintf(out, "# CONFIG_%s is not set\n", sym->name);

			break;

		case mod:

			fprintf(out, "CONFIG_%s=m\n", sym->name);

			break;

		case yes:

			fprintf(out, "CONFIG_%s=y\n", sym->name);

			break;

		}

		break;

	case S_STRING:

		conf_write_string(false, sym->name, sym_get_string_value(sym), out);

		break;

	case S_HEX:

	case S_INT:

		str = sym_get_string_value(sym);

		fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

		break;

	case S_OTHER:

	case S_UNKNOWN:

		break;

	}

}



/*

 * Write out a minimal config.

 * All values that has default values are skipped as this is redundant.

 */

int conf_write_defconfig(const char *filename)

{

	struct symbol *sym;

	struct menu *menu;

	FILE *out;



	out = fopen(filename, "w");

	if (!out)

		return 1;



	sym_clear_all_valid();



	/* Traverse all menus to find all relevant symbols */

	menu = rootmenu.list;



	while (menu != NULL)

	{

		sym = menu->sym;

		if (sym == NULL) {

			if (!menu_is_visible(menu))

				goto next_menu;

		} else if (!sym_is_choice(sym)) {

			sym_calc_value(sym);

			if (!(sym->flags & SYMBOL_WRITE))

				goto next_menu;

			sym->flags &= ~SYMBOL_WRITE;

			/* If we cannot change the symbol - skip */

			if (!sym_is_changable(sym))

				goto next_menu;

			/* If symbol equals to default value - skip */

			if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0)

				goto next_menu;



			/*

			 * If symbol is a choice value and equals to the

			 * default for a choice - skip.

			 * But only if value equal to "y".

			 */

			if (sym_is_choice_value(sym)) {

				struct symbol *cs;

				struct symbol *ds;



				cs = prop_get_symbol(sym_get_choice_prop(sym));

				ds = sym_choice_default(cs);

				if (sym == ds) {

					if ((sym->type == S_BOOLEAN ||

					sym->type == S_TRISTATE) &&

					sym_get_tristate_value(sym) == yes)

						goto next_menu;

				}

			}

			conf_write_symbol(sym, sym->type, out, true);

		}

next_menu:

		if (menu->list != NULL) {

			menu = menu->list;

		}

		else if (menu->next != NULL) {

			menu = menu->next;

		} else {

			while ((menu = menu->parent)) {

				if (menu->next != NULL) {

					menu = menu->next;

					break;

				}

			}

		}

	}

	fclose(out);

	return 0;

}



int conf_write(const char *name)

{

	FILE *out;

	struct symbol *sym;

	struct menu *menu;

	const char *basename;

	char dirname[128], tmpname[128], newname[128];

	int type, l;

	const char *str;

	char dirname[128], tmpname[128], newname[128];

	enum symbol_type type;

	time_t now;

	int use_timestamp = 1;

	char *env;
@@ -484,47 +621,8 @@ int conf_write(const char *name) 
				if (modules_sym->curr.tri == no)

					type = S_BOOLEAN;

			}

			switch (type) {

			case S_BOOLEAN:

			case S_TRISTATE:

				switch (sym_get_tristate_value(sym)) {

				case no:

					fprintf(out, "# CONFIG_%s is not set\n", sym->name);

					break;

				case mod:

					fprintf(out, "CONFIG_%s=m\n", sym->name);

					break;

				case yes:

					fprintf(out, "CONFIG_%s=y\n", sym->name);

					break;

				}

				break;

			case S_STRING:

				str = sym_get_string_value(sym);

				fprintf(out, "CONFIG_%s=\"", sym->name);

				while (1) {

					l = strcspn(str, "\"\\");

					if (l) {

						fwrite(str, l, 1, out);

						str += l;

					}

					if (!*str)

						break;

					fprintf(out, "\\%c", *str++);

				}

				fputs("\"\n", out);

				break;

			case S_HEX:

				str = sym_get_string_value(sym);

				if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {

					fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

					break;

				}

			case S_INT:

				str = sym_get_string_value(sym);

				fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

				break;

			}

			/* Write config symbol to file */

			conf_write_symbol(sym, type, out, true);

		}



next:
@@ -679,7 +777,7 @@ int conf_write_autoconf(void) 
	const char *name;

	FILE *out, *tristate, *out_h;

	time_t now;

	int i, l;

	int i;



	sym_clear_all_valid();
@@ -729,6 +827,11 @@ int conf_write_autoconf(void) 
		sym_calc_value(sym);

		if (!(sym->flags & SYMBOL_WRITE) || !sym->name)

			continue;



		/* write symbol to config file */

		conf_write_symbol(sym, sym->type, out, false);



		/* update autoconf and tristate files */

		switch (sym->type) {

		case S_BOOLEAN:

		case S_TRISTATE:
@@ -736,12 +839,10 @@ int conf_write_autoconf(void) 
			case no:

				break;

			case mod:

				fprintf(out, "CONFIG_%s=m\n", sym->name);

				fprintf(tristate, "CONFIG_%s=M\n", sym->name);

				fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);

				break;

			case yes:

				fprintf(out, "CONFIG_%s=y\n", sym->name);

				if (sym->type == S_TRISTATE)

					fprintf(tristate, "CONFIG_%s=Y\n",

							sym->name);
@@ -750,35 +851,16 @@ int conf_write_autoconf(void) 
			}

			break;

		case S_STRING:

			str = sym_get_string_value(sym);

			fprintf(out, "CONFIG_%s=\"", sym->name);

			fprintf(out_h, "#define CONFIG_%s \"", sym->name);

			while (1) {

				l = strcspn(str, "\"\\");

				if (l) {

					fwrite(str, l, 1, out);

					fwrite(str, l, 1, out_h);

					str += l;

				}

				if (!*str)

					break;

				fprintf(out, "\\%c", *str);

				fprintf(out_h, "\\%c", *str);

				str++;

			}

			fputs("\"\n", out);

			fputs("\"\n", out_h);

			conf_write_string(true, sym->name, sym_get_string_value(sym), out_h);

			break;

		case S_HEX:

			str = sym_get_string_value(sym);

			if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {

				fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

				fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);

				break;

			}

		case S_INT:

			str = sym_get_string_value(sym);

			fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

			fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);

			break;

		default:
@@ -862,7 +944,8 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) 
				sym->def[S_DEF_USER].tri = no;

				break;

			case def_random:

				sym->def[S_DEF_USER].tri = (tristate)(rand() % 3);

				cnt = sym_get_type(sym) == S_TRISTATE ? 3 : 2;

				sym->def[S_DEF_USER].tri = (tristate)(rand() % cnt);

				break;

			default:

				continue;

scripts/kconfig/expr.c

+1 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *s 
	}



	str_append(gs, str);

	if (sym)

	if (sym && sym->type != S_UNKNOWN)

		str_printf(gs, " [=%s]", sym_str);

}