sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

ARM: Migrate errata to Kconfig 

This moves all of the current ARM errata from various header files and in to
Kconfig.  This allows for a minor amount of cleanup as we had some instances
where both a general common header file was enabling errata as well as the
board config.  We now just select these once at the higher level in Kconfig

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2017-03-07 07:13:42 -05:00
parent 0f12f10117
commit 8dda2e2f9e
25 changed files with 85 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
README
View File

@ -600,21 +600,6 @@ The following options need to be configured:
Thumb2 this flag will result in Thumb2 code generated by Thumb2 this flag will result in Thumb2 code generated by
GCC. GCC.
CONFIG_ARM_ERRATA_716044
CONFIG_ARM_ERRATA_742230
CONFIG_ARM_ERRATA_743622
CONFIG_ARM_ERRATA_751472
CONFIG_ARM_ERRATA_761320
CONFIG_ARM_ERRATA_773022
CONFIG_ARM_ERRATA_774769
CONFIG_ARM_ERRATA_794072
If set, the workarounds for these ARM errata are applied early
during U-Boot startup. Note that these options force the
workarounds to be applied; no CPU-type/version detection
exists, unlike the similar options in the Linux kernel. Do not
set these options unless they apply!
COUNTER_FREQUENCY COUNTER_FREQUENCY
Generic timer clock source frequency. Generic timer clock source frequency.
@ -623,15 +608,6 @@ The following options need to be configured:
different from COUNTER_FREQUENCY, and can only be determined different from COUNTER_FREQUENCY, and can only be determined
at run time. at run time.
NOTE: The following can be machine specific errata. These
do have ability to provide rudimentary version and machine
specific checks, but expect no product checks.
CONFIG_ARM_ERRATA_430973
CONFIG_ARM_ERRATA_454179
CONFIG_ARM_ERRATA_621766
CONFIG_ARM_ERRATA_798870
CONFIG_ARM_ERRATA_801819
- Tegra SoC options: - Tegra SoC options:
CONFIG_TEGRA_SUPPORT_NON_SECURE CONFIG_TEGRA_SUPPORT_NON_SECURE

70
arch/arm/Kconfig
View File

@ -19,6 +19,72 @@ config HAS_VBAR
config HAS_THUMB2 config HAS_THUMB2
bool bool
# If set, the workarounds for these ARM errata are applied early during U-Boot
# startup. Note that in general these options force the workarounds to be
# applied; no CPU-type/version detection exists, unlike the similar options in
# the Linux kernel. Do not set these options unless they apply! Also note that
# the following can be machine specific errata. These do have ability to
# provide rudimentary version and machine specific checks, but expect no
# product checks:
# CONFIG_ARM_ERRATA_430973
# CONFIG_ARM_ERRATA_454179
# CONFIG_ARM_ERRATA_621766
# CONFIG_ARM_ERRATA_798870
# CONFIG_ARM_ERRATA_801819
config ARM_ERRATA_430973
bool
config ARM_ERRATA_454179
bool
config ARM_ERRATA_621766
bool
config ARM_ERRATA_716044
bool
config ARM_ERRATA_742230
bool
config ARM_ERRATA_743622
bool
config ARM_ERRATA_751472
bool
config ARM_ERRATA_761320
bool
config ARM_ERRATA_773022
bool
config ARM_ERRATA_774769
bool
config ARM_ERRATA_794072
bool
config ARM_ERRATA_798870
bool
config ARM_ERRATA_801819
bool
config ARM_ERRATA_826974
bool
config ARM_ERRATA_828024
bool
config ARM_ERRATA_829520
bool
config ARM_ERRATA_833069
bool
config ARM_ERRATA_833471
bool
config CPU_ARM720T config CPU_ARM720T
bool bool
select SYS_CACHE_SHIFT_5 select SYS_CACHE_SHIFT_5
@ -569,6 +635,9 @@ config TARGET_MX53SMD
config OMAP34XX config OMAP34XX
bool "OMAP34XX SoC" bool "OMAP34XX SoC"
select ARCH_OMAP2 select ARCH_OMAP2
select ARM_ERRATA_430973
select ARM_ERRATA_454179
select ARM_ERRATA_621766
select USE_TINY_PRINTF select USE_TINY_PRINTF
imply SPL_EXT_SUPPORT imply SPL_EXT_SUPPORT
imply SPL_FAT_SUPPORT imply SPL_FAT_SUPPORT
@ -602,6 +671,7 @@ config OMAP44XX
config OMAP54XX config OMAP54XX
bool "OMAP54XX SoC" bool "OMAP54XX SoC"
select ARCH_OMAP2 select ARCH_OMAP2
select ARM_ERRATA_798870
imply SPL_DISPLAY_PRINT imply SPL_DISPLAY_PRINT
imply SPL_ENV_SUPPORT imply SPL_ENV_SUPPORT
imply SPL_EXT_SUPPORT imply SPL_EXT_SUPPORT

4
arch/arm/cpu/armv7/mx6/Kconfig
View File

@ -3,6 +3,10 @@ if ARCH_MX6
config MX6 config MX6
bool bool
default y default y
select ARM_ERRATA_743622 if !MX6UL
select ARM_ERRATA_751472 if !MX6UL
select ARM_ERRATA_761320 if !MX6UL
select ARM_ERRATA_794072 if !MX6UL
config MX6D config MX6D
bool bool

4
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
View File

@ -49,6 +49,10 @@ config ARCH_LS1046A
config ARCH_LS2080A config ARCH_LS2080A
bool bool
select ARMV8_SET_SMPEN select ARMV8_SET_SMPEN
select ARM_ERRATA_826974
select ARM_ERRATA_828024
select ARM_ERRATA_829520
select ARM_ERRATA_833471
select FSL_LSCH3 select FSL_LSCH3
select SYS_FSL_DDR select SYS_FSL_DDR
select SYS_FSL_DDR_LE select SYS_FSL_DDR_LE

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

@ -114,12 +114,6 @@
#define CONFIG_SYS_FSL_ERRATUM_A008751 #define CONFIG_SYS_FSL_ERRATUM_A008751
/* ARM A57 CORE ERRATA */
#define CONFIG_ARM_ERRATA_826974
#define CONFIG_ARM_ERRATA_828024
#define CONFIG_ARM_ERRATA_829520
#define CONFIG_ARM_ERRATA_833471
#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1
#elif defined(CONFIG_FSL_LSCH2) #elif defined(CONFIG_FSL_LSCH2)
#define CONFIG_SYS_FSL_OCRAM_BASE 0x10000000 /* initial RAM */ #define CONFIG_SYS_FSL_OCRAM_BASE 0x10000000 /* initial RAM */

2
arch/arm/mach-exynos/Kconfig
View File

@ -82,6 +82,8 @@ config TARGET_ODROID_XU3
config TARGET_ARNDALE config TARGET_ARNDALE
bool "Exynos5250 Arndale board" bool "Exynos5250 Arndale board"
select ARM_ERRATA_773022
select ARM_ERRATA_774769
select CPU_V7_HAS_NONSEC select CPU_V7_HAS_NONSEC
select CPU_V7_HAS_VIRT select CPU_V7_HAS_VIRT
select SUPPORT_SPL select SUPPORT_SPL

5
arch/arm/mach-tegra/Kconfig
View File

@ -65,10 +65,15 @@ choice
config TEGRA20 config TEGRA20
bool "Tegra20 family" bool "Tegra20 family"
select ARM_ERRATA_716044
select ARM_ERRATA_742230
select ARM_ERRATA_751472
select TEGRA_ARMV7_COMMON select TEGRA_ARMV7_COMMON
config TEGRA30 config TEGRA30
bool "Tegra30 family" bool "Tegra30 family"
select ARM_ERRATA_743622
select ARM_ERRATA_751472
select TEGRA_ARMV7_COMMON select TEGRA_ARMV7_COMMON
config TEGRA114 config TEGRA114

4
include/configs/am3517_crane.h
View File

@ -18,10 +18,6 @@
*/ */
#define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */
#define CONFIG_OMAP3_AM3517CRANE 1 /* working with CRANEBOARD */ #define CONFIG_OMAP3_AM3517CRANE 1 /* working with CRANEBOARD */
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #define CONFIG_EMIF4 /* The chip has EMIF4 controller */

5
include/configs/am3517_evm.h
View File

@ -19,11 +19,6 @@
#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #define CONFIG_EMIF4 /* The chip has EMIF4 controller */
/* /*

4
include/configs/arndale.h
View File

@ -47,10 +47,6 @@
/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */ /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
#define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000 #define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000
/* CPU Errata */
#define CONFIG_ARM_ERRATA_773022
#define CONFIG_ARM_ERRATA_774769
/* Power */ /* Power */
#define CONFIG_POWER #define CONFIG_POWER
#define CONFIG_POWER_I2C #define CONFIG_POWER_I2C

4
include/configs/cm_t35.h
View File

@ -25,10 +25,6 @@
#define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP /* in a TI OMAP core */
#define CONFIG_OMAP_GPIO #define CONFIG_OMAP_GPIO
#define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */ #define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_SDRC /* The chip has SDRC controller */ #define CONFIG_SDRC /* The chip has SDRC controller */

4
include/configs/cm_t3517.h
View File

@ -15,10 +15,6 @@
*/ */
#define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP /* in a TI OMAP core */
#define CONFIG_CM_T3517 /* working with CM-T3517 */ #define CONFIG_CM_T3517 /* working with CM-T3517 */
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_SYS_TEXT_BASE 0x80008000 #define CONFIG_SYS_TEXT_BASE 0x80008000

4
include/configs/mcx.h
View File

@ -15,10 +15,6 @@
#define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP /* in a TI OMAP core */
#define CONFIG_OMAP3_MCX /* working with mcx */ #define CONFIG_OMAP3_MCX /* working with mcx */
#define CONFIG_OMAP_GPIO #define CONFIG_OMAP_GPIO
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_MACH_TYPE MACH_TYPE_MCX #define CONFIG_MACH_TYPE MACH_TYPE_MCX

5
include/configs/mx6_common.h
View File

@ -8,11 +8,6 @@
#define __MX6_COMMON_H #define __MX6_COMMON_H
#ifndef CONFIG_MX6UL #ifndef CONFIG_MX6UL
#define CONFIG_ARM_ERRATA_743622
#define CONFIG_ARM_ERRATA_751472
#define CONFIG_ARM_ERRATA_794072
#define CONFIG_ARM_ERRATA_761320
#ifndef CONFIG_SYS_L2CACHE_OFF #ifndef CONFIG_SYS_L2CACHE_OFF
#define CONFIG_SYS_L2_PL310 #define CONFIG_SYS_L2_PL310
#define CONFIG_SYS_PL310_BASE L2_PL310_BASE #define CONFIG_SYS_PL310_BASE L2_PL310_BASE

4
include/configs/nokia_rx51.h
View File

@ -27,10 +27,6 @@
#define CONFIG_OMAP3430 /* which is in a 3430 */ #define CONFIG_OMAP3430 /* which is in a 3430 */
#define CONFIG_OMAP3_RX51 /* working with RX51 */ #define CONFIG_OMAP3_RX51 /* working with RX51 */
#define CONFIG_SYS_L2CACHE_OFF /* pretend there is no L2 CACHE */ #define CONFIG_SYS_L2CACHE_OFF /* pretend there is no L2 CACHE */
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_MACH_TYPE MACH_TYPE_NOKIA_RX51 #define CONFIG_MACH_TYPE MACH_TYPE_NOKIA_RX51

4
include/configs/omap3_evm.h
View File

@ -85,10 +85,6 @@
*/ */
#define CONFIG_OMAP /* This is TI OMAP core */ #define CONFIG_OMAP /* This is TI OMAP core */
#define CONFIG_OMAP_GPIO #define CONFIG_OMAP_GPIO
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_SDRC /* The chip has SDRC controller */ #define CONFIG_SDRC /* The chip has SDRC controller */

3
include/configs/sniper.h
View File

@ -17,9 +17,6 @@
*/ */
#define CONFIG_ARM_ARCH_CP15_ERRATA #define CONFIG_ARM_ARCH_CP15_ERRATA
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
/* /*
* Platform * Platform

4
include/configs/tam3517-common.h
View File

@ -15,10 +15,6 @@
*/ */
#define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP /* in a TI OMAP core */
#define CONFIG_OMAP_GPIO #define CONFIG_OMAP_GPIO
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_SYS_TEXT_BASE 0x80008000 #define CONFIG_SYS_TEXT_BASE 0x80008000

4
include/configs/tao3530.h
View File

@ -19,10 +19,6 @@
#define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP /* in a TI OMAP core */
#define CONFIG_OMAP_GPIO #define CONFIG_OMAP_GPIO
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_SDRC /* Has an SDRC controller */ #define CONFIG_SDRC /* Has an SDRC controller */

7
include/configs/tegra20-common.h
View File

@ -9,13 +9,6 @@
#define _TEGRA20_COMMON_H_ #define _TEGRA20_COMMON_H_
#include "tegra-common.h" #include "tegra-common.h"
/*
* Errata configuration
*/
#define CONFIG_ARM_ERRATA_716044
#define CONFIG_ARM_ERRATA_742230
#define CONFIG_ARM_ERRATA_751472
/* /*
* NS16550 Configuration * NS16550 Configuration
*/ */

6
include/configs/tegra30-common.h
View File

@ -9,12 +9,6 @@
#define _TEGRA30_COMMON_H_ #define _TEGRA30_COMMON_H_
#include "tegra-common.h" #include "tegra-common.h"
/*
* Errata configuration
*/
#define CONFIG_ARM_ERRATA_743622
#define CONFIG_ARM_ERRATA_751472
/* /*
* NS16550 Configuration * NS16550 Configuration
*/ */

5
include/configs/ti_omap3_common.h
View File

@ -21,11 +21,6 @@
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#include <asm/arch/omap.h> #include <asm/arch/omap.h>
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
/* The chip has SDRC controller */ /* The chip has SDRC controller */
#define CONFIG_SDRC #define CONFIG_SDRC

3
include/configs/ti_omap5_common.h
View File

@ -17,9 +17,6 @@
#ifndef __CONFIG_TI_OMAP5_COMMON_H #ifndef __CONFIG_TI_OMAP5_COMMON_H
#define __CONFIG_TI_OMAP5_COMMON_H #define __CONFIG_TI_OMAP5_COMMON_H
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_798870
/* Use General purpose timer 1 */ /* Use General purpose timer 1 */
#define CONFIG_SYS_TIMERBASE GPT2_BASE #define CONFIG_SYS_TIMERBASE GPT2_BASE

4
include/configs/tricorder.h
View File

@ -19,10 +19,6 @@
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_THUMB_BUILD
#define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP /* in a TI OMAP core */
/* Common ARM Erratas */
#define CONFIG_ARM_ERRATA_454179
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_MACH_TYPE MACH_TYPE_TRICORDER #define CONFIG_MACH_TYPE MACH_TYPE_TRICORDER
/* /*

18
scripts/config_whitelist.txt
View File

@ -141,24 +141,6 @@ CONFIG_ARMV8_SWITCH_TO_EL1
CONFIG_ARM_ARCH_CP15_ERRATA CONFIG_ARM_ARCH_CP15_ERRATA
CONFIG_ARM_ASM_UNIFIED CONFIG_ARM_ASM_UNIFIED
CONFIG_ARM_DCC CONFIG_ARM_DCC
CONFIG_ARM_ERRATA_430973
CONFIG_ARM_ERRATA_454179
CONFIG_ARM_ERRATA_621766
CONFIG_ARM_ERRATA_716044
CONFIG_ARM_ERRATA_742230
CONFIG_ARM_ERRATA_743622
CONFIG_ARM_ERRATA_751472
CONFIG_ARM_ERRATA_761320
CONFIG_ARM_ERRATA_773022
CONFIG_ARM_ERRATA_774769
CONFIG_ARM_ERRATA_794072
CONFIG_ARM_ERRATA_798870
CONFIG_ARM_ERRATA_801819
CONFIG_ARM_ERRATA_826974
CONFIG_ARM_ERRATA_828024
CONFIG_ARM_ERRATA_829520
CONFIG_ARM_ERRATA_833069
CONFIG_ARM_ERRATA_833471
CONFIG_ARM_FREQ CONFIG_ARM_FREQ
CONFIG_ARM_GIC_BASE_ADDRESS CONFIG_ARM_GIC_BASE_ADDRESS
CONFIG_ARM_PL180_MMCI CONFIG_ARM_PL180_MMCI