Convert CONFIG_SYS_FSL_ERRATUM_A010315 to Kconfig option

Move this option to Kconfig and clean up existing uses.

Signed-off-by: York Sun <york.sun@nxp.com>
CC: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c974db4ac1bccfacd63d4e3d5ee12e32912e8307..1bc45ed28e39da1fd45e2b8374804b63ecabe182 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -820,16 +820,19 @@ config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7
        select SUPPORT_SPL
+       select ARCH_LS1021A
        select ARCH_SUPPORT_PSCI
 
 config TARGET_LS1021ATWR
        bool "Support ls1021atwr"
        select CPU_V7
        select SUPPORT_SPL
+       select ARCH_LS1021A
        select ARCH_SUPPORT_PSCI
 
 config TARGET_LS1043AQDS
        bool "Support ls1043aqds"
+       select ARCH_LS1043A
        select ARM64
        select ARMV8_MULTIENTRY
        select SUPPORT_SPL
@@ -838,6 +841,7 @@ config TARGET_LS1043AQDS
 
 config TARGET_LS1043ARDB
        bool "Support ls1043ardb"
+       select ARCH_LS1043A
        select ARM64
        select ARMV8_MULTIENTRY
        select SUPPORT_SPL
@@ -948,6 +952,8 @@ source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/mach-mvebu/Kconfig"
 
+source "arch/arm/cpu/armv7/ls102xa/Kconfig"
+
 source "arch/arm/cpu/armv7/mx7/Kconfig"
 
 source "arch/arm/cpu/armv7/mx6/Kconfig"

diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
new file mode 100644 (file)
index 0000000..e88a05e
--- /dev/null
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -0,0 +1,3 @@
+config ARCH_LS1021A
+       bool "Freescale Layerscape LS1021A SoC"
+       select SYS_FSL_ERRATUM_A010315

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index a823d393615dfa6476fe644b8cffa89ed7be5028..f8057baa031b6a6c1ca4dd6c9cd1ccd55c3e48dd 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -1,9 +1,17 @@
 config ARCH_LS1012A
        bool "Freescale Layerscape LS1012A SoC"
        select SYS_FSL_MMDC
+       select SYS_FSL_ERRATUM_A010315
+
+config ARCH_LS1043A
+       bool "Freescale Layerscape LS1043A SoC"
+       select SYS_FSL_ERRATUM_A010315
 
 config ARCH_LS1046A
        bool "Freescale Layerscape LS1046A SoC"
 
 config SYS_FSL_MMDC
        bool "Freescale Multi Mode DDR Controller"
+
+config SYS_FSL_ERRATUM_A010315
+       bool "Workaround for PCIe erratum A010315"

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index a7fda1858b7ac0df7029325cb7d558249bfd23a2..a5c6c4cd267d758004f281ec5323957b7b97949f 100644 (file)
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -169,7 +169,6 @@
 
 #define CONFIG_SYS_FSL_SRDS_1
 
-#define CONFIG_SYS_FSL_ERRATUM_A010315
 /* SoC related */
 #ifdef CONFIG_LS1043A
 #define CONFIG_MAX_CPUS                                4

diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index f2ce793c8f5f2477187faea9e40c381ef5676f9f..46de78441fc99417e583c1a48c688dcd2b31c884 100644 (file)
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -132,7 +132,6 @@
 #define CONFIG_SYS_FSL_ERRATUM_A008378
 #define CONFIG_SYS_FSL_ERRATUM_A009663
 #define CONFIG_SYS_FSL_ERRATUM_A009942
-#define CONFIG_SYS_FSL_ERRATUM_A010315
 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC          1
 #else
 #error SoC not defined