arm: Move FSL_LSCH2 FSL_LSCH3 to Kconfig

Move these options to Kconfig and create a sub-menu to avoid name conflict with other architectures. Signed-off-by: York Sun <york.sun@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
8 years ago · fb2bf8c2c6
parent 4a4441765d
commit fb2bf8c2c6
8 changed files with 27 additions and 6 deletions
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@ -652,6 +652,7 @@ config TARGET_VEXPRESS64_JUNO

 config TARGET_LS2080A_EMU
 	bool "Support ls2080a_emu"
+	select ARCH_LS2080A
 	select ARM64
 	select ARMV8_MULTIENTRY
 	help
@ -662,6 +663,7 @@ config TARGET_LS2080A_EMU

 config TARGET_LS2080A_SIMU
 	bool "Support ls2080a_simu"
+	select ARCH_LS2080A
 	select ARM64
 	select ARMV8_MULTIENTRY
 	help
@ -672,6 +674,7 @@ config TARGET_LS2080A_SIMU

 config TARGET_LS2080AQDS
 	bool "Support ls2080aqds"
+	select ARCH_LS2080A
 	select ARM64
 	select ARMV8_MULTIENTRY
 	select SUPPORT_SPL
@ -683,6 +686,7 @@ config TARGET_LS2080AQDS

 config TARGET_LS2080ARDB
 	bool "Support ls2080ardb"
+	select ARCH_LS2080A
 	select ARM64
 	select ARMV8_MULTIENTRY
 	select SUPPORT_SPL
--- a/arch/arm/cpu/armv7/ls102xa/Kconfig
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@ -2,6 +2,14 @@ config ARCH_LS1021A
 	bool
 	select SYS_FSL_ERRATUM_A010315

+menu "LS102xA architecture"
+	depends on ARCH_LS1021A
+
 config LS1_DEEP_SLEEP
 	bool "Deep sleep"
 	depends on ARCH_LS1021A
+
+config SYS_FSL_ERRATUM_A010315
+	bool "Workaround for PCIe erratum A010315"
+
+endmenu
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@ -1,19 +1,32 @@
 config ARCH_LS1012A
 	bool
+	select FSL_LSCH2
 	select SYS_FSL_MMDC
 	select SYS_FSL_ERRATUM_A010315

 config ARCH_LS1043A
 	bool
+	select FSL_LSCH2
 	select SYS_FSL_ERRATUM_A010315
 	select SYS_FSL_ERRATUM_A010539

 config ARCH_LS1046A
 	bool
+	select FSL_LSCH2
 	select SYS_FSL_ERRATUM_A010539

 config ARCH_LS2080A
 	bool
+	select FSL_LSCH3
+
+config FSL_LSCH2
+	bool
+
+config FSL_LSCH3
+	bool
+
+menu "Layerscape architecture"
+	depends on FSL_LSCH2 || FSL_LSCH3

 config SYS_FSL_MMDC
 	bool
@ -23,3 +36,5 @@ config SYS_FSL_ERRATUM_A010315

 config SYS_FSL_ERRATUM_A010539
 	bool "Workaround for PIN MUX erratum A010539"
+
+endmenu
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@ -8,7 +8,6 @@
 #define __LS1012A_COMMON_H

 #define CONFIG_FSL_LAYERSCAPE
-#define CONFIG_FSL_LSCH2
 #define CONFIG_GICV2

 #define	CONFIG_SYS_HAS_SERDES
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@ -9,7 +9,6 @@

 #define CONFIG_REMAKE_ELF
 #define CONFIG_FSL_LAYERSCAPE
-#define CONFIG_FSL_LSCH2
 #define CONFIG_LS1043A
 #define CONFIG_MP
 #define CONFIG_SYS_FSL_CLK
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@ -9,7 +9,6 @@

 #define CONFIG_REMAKE_ELF
 #define CONFIG_FSL_LAYERSCAPE
-#define CONFIG_FSL_LSCH2
 #define CONFIG_MP
 #define CONFIG_SYS_FSL_CLK
 #define CONFIG_GICV2
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@ -9,7 +9,6 @@

 #define CONFIG_REMAKE_ELF
 #define CONFIG_FSL_LAYERSCAPE
-#define CONFIG_FSL_LSCH3
 #define CONFIG_MP
 #define CONFIG_GICV3
 #define CONFIG_FSL_TZPC_BP147
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -1299,8 +1299,6 @@ CONFIG_FSL_LAW
 CONFIG_FSL_LAYERSCAPE
 CONFIG_FSL_LBC
 CONFIG_FSL_LINFLEXUART
-CONFIG_FSL_LSCH2
-CONFIG_FSL_LSCH3
 CONFIG_FSL_LS_PPA
 CONFIG_FSL_MC9SDZ60
 CONFIG_FSL_MC_ENET