diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-16 18:07:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-16 18:12:00 -0400 |
| commit | 470135be276b2d92c6da464c68839202d4ff0d08 (patch) | |
| tree | 4d9370edd492c43f4409ee8716b8fe9264366516 /arch/arm/cpu/armv7 | |
| parent | 390194d43fa4478ddb638164ddb114c979f3e57a (diff) | |
| parent | e872f27a020f353dd334fc025999466adf5ae18c (diff) | |
| download | u-boot-470135be276b2d92c6da464c68839202d4ff0d08.tar.gz | |
Merge git://www.denx.de/git/u-boot-imx
Update pfla02 for setenv changes and PHYLIB/etc migration to Kconfig.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/cpu/armv7')
| -rw-r--r-- | arch/arm/cpu/armv7/start.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index f06fd28940..7b84a7a0f1 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -187,6 +187,12 @@ ENTRY(cpu_init_cp15) mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register #endif +#ifdef CONFIG_ARM_ERRATA_845369 + mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register + orr r0, r0, #1 << 22 @ set bit #22 + mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register +#endif + mov r5, lr @ Store my Caller mrc p15, 0, r1, c0, c0, 0 @ r1 has Read Main ID Register (MIDR) mov r3, r1, lsr #20 @ get variant field |