From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 12 Jun 2016 09:57:07 +0000 (+0200)
Subject: sunxi: Revert "sunxi: make SoC variant choice mandatory"
X-Git-Tag: v2016.07-rc3~74
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3da9536e8f377d8ec63df930bfd27c700475b68e;p=oweals%2Fu-boot.git

sunxi: Revert "sunxi: make SoC variant choice mandatory"

This reverts commit 1a5f0de08e86("sunxi: make SoC variant choice
mandatory").

With the optional marking in the Kconfig "make savedefconfig"
will drop CONFIG_MACH_SUN4I=y from all the A10 boards, making it
hard to see at a glance which family of sunxi chips the defconfig
is for.

This commit therefore restores the optional, and restores
CONFIG_MACH_SUN4I=y to all defconfig's which had it dropped
because of this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
---

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index c1ae6f5d9e..323e972932 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -18,6 +18,7 @@ config SUNXI_GEN_SUN6I
 
 choice
 	prompt "Sunxi SoC Variant"
+	optional
 
 config MACH_SUN4I
 	bool "sun4i (Allwinner A10)"