summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-06 00:03:20 +0900
committerMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-08 01:25:44 +0900
commit84b3584f21558098fc724e05341aee2e95b0c1f3 (patch)
tree15bc6d1df532a181f443fc4f7fb9578ca221a56d
parentb115678bdfc5a17c23645f218fd0fa1b7d87a67c (diff)
downloadblackbird-obmc-uboot-84b3584f21558098fc724e05341aee2e95b0c1f3.tar.gz
blackbird-obmc-uboot-84b3584f21558098fc724e05341aee2e95b0c1f3.zip
ARM: UniPhier: move CONFIG_UNIPHIER_SMP to Kconfig
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--arch/arm/cpu/armv7/uniphier/Kconfig4
-rw-r--r--include/configs/ph1_pro4.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig
index 36b7f11fbe..31a03d9292 100644
--- 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 fc5132d1cc..778003071e 100644
--- 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
*/
OpenPOWER on IntegriCloud