summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2016-06-12 11:57:07 +0200
committerHans de Goede <hdegoede@redhat.com>2016-06-20 22:43:59 +0200
commit3da9536e8f377d8ec63df930bfd27c700475b68e (patch)
tree9bac8b24680886dd9642df1316ade431281dd239 /board
parent3551b24f5354fc47bb4ddf99d2f095ccc6b03f2d (diff)
downloadu-boot-imx-3da9536e8f377d8ec63df930bfd27c700475b68e.zip
u-boot-imx-3da9536e8f377d8ec63df930bfd27c700475b68e.tar.gz
u-boot-imx-3da9536e8f377d8ec63df930bfd27c700475b68e.tar.bz2
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>
Diffstat (limited to 'board')
-rw-r--r--board/sunxi/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index c1ae6f5..323e972 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)"