summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorYork Sun <york.sun@nxp.com>2016-10-04 14:31:48 -0700
committerYork Sun <york.sun@nxp.com>2016-10-06 09:59:10 -0700
commitfb2bf8c2c6c5e80a941987d7c8abcf47c825f942 (patch)
tree4c8551ab4a793a12504f722226337043ed5db917 /arch/arm/cpu
parent4a4441765dfdead347f7a49fb2a93d295325c095 (diff)
downloadu-boot-imx-fb2bf8c2c6c5e80a941987d7c8abcf47c825f942.zip
u-boot-imx-fb2bf8c2c6c5e80a941987d7c8abcf47c825f942.tar.gz
u-boot-imx-fb2bf8c2c6c5e80a941987d7c8abcf47c825f942.tar.bz2
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>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/ls102xa/Kconfig8
-rw-r--r--arch/arm/cpu/armv8/fsl-layerscape/Kconfig15
2 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
index f0e7ae9..2648416 100644
--- 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
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 9386b06..d2b1be8 100644
--- 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