Commit 284bb60ed6636df3794ba102dd4325a96f1206e9
Exists in
v2017.01-smarct4x
and in
48 other branches
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Showing 3 changed files Side-by-side Diff
README
| ... | ... | @@ -566,6 +566,8 @@ |
| 566 | 566 | CONFIG_ARM_ERRATA_742230 |
| 567 | 567 | CONFIG_ARM_ERRATA_743622 |
| 568 | 568 | CONFIG_ARM_ERRATA_751472 |
| 569 | + CONFIG_ARM_ERRATA_794072 | |
| 570 | + CONFIG_ARM_ERRATA_761320 | |
| 569 | 571 | |
| 570 | 572 | If set, the workarounds for these ARM errata are applied early |
| 571 | 573 | during U-Boot startup. Note that these options force the |
arch/arm/cpu/armv7/start.S
| ... | ... | @@ -205,7 +205,7 @@ |
| 205 | 205 | mcr p15, 0, r0, c1, c0, 0 @ write system control register |
| 206 | 206 | #endif |
| 207 | 207 | |
| 208 | -#ifdef CONFIG_ARM_ERRATA_742230 | |
| 208 | +#if (defined(CONFIG_ARM_ERRATA_742230) || defined(CONFIG_ARM_ERRATA_794072)) | |
| 209 | 209 | mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register |
| 210 | 210 | orr r0, r0, #1 << 4 @ set bit #4 |
| 211 | 211 | mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register |
| ... | ... | @@ -220,6 +220,11 @@ |
| 220 | 220 | #ifdef CONFIG_ARM_ERRATA_751472 |
| 221 | 221 | mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register |
| 222 | 222 | orr r0, r0, #1 << 11 @ set bit #11 |
| 223 | + mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register | |
| 224 | +#endif | |
| 225 | +#ifdef CONFIG_ARM_ERRATA_761320 | |
| 226 | + mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register | |
| 227 | + orr r0, r0, #1 << 21 @ set bit #21 | |
| 223 | 228 | mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register |
| 224 | 229 | #endif |
| 225 | 230 |
include/configs/mx6_common.h