1 files changed, 15 insertions, 8 deletions

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index ae763ad94e..175c9f70aa 100644
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -3,35 +3,42 @@ if ARCH_UNIPHIER
 config SYS_CONFIG_NAME
 	default "uniphier"
 
+config ARCH_UNIPHIER_32BIT
+	bool
+	select CPU_V7
+
+config ARCH_UNIPHIER_64BIT
+	bool
+	select ARM64
+	select SPL_SEPARATE_BSS
+
 choice
         prompt "UniPhier SoC select"
         default ARCH_UNIPHIER_PRO4
 
 config ARCH_UNIPHIER_SLD3
 	bool "UniPhier PH1-sLD3 SoC"
-	select CPU_V7
+	select ARCH_UNIPHIER_32BIT
 
 config ARCH_UNIPHIER_LD4_SLD8
 	bool "UniPhier PH1-LD4/PH1-sLD8 SoC"
-	select CPU_V7
+	select ARCH_UNIPHIER_32BIT
 
 config ARCH_UNIPHIER_PRO4
 	bool "UniPhier PH1-Pro4 SoC"
-	select CPU_V7
+	select ARCH_UNIPHIER_32BIT
 
 config ARCH_UNIPHIER_PRO5_PXS2_LD6B
 	bool "UniPhier PH1-Pro5/ProXstream2/PH1-LD6b SoC"
-	select CPU_V7
+	select ARCH_UNIPHIER_32BIT
 
 config ARCH_UNIPHIER_LD11
 	bool "UniPhier PH1-LD11 SoC"
-	select ARM64
-	select SPL_SEPARATE_BSS
+	select ARCH_UNIPHIER_64BIT
 
 config ARCH_UNIPHIER_LD20
 	bool "UniPhier PH1-LD20 SoC"
-	select ARM64
-	select SPL_SEPARATE_BSS
+	select ARCH_UNIPHIER_64BIT
 
 endchoice