Changeset ff381a7 in mainline for boot/arch/arm32/src/mm.c

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/mm.c (modified) (3 diffs)

boot/arch/arm32/src/mm.c

@@ -143 +143 @@
         pte->should_be_zero_1 = 0;
         pte->access_permission_0 = PTE_AP_USER_NO_KERNEL_RW;
-#ifdef PROCESSOR_ARCH_armv7_a
+#if defined(PROCESSOR_ARCH_armv6) || defined(PROCESSOR_ARCH_armv7_a)
         /*
          * Keeps this setting in sync with memory type attributes in:
@@ -152 +152 @@
         pte->tex = section_cacheable(frame) ? 5 : 0;
         pte->cacheable = section_cacheable(frame) ? 0 : 0;
-        pte->bufferable = section_cacheable(frame) ? 1 : 0;
+        pte->bufferable = section_cacheable(frame) ? 1 : 1;
 #else
-        pte->bufferable = 1;
+        pte->bufferable = section_cacheable(frame);
         pte->cacheable = section_cacheable(frame);
         pte->tex = 0;
@@ -189 +189 @@
          */
         uint32_t val = (uint32_t)boot_pt & TTBR_ADDR_MASK;
+#if defined(PROCESSOR_ARCH_armv6) || defined(PROCESSOR_ARCH_armv7_a)
+        // FIXME: TTBR_RGN_WBWA_CACHE is unpredictable on ARMv6
         val |= TTBR_RGN_WBWA_CACHE | TTBR_C_FLAG;
+#endif
         TTBR0_write(val);
 }