GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-05 22:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Browse source
This commit is contained in:
Albert ARIBAUD 2014-04-07 19:13:42 +02:00
commit 284bb60ed6
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -566,6 +566,8 @@ The following options need to be configured:
CONFIG_ARM_ERRATA_742230 CONFIG_ARM_ERRATA_742230
CONFIG_ARM_ERRATA_743622 CONFIG_ARM_ERRATA_743622
CONFIG_ARM_ERRATA_751472 CONFIG_ARM_ERRATA_751472
CONFIG_ARM_ERRATA_794072
CONFIG_ARM_ERRATA_761320
If set, the workarounds for these ARM errata are applied early If set, the workarounds for these ARM errata are applied early
during U-Boot startup. Note that these options force the during U-Boot startup. Note that these options force the

7
arch/arm/cpu/armv7/start.S
View file

@ -205,7 +205,7 @@ ENTRY(cpu_init_cp15)
mcr p15, 0, r0, c1, c0, 0 @ write system control register mcr p15, 0, r0, c1, c0, 0 @ write system control register
#endif #endif
#ifdef CONFIG_ARM_ERRATA_742230 #if (defined(CONFIG_ARM_ERRATA_742230) || defined(CONFIG_ARM_ERRATA_794072))
mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register
orr r0, r0, #1 << 4 @ set bit #4 orr r0, r0, #1 << 4 @ set bit #4
mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register
@ -222,6 +222,11 @@ ENTRY(cpu_init_cp15)
orr r0, r0, #1 << 11 @ set bit #11 orr r0, r0, #1 << 11 @ set bit #11
mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register
#endif #endif
#ifdef CONFIG_ARM_ERRATA_761320
mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register
orr r0, r0, #1 << 21 @ set bit #21
mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register
#endif
mov pc, lr @ back to my caller mov pc, lr @ back to my caller
ENDPROC(cpu_init_cp15) ENDPROC(cpu_init_cp15)

2
include/configs/mx6_common.h
View file

@ -20,6 +20,8 @@
#define CONFIG_ARM_ERRATA_742230 #define CONFIG_ARM_ERRATA_742230
#define CONFIG_ARM_ERRATA_743622 #define CONFIG_ARM_ERRATA_743622
#define CONFIG_ARM_ERRATA_751472 #define CONFIG_ARM_ERRATA_751472
#define CONFIG_ARM_ERRATA_794072
#define CONFIG_ARM_ERRATA_761320
#define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_BOARD_POSTCLK_INIT
#ifndef CONFIG_SYS_L2CACHE_OFF #ifndef CONFIG_SYS_L2CACHE_OFF