summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-uniphier/Kconfig')
-rw-r--r--arch/arm/mach-uniphier/Kconfig49
1 files changed, 32 insertions, 17 deletions
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index aa3909a..e732ac1 100644
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -13,66 +13,81 @@ config ARCH_UNIPHIER_32BIT
config ARCH_UNIPHIER_64BIT
bool
select ARM64
- select SPL_SEPARATE_BSS
- select ARMV8_MULTIENTRY
- select ARMV8_SPIN_TABLE
+ select SPL_SEPARATE_BSS if SPL
+ select ARMV8_MULTIENTRY if SPL
+ select ARMV8_SPIN_TABLE if SPL
choice
prompt "UniPhier SoC select"
default ARCH_UNIPHIER_PRO4
config ARCH_UNIPHIER_SLD3
- bool "UniPhier PH1-sLD3 SoC"
+ bool "UniPhier sLD3 SoC"
select ARCH_UNIPHIER_32BIT
config ARCH_UNIPHIER_LD4_SLD8
- bool "UniPhier PH1-LD4/PH1-sLD8 SoC"
+ bool "UniPhier LD4/sLD8 SoCs"
select ARCH_UNIPHIER_32BIT
config ARCH_UNIPHIER_PRO4
- bool "UniPhier PH1-Pro4 SoC"
+ bool "UniPhier Pro4 SoC"
select ARCH_UNIPHIER_32BIT
config ARCH_UNIPHIER_PRO5_PXS2_LD6B
- bool "UniPhier PH1-Pro5/ProXstream2/PH1-LD6b SoC"
+ bool "UniPhier Pro5/PXs2/LD6b SoCs"
select ARCH_UNIPHIER_32BIT
-config ARCH_UNIPHIER_LD11
- bool "UniPhier PH1-LD11 SoC"
+config ARCH_UNIPHIER_LD11_SINGLE
+ bool "UniPhier LD11 SoC"
select ARCH_UNIPHIER_64BIT
-config ARCH_UNIPHIER_LD20
- bool "UniPhier PH1-LD20 SoC"
+config ARCH_UNIPHIER_LD20_SINGLE
+ bool "UniPhier LD20 SoC"
+ select ARCH_UNIPHIER_64BIT
+
+config ARCH_UNIPHIER_V8_MULTI
+ bool "UniPhier V8 SoCs"
+ depends on !SPL
select ARCH_UNIPHIER_64BIT
- select OF_BOARD_SETUP
endchoice
config ARCH_UNIPHIER_LD4
- bool "Enable UniPhier PH1-LD4 SoC support"
+ bool "Enable UniPhier LD4 SoC support"
depends on ARCH_UNIPHIER_LD4_SLD8
default y
config ARCH_UNIPHIER_SLD8
- bool "Enable UniPhier PH1-sLD8 SoC support"
+ bool "Enable UniPhier sLD8 SoC support"
depends on ARCH_UNIPHIER_LD4_SLD8
default y
config ARCH_UNIPHIER_PRO5
- bool "Enable UniPhier PH1-Pro5 SoC support"
+ bool "Enable UniPhier Pro5 SoC support"
depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
default y
config ARCH_UNIPHIER_PXS2
- bool "Enable UniPhier ProXstream2 SoC support"
+ bool "Enable UniPhier Pxs2 SoC support"
depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
default y
config ARCH_UNIPHIER_LD6B
- bool "Enable UniPhier PH1-LD6b SoC support"
+ bool "Enable UniPhier LD6b SoC support"
depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
default y
+config ARCH_UNIPHIER_LD11
+ bool "Enable UniPhier LD11 SoC support" if ARCH_UNIPHIER_V8_MULTI
+ depends on ARCH_UNIPHIER_LD11_SINGLE || ARCH_UNIPHIER_V8_MULTI
+ default y
+
+config ARCH_UNIPHIER_LD20
+ bool "Enable UniPhier LD20 SoC support" if ARCH_UNIPHIER_V8_MULTI
+ depends on ARCH_UNIPHIER_LD20_SINGLE || ARCH_UNIPHIER_V8_MULTI
+ select OF_BOARD_SETUP
+ default y
+
config CACHE_UNIPHIER
bool "Enable the UniPhier L2 cache controller"
depends on ARCH_UNIPHIER_32BIT