Changeset 0acd339 in mainline

Timestamp:

2013-01-01T12:15:32Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e55fcd2

Parents:

1a3a632

Message:

arm32,bbxm: Make boot mapping pages cacheable

Files:

• boot/arch/arm32/include/mm.h (modified) (1 diff)
• boot/arch/arm32/src/mm.c (modified) (1 diff)
• kernel/arch/arm32/src/cpu/cpu.c (modified) (1 diff)

boot/arch/arm32/include/mm.h

@@ -58 +58 @@
 #define GTA02_IOMEM_END  0x60000000
 
+/** Start of ram memory on BBxM */
+#define BBXM_RAM_START   0x80000000
+/** Start of ram memory on BBxM */
+#define BBXM_RAM_END   0xc0000000
+
+
 /* Page table level 0 entry - "section" format is used
  * (one-level paging, 1 MB sized pages). Used only while booting the kernel.

boot/arch/arm32/src/mm.c

@@ -56 +56 @@
         else
                 return 1;
-#else
+#elif defined MACHINE_beagleboardxm
+        const unsigned long address = section << PTE_SECTION_SHIFT;
+        if (address >= BBXM_RAM_START && address < BBXM_RAM_END)
+                return 1;
+#endif
         return 0;
-#endif
 }
 

kernel/arch/arm32/src/cpu/cpu.c

@@ -98 +98 @@
 void cpu_arch_init(void)
 {
+        /* Get rid of any boot code hiding in ICache
+         * This is safe without regards to ICache state. */
+        smc_coherence();
+
         uint32_t control_reg = 0;
         asm volatile (