ARM: keystone2: Use common definition for clk_get_rate

[u-boot] / arch / arm / mach-uniphier / Kconfig

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 73f26594d61b459ba6be7de9b27bb7e53e31ac59..7b49ad3b490d10aaf2a9d2948bb7307c79e032c9 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -1,5 +1,4 @@
-menu "Panasonic UniPhier platform"
-       depends on ARCH_UNIPHIER
+if ARCH_UNIPHIER
 
 config SYS_CONFIG_NAME
        default "uniphier"
@@ -9,14 +8,19 @@ config UNIPHIER_SMP
 
 choice
        prompt "UniPhier SoC select"
+       default MACH_PH1_PRO4
 
-config MACH_PH1_PRO4
-       bool "PH1-Pro4"
+config MACH_PH1_SLD3
+       bool "PH1-sLD3"
        select UNIPHIER_SMP
 
 config MACH_PH1_LD4
        bool "PH1-LD4"
 
+config MACH_PH1_PRO4
+       bool "PH1-Pro4"
+       select UNIPHIER_SMP
+
 config MACH_PH1_SLD8
        bool "PH1-sLD8"
 
@@ -45,12 +49,6 @@ config DCC_MICRO_SUPPORT_CARD
 
 endchoice
 
-config SYS_MALLOC_F
-       default y
-
-config SYS_MALLOC_F_LEN
-       default 0x400
-
 config CMD_PINMON
        bool "Enable boot mode pins monitor command"
        default y
@@ -70,11 +68,11 @@ choice
 
 config DDR_FREQ_1600
        bool "DDR3 1600"
-       depends on MACH_PH1_PRO4 || MACH_PH1_LD4
+       depends on MACH_PH1_SLD3 || MACH_PH1_LD4 || MACH_PH1_PRO4
 
 config DDR_FREQ_1333
        bool "DDR3 1333"
-       depends on MACH_PH1_LD4 || MACH_PH1_SLD8
+       depends on MACH_PH1_SLD3 || MACH_PH1_LD4 || MACH_PH1_SLD8
 
 endchoice
 
@@ -83,4 +81,4 @@ config DDR_FREQ
        default 1333 if DDR_FREQ_1333
        default 1600 if DDR_FREQ_1600
 
-endmenu
+endif