ARM: UniPhier: move CONFIG_UNIPHIER_SMP to Kconfig

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig
index 36b7f11fbeb7fb28db48ed8257d05b1294115843..31a03d92928443d34303148584e1ebe503b6273f 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/Kconfig
+++ b/arch/arm/cpu/armv7/uniphier/Kconfig
@@ -9,11 +9,15 @@ config SYS_CONFIG_NAME
        default "ph1_ld4" if MACH_PH1_LD4
        default "ph1_sld8" if MACH_PH1_SLD8
 
+config UNIPHIER_SMP
+       bool
+
 choice
        prompt "UniPhier SoC select"
 
 config MACH_PH1_PRO4
        bool "PH1-Pro4"
+       select UNIPHIER_SMP
 
 config MACH_PH1_LD4
        bool "PH1-LD4"

diff --git a/include/configs/ph1_pro4.h b/include/configs/ph1_pro4.h
index fc5132d1ccf7689e326e254136e70e276734e7e4..778003071e51d6270a4feaba21d0f769cae22404 100644 (file)
--- a/include/configs/ph1_pro4.h
+++ b/include/configs/ph1_pro4.h
@@ -37,8 +37,6 @@
 #define CONFIG_DDR_NUM_CH0 2
 #define CONFIG_DDR_NUM_CH1 2
 
-#define CONFIG_UNIPHIER_SMP
-
 /*
  * Memory Size & Mapping
  */