Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert CONFIG_SYS_FSL_ERRATUM_A010315 to Kconfig option

Browse Source 
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>
master
York Sun 8 years ago
parent 9533acf36c
commit 0a37cf8f27
5 changed files with 17 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      arch/arm/Kconfig
  2. 3
      arch/arm/cpu/armv7/ls102xa/Kconfig
  3. 8
      arch/arm/cpu/armv8/fsl-layerscape/Kconfig
  4. 1
      arch/arm/include/asm/arch-fsl-layerscape/config.h
  5. 1
      arch/arm/include/asm/arch-ls102xa/config.h

6
arch/arm/Kconfig
Unescape View File

@ -820,16 +820,19 @@ config TARGET_LS1021AQDS
bool "Support ls1021aqds" bool "Support ls1021aqds"
select CPU_V7 select CPU_V7
select SUPPORT_SPL select SUPPORT_SPL
select ARCH_LS1021A
select ARCH_SUPPORT_PSCI select ARCH_SUPPORT_PSCI
config TARGET_LS1021ATWR config TARGET_LS1021ATWR
bool "Support ls1021atwr" bool "Support ls1021atwr"
select CPU_V7 select CPU_V7
select SUPPORT_SPL select SUPPORT_SPL
select ARCH_LS1021A
select ARCH_SUPPORT_PSCI select ARCH_SUPPORT_PSCI
config TARGET_LS1043AQDS config TARGET_LS1043AQDS
bool "Support ls1043aqds" bool "Support ls1043aqds"
select ARCH_LS1043A
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select SUPPORT_SPL select SUPPORT_SPL
@ -838,6 +841,7 @@ config TARGET_LS1043AQDS
config TARGET_LS1043ARDB config TARGET_LS1043ARDB
bool "Support ls1043ardb" bool "Support ls1043ardb"
select ARCH_LS1043A
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select SUPPORT_SPL select SUPPORT_SPL
@ -948,6 +952,8 @@ source "arch/arm/mach-kirkwood/Kconfig"
source "arch/arm/mach-mvebu/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/mx7/Kconfig"
source "arch/arm/cpu/armv7/mx6/Kconfig" source "arch/arm/cpu/armv7/mx6/Kconfig"

3
arch/arm/cpu/armv7/ls102xa/Kconfig
Unescape View File

@ -0,0 +1,3 @@
config ARCH_LS1021A
bool "Freescale Layerscape LS1021A SoC"
select SYS_FSL_ERRATUM_A010315

8
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
Unescape View File

@ -1,9 +1,17 @@
config ARCH_LS1012A config ARCH_LS1012A
bool "Freescale Layerscape LS1012A SoC" bool "Freescale Layerscape LS1012A SoC"
select SYS_FSL_MMDC 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 config ARCH_LS1046A
bool "Freescale Layerscape LS1046A SoC" bool "Freescale Layerscape LS1046A SoC"
config SYS_FSL_MMDC config SYS_FSL_MMDC
bool "Freescale Multi Mode DDR Controller" bool "Freescale Multi Mode DDR Controller"
config SYS_FSL_ERRATUM_A010315
bool "Workaround for PCIe erratum A010315"

1
arch/arm/include/asm/arch-fsl-layerscape/config.h
Unescape View File

@ -169,7 +169,6 @@
#define CONFIG_SYS_FSL_SRDS_1 #define CONFIG_SYS_FSL_SRDS_1
#define CONFIG_SYS_FSL_ERRATUM_A010315
/* SoC related */ /* SoC related */
#ifdef CONFIG_LS1043A #ifdef CONFIG_LS1043A
#define CONFIG_MAX_CPUS 4 #define CONFIG_MAX_CPUS 4

1
arch/arm/include/asm/arch-ls102xa/config.h
Unescape View File

@ -132,7 +132,6 @@
#define CONFIG_SYS_FSL_ERRATUM_A008378 #define CONFIG_SYS_FSL_ERRATUM_A008378
#define CONFIG_SYS_FSL_ERRATUM_A009663 #define CONFIG_SYS_FSL_ERRATUM_A009663
#define CONFIG_SYS_FSL_ERRATUM_A009942 #define CONFIG_SYS_FSL_ERRATUM_A009942
#define CONFIG_SYS_FSL_ERRATUM_A010315
#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1
#else #else
#error SoC not defined #error SoC not defined

Write Preview
Loading…
Cancel
Save