[PATCH 1/1] kconfig: tinyconfig: x86: List disabled choices to avoid warning

From: Josh Triplett
Date: Mon Jul 18 2016 - 15:32:23 EST

The Kconfig machinery used to power tinyconfig produces a warning like
this when changing a "choice" option without explicitly disabling the
other choices:

.config:965:warning: override: NOHIGHMEM changes choice state

Expand arch/x86/configs/tiny.config to add entries disabling the other
two choices, to eliminate this warning. (Doing so then introduces a
different form of warning for changing any option at all, but that needs
fixing in the underlying config merge machinery.)

Based on a similar change from Arnd Bergmann for the
architecture-independent tiny.config.

Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
Reported-by: Arnd Bergmann <arnd@xxxxxxxx>
arch/x86/configs/tiny.config | 2 ++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/configs/tiny.config b/arch/x86/configs/tiny.config
index 4e2ecfa..4b429df 100644
--- a/arch/x86/configs/tiny.config
+++ b/arch/x86/configs/tiny.config
@@ -1 +1,3 @@
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
git-series 0.8.3