| From edde39e3991768728665f8835395e8b80777e1bf Mon Sep 17 00:00:00 2001 |
| From: Masahiro Yamada <masahiroy@kernel.org> |
| Date: Sat, 1 Feb 2020 14:03:11 +0900 |
| Subject: [PATCH] kconfig: fix broken dependency in randconfig-generated |
| .config |
| |
| commit c8fb7d7e48d11520ad24808cfce7afb7b9c9f798 upstream. |
| |
| Running randconfig on arm64 using KCONFIG_SEED=0x40C5E904 (e.g. on v5.5) |
| produces the .config with CONFIG_EFI=y and CONFIG_CPU_BIG_ENDIAN=y, |
| which does not meet the !CONFIG_CPU_BIG_ENDIAN dependency. |
| |
| This is because the user choice for CONFIG_CPU_LITTLE_ENDIAN vs |
| CONFIG_CPU_BIG_ENDIAN is set by randomize_choice_values() after the |
| value of CONFIG_EFI is calculated. |
| |
| When this happens, the has_changed flag should be set. |
| |
| Currently, it takes the result from the last iteration. It should |
| accumulate all the results of the loop. |
| |
| Fixes: 3b9a19e08960 ("kconfig: loop as long as we changed some symbols in randconfig") |
| Reported-by: Vincenzo Frascino <vincenzo.frascino@arm.com> |
| Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c |
| index 27964917cbfd..3ac33d315e1c 100644 |
| --- a/scripts/kconfig/confdata.c |
| +++ b/scripts/kconfig/confdata.c |
| @@ -1372,7 +1372,7 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode) |
| |
| sym_calc_value(csym); |
| if (mode == def_random) |
| - has_changed = randomize_choice_values(csym); |
| + has_changed |= randomize_choice_values(csym); |
| else { |
| set_all_choice_values(csym); |
| has_changed = true; |
| -- |
| 2.7.4 |
| |
