diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-12-06 00:03:22 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-12-08 01:25:44 +0900 |
| commit | f5d0b9b2c3b40f637913aec20b62eea2b8697ec3 (patch) | |
| tree | 6182ce08e14fcd8f96e101e048773bc36d1d794a /arch/arm/cpu | |
| parent | 3201455d6ad5b6e1f316e89d998c2c31c852b224 (diff) | |
ARM: UniPhier: merge UniPhier config headers into a single file
Some configurations have been moved to Kconfig and the difference
among the config headers of UniPhier SoC variants is getting smaller
and smaller. Now is a good time to merge them into a single file.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/uniphier/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig index 1d96db21ca..97602990aa 100644 --- a/arch/arm/cpu/armv7/uniphier/Kconfig +++ b/arch/arm/cpu/armv7/uniphier/Kconfig @@ -5,9 +5,7 @@ config SYS_SOC default "uniphier" config SYS_CONFIG_NAME - default "ph1_pro4" if MACH_PH1_PRO4 - default "ph1_ld4" if MACH_PH1_LD4 - default "ph1_sld8" if MACH_PH1_SLD8 + default "uniphier" config UNIPHIER_SMP bool |