Merge branch 'master' of git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / cpu / armv7 / start.S

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index ac1e55a708d7edb8a9e3d65202867b472aaf5096..27be451a89d5d39eed7e9809c04853954661b9dc 100644 (file)
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -205,7 +205,7 @@ ENTRY(cpu_init_cp15)
        mcr     p15, 0, r0, c1, c0, 0   @ write system control register
 #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
        orr     r0, r0, #1 << 4         @ set bit #4
        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
        mcr     p15, 0, r0, c15, c0, 1  @ write diagnostic register
 #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
 ENDPROC(cpu_init_cp15)