ARM: UniPhier: set MACH_PH1_PRO4 as default SoC

One disadvantage of commit a26cd04920dc (arch: Make board selection
choices optional) is that Kconfig could create such an insane
.config file that no board is selected.

As PH1-Pro4 is the main stream of UniPhier SoC family, rip off the
"optional" again in favor of PH1-Pro4 as the default SoC.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 73b867668ee6e8acbc38dd74cf18c42078e86ef1..feda49e0a69fad06db12cfb741a6e191dd590dfa 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -8,7 +8,7 @@ config UNIPHIER_SMP
 
 choice
        prompt "UniPhier SoC select"
-       optional
+       default MACH_PH1_PRO4
 
 config MACH_PH1_PRO4
        bool "PH1-Pro4"

diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index cc3a9a4e8c44cbf1de568d77992c22b799a16389..65ff3e006082fda50e2f7d28fa144208c865ccbf 100644 (file)
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_SPL_DM=y
-CONFIG_MACH_PH1_PRO4=y
 CONFIG_PFC_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"