X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fmach-uniphier%2FKconfig;h=7bee6c7a299099708080756a4450bc36a291e750;hb=c69f6d04ec66433f2360490a5cd0263c83aab18f;hp=feda49e0a69fad06db12cfb741a6e191dd590dfa;hpb=7fff91ffc0d7517dd8b3e5fc8289c380638770e2;p=oweals%2Fu-boot.git

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index feda49e0a6..7bee6c7a29 100644
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -3,47 +3,91 @@ if ARCH_UNIPHIER
 config SYS_CONFIG_NAME
 	default "uniphier"
 
-config UNIPHIER_SMP
+config ARCH_UNIPHIER_32BIT
 	bool
+	select CPU_V7
+	select CPU_V7_HAS_NONSEC
+	select ARMV7_NONSEC
+	select ARCH_SUPPORT_PSCI
+
+config ARCH_UNIPHIER_64BIT
+	bool
+	select ARM64
+	select SPL_SEPARATE_BSS
+	select ARMV8_MULTIENTRY
+	select ARMV8_SPIN_TABLE
 
 choice
-	prompt "UniPhier SoC select"
-	default MACH_PH1_PRO4
+        prompt "UniPhier SoC select"
+        default ARCH_UNIPHIER_PRO4
+
+config ARCH_UNIPHIER_SLD3
+	bool "UniPhier PH1-sLD3 SoC"
+	select ARCH_UNIPHIER_32BIT
+
+config ARCH_UNIPHIER_LD4_SLD8
+	bool "UniPhier PH1-LD4/PH1-sLD8 SoC"
+	select ARCH_UNIPHIER_32BIT
 
-config MACH_PH1_PRO4
-	bool "PH1-Pro4"
-	select UNIPHIER_SMP
+config ARCH_UNIPHIER_PRO4
+	bool "UniPhier PH1-Pro4 SoC"
+	select ARCH_UNIPHIER_32BIT
 
-config MACH_PH1_LD4
-	bool "PH1-LD4"
+config ARCH_UNIPHIER_PRO5_PXS2_LD6B
+	bool "UniPhier PH1-Pro5/ProXstream2/PH1-LD6b SoC"
+	select ARCH_UNIPHIER_32BIT
 
-config MACH_PH1_SLD8
-	bool "PH1-sLD8"
+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
 
-choice
-	prompt "UniPhier Support Card select"
-	optional
+config ARCH_UNIPHIER_LD4
+	bool "Enable UniPhier PH1-LD4 SoC support"
+	depends on ARCH_UNIPHIER_LD4_SLD8
+	default y
 
-config PFC_MICRO_SUPPORT_CARD
-	bool "Support card with PFC CPLD"
-	help
-	  This option provides support for the expansion board with PFC
-	  original address mapping.
+config ARCH_UNIPHIER_SLD8
+	bool "Enable UniPhier PH1-sLD8 SoC support"
+	depends on ARCH_UNIPHIER_LD4_SLD8
+	default y
 
-	  Say Y to use the on-board UART, Ether, LED devices.
+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 DCC_MICRO_SUPPORT_CARD
-	bool "Support card with DCC CPLD"
+config CACHE_UNIPHIER
+	bool "Enable the UniPhier L2 cache controller"
+	depends on ARCH_UNIPHIER_32BIT
+	select SYS_CACHE_SHIFT_7
+	default y
 	help
-	  This option provides support for the expansion board with DCC-
-	  arranged address mapping that is compatible with legacy UniPhier
-	  reference boards.
+	  This option allows to use the UniPhier System Cache as L2 cache.
 
-	  Say Y to use the on-board UART, Ether, LED devices.
+config MICRO_SUPPORT_CARD
+	bool "Use Micro Support Card"
+	help
+	  This option provides support for the expansion board, available
+	  on some UniPhier reference boards.
 
-endchoice
+	  Say Y to use the on-board UART, Ether, LED devices.
 
 config CMD_PINMON
 	bool "Enable boot mode pins monitor command"
@@ -55,26 +99,18 @@ config CMD_PINMON
 
 config CMD_DDRPHY_DUMP
 	bool "Enable dump command of DDR PHY parameters"
+	depends on ARCH_UNIPHIER_LD4 || ARCH_UNIPHIER_PRO4 || ARCH_UNIPHIER_SLD8
+	default y
 	help
 	  The command "ddrphy" shows the resulting parameters of DDR PHY
 	  training; it is useful for the evaluation of DDR PHY training.
 
-choice
-	prompt "DDR3 Frequency select"
-
-config DDR_FREQ_1600
-	bool "DDR3 1600"
-	depends on MACH_PH1_PRO4 || MACH_PH1_LD4
-
-config DDR_FREQ_1333
-	bool "DDR3 1333"
-	depends on MACH_PH1_LD4 || MACH_PH1_SLD8
-
-endchoice
-
-config DDR_FREQ
-	int
-	default 1333 if DDR_FREQ_1333
-	default 1600 if DDR_FREQ_1600
+config CMD_DDRMPHY_DUMP
+	bool "Enable dump command of DDR Multi PHY parameters"
+	depends on ARCH_UNIPHIER_PXS2 || ARCH_UNIPHIER_LD6B
+	default y
+	help
+	  The command "ddrmphy" shows the resulting parameters of DDR Multi PHY
+	  training; it is useful for the evaluation of DDR Multi PHY training.
 
 endif