Tested-by: Hou Zhiqiang <zhiqiang....@nxp.com> > -----Original Message----- > From: York Sun [mailto:york....@nxp.com] > Sent: 2016年9月26日 23:09 > To: tr...@konsulko.com > Cc: s...@chromium.org; u-boot@lists.denx.de; york sun <york....@nxp.com>; > Z.Q. Hou <zhiqiang....@nxp.com> > Subject: [PATCH 4/7] 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....@nxp.com> > CC: Hou Zhiqiang <zhiqiang....@nxp.com> > > --- > > Changes in v2: > Add select ARCH_LS1021A and ARCH_LS1043A respectively to enable > SYS_FSL_ERRATUM_A010315 for affected platforms. > > arch/arm/Kconfig | 6 ++++++ > arch/arm/cpu/armv7/ls102xa/Kconfig | 3 +++ > arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 8 ++++++++ > arch/arm/include/asm/arch-fsl-layerscape/config.h | 1 - > arch/arm/include/asm/arch-ls102xa/config.h | 1 - > 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 > arch/arm/cpu/armv7/ls102xa/Kconfig > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c974db4..1bc45ed > 100644 > --- 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 > 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 a823d39..f8057ba 100644 > --- 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 a7fda18..a5c6c4c 100644 > --- 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 f2ce793..46de784 100644 > --- 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 > -- > 2.7.4
Thanks, Zhiqiang _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
