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 ---
Changes in v3: None Changes in v2: - Newly added
arch/arm/mach-uniphier/Kconfig | 2 +- configs/ph1_pro4_defconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index 73b8676..feda49e 100644 --- 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 cc3a9a4..65ff3e0 100644 --- 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"