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

Commit 490f1617 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Michal Marek
Browse files

Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG" 



This reverts commit 8357b485.

It breaks more stuff than it fixes.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Reported-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 8357b485

scripts/kconfig/confdata.c

+3 −3
Original line number Diff line number Diff line
@@ -288,6 +288,8 @@ int conf_read_simple(const char *name, int def) 
	for_all_symbols(i, sym) {

		sym->flags |= SYMBOL_CHANGED;

		sym->flags &= ~(def_flags|SYMBOL_VALID);

		if (sym_is_choice(sym))

			sym->flags |= def_flags;

		switch (sym->type) {

		case S_INT:

		case S_HEX:
@@ -377,13 +379,13 @@ int conf_read_simple(const char *name, int def) 
			case mod:

				if (cs->def[def].tri == yes) {

					conf_warning("%s creates inconsistent choice state", sym->name);

					cs->flags &= ~def_flags;

				}

				break;

			case yes:

				if (cs->def[def].tri != no)

					conf_warning("override: %s changes choice state", sym->name);

				cs->def[def].val = sym;

				cs->flags |= def_flags;

				break;

			}

			cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
@@ -789,8 +791,6 @@ int conf_write(const char *name) 
			sym_calc_value(sym);

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

				goto next;

			if (sym_is_choice_value(sym) && !menu_is_visible(menu->parent))

				goto next;

			sym->flags &= ~SYMBOL_WRITE;



			conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);