-config ARCH_UNIPHIER_PH1_SLD8
- bool "UniPhier PH1-sLD8 SoC"
- depends on !ARCH_UNIPHIER_PH1_SLD3
- help
- This enables support for UniPhier PH1-sLD8 SoC.
-
-config ARCH_UNIPHIER_PH1_PRO5
- bool "UniPhier PH1-Pro5 SoC"
- select UNIPHIER_SMP
- depends on !ARCH_UNIPHIER_PH1_SLD3 && \
- !ARCH_UNIPHIER_PH1_LD4 && \
- !ARCH_UNIPHIER_PH1_SLD8
- help
- This enables support for UniPhier PH1-Pro5 SoC.
-
-config ARCH_UNIPHIER_PROXSTREAM2
- bool "UniPhier ProXstream2 SoC"
- select UNIPHIER_SMP
- depends on !ARCH_UNIPHIER_PH1_SLD3 && \
- !ARCH_UNIPHIER_PH1_LD4 && \
- !ARCH_UNIPHIER_PH1_SLD8
- help
- This enables support for UniPhier ProXstream2 SoC.
-
-config ARCH_UNIPHIER_PH1_LD6B
- bool "UniPhier PH1-LD6b SoC"
- select UNIPHIER_SMP
- depends on !ARCH_UNIPHIER_PH1_SLD3 && \
- !ARCH_UNIPHIER_PH1_LD4 && \
- !ARCH_UNIPHIER_PH1_SLD8
+config ARCH_UNIPHIER_PRO5_PXS2_LD6B
+ bool "UniPhier PH1-Pro5/ProXstream2/PH1-LD6b SoC"
+ select ARCH_UNIPHIER_32BIT
+
+config ARCH_UNIPHIER_LD11
+ bool "UniPhier PH1-LD11 SoC"
+ select ARCH_UNIPHIER_64BIT
+
+config ARCH_UNIPHIER_LD20
+ bool "UniPhier PH1-LD20 SoC"
+ select ARCH_UNIPHIER_64BIT
+ select OF_BOARD_SETUP
+
+endchoice
+
+config ARCH_UNIPHIER_LD4
+ bool "Enable UniPhier PH1-LD4 SoC support"
+ depends on ARCH_UNIPHIER_LD4_SLD8
+ default y
+
+config ARCH_UNIPHIER_SLD8
+ bool "Enable UniPhier PH1-sLD8 SoC support"
+ depends on ARCH_UNIPHIER_LD4_SLD8
+ default y
+
+config ARCH_UNIPHIER_PRO5
+ bool "Enable UniPhier PH1-Pro5 SoC support"
+ depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+ default y
+
+config ARCH_UNIPHIER_PXS2
+ bool "Enable UniPhier ProXstream2 SoC support"
+ depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+ default y
+
+config ARCH_UNIPHIER_LD6B
+ bool "Enable UniPhier PH1-LD6b SoC support"
+ depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+ default y
+
+config CACHE_UNIPHIER
+ bool "Enable the UniPhier L2 cache controller"
+ depends on ARCH_UNIPHIER_32BIT
+ select SYS_CACHE_SHIFT_7
+ default y