Changeset b1011dae in mainline for boot/arch/arm32/src/mm.c
- Timestamp:
- 2013-01-24T21:18:18Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 077b9172
- Parents:
- 5e761f3 (diff), c124dce3 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/arch/arm32/src/mm.c
r5e761f3 rb1011dae 66 66 else 67 67 return 1; 68 #else 68 #elif defined MACHINE_beagleboardxm 69 const unsigned long address = section << PTE_SECTION_SHIFT; 70 if (address >= BBXM_RAM_START && address < BBXM_RAM_END) 71 return 1; 72 #endif 69 73 return 0; 70 #endif71 74 } 72 75 … … 129 132 "mrc p15, 0, r0, c1, c0, 0\n" 130 133 131 #ifdef PROCESSOR_armv7_a 132 /* Mask to enable paging, caching */ 133 "ldr r1, =0x00000005\n" 134 #else 135 #ifdef MACHINE_gta02 136 /* Mask to enable paging (bit 0), 137 D-cache (bit 2), I-cache (bit 12) */ 138 "ldr r1, =0x00001005\n" 139 #else 140 /* Mask to enable paging */ 141 "ldr r1, =0x00000001\n" 142 #endif 143 #endif 134 /* Enable ICache, DCache, BPredictors and MMU, 135 * we disable caches before jumping to kernel 136 * so this is safe for all archs. 137 */ 138 "ldr r1, =0x00001805\n" 139 144 140 "orr r0, r0, r1\n" 145 141
Note:
See TracChangeset
for help on using the changeset viewer.