Changeset ff381a7 in mainline for boot/arch/arm32/src/asm.S

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/arch/arm32/src/asm.S (modified) (2 diffs)

boot/arch/arm32/src/asm.S

@@ -75 +75 @@
         bic     r4, r4, #(1 << CP15_C1_DC)
 
-        # Disable I-cache and Branche predictors.
+        # Disable I-cache and Branch predictors.
         bic     r4, r4, #(1 << CP15_C1_IC)
+#ifdef PROCESSOR_ARCH_armv6
         bic     r4, r4, #(1 << CP15_C1_BP)
+#endif
         
         mcr     p15, 0, r4, c1, c0, 0
 #endif
-
-
         
-        #Wait for the operations to complete
+        # Wait for the operations to complete
 #ifdef PROCESSOR_ARCH_armv7_a
         dsb
 #else
-        #cp15 dsb, r4 is ignored (should be zero)
+        # cp15 dsb, r4 is ignored (should be zero)
         mov r4, #0
         mcr p15, 0, r4, c7, c10, 4
@@ -98 +98 @@
         nop
 
-        #Wait for the operations to complete
+        # Wait for the operations to complete
 #ifdef PROCESSOR_ARCH_armv7_a
         isb
         nop
-#else
+#elif defined(PROCESSOR_ARCH_armv6)
         # cp15 isb
         mcr p15, 0, r4, c7, c5, 4