diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-05-29 17:30:06 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-05-31 02:55:53 +0900 |
| commit | 7fff91ffc0d7517dd8b3e5fc8289c380638770e2 (patch) | |
| tree | bec07b80e2d6e0a9ba6ad543b6ac8bb84b2c8016 | |
| parent | f8f35944d80588612141d689eb1716b0fc587c3f (diff) | |
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>
| -rw-r--r-- | arch/arm/mach-uniphier/Kconfig | 2 | ||||
| -rw-r--r-- | configs/ph1_pro4_defconfig | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index 73b867668ee..feda49e0a69 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 cc3a9a4e8c4..65ff3e00608 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" |