@@ -238,35 +238,40 @@ void Cache::Init() noexcept
238
238
ARM_MPU_RBAR (4 , IRAM_ADDR + 0x00010000 ),
239
239
ARM_MPU_RASR_EX (1u , ARM_MPU_AP_FULL, ARM_MPU_ACCESS_NORMAL (ARM_MPU_CACHEP_NOCACHE, ARM_MPU_CACHEP_NOCACHE, 1u ), 0u , ARM_MPU_REGION_SIZE_32KB)
240
240
},
241
+ // Next 1kb RAM, read-write, shared, non-cacheable, execute disabled
242
+ {
243
+ ARM_MPU_RBAR (5 , IRAM_ADDR + 0x00018000 ),
244
+ ARM_MPU_RASR_EX (1u , ARM_MPU_AP_FULL, ARM_MPU_ACCESS_NORMAL (ARM_MPU_CACHEP_NOCACHE, ARM_MPU_CACHEP_NOCACHE, 1u ), 0u , ARM_MPU_REGION_SIZE_1KB)
245
+ },
241
246
// RAMFUNC memory. Read-only (the code has already been written to it), execution allowed. The initialised data memory follows, so it must be RW.
242
247
// 256 bytes is enough at present (check the linker memory map if adding more RAMFUNCs).
243
248
{
244
- ARM_MPU_RBAR (5 , IRAM_ADDR + 0x00018000 ),
249
+ ARM_MPU_RBAR (6 , IRAM_ADDR + 0x00018400 ),
245
250
ARM_MPU_RASR_EX (0u , ARM_MPU_AP_FULL, ARM_MPU_ACCESS_NORMAL (CACHE_MODE, CACHE_MODE, 0u ), 0u , ARM_MPU_REGION_SIZE_256B)
246
251
},
247
252
// Final 128kb RAM, read-write, cacheable, execute disabled
248
253
{
249
- ARM_MPU_RBAR (6 , IRAM_ADDR + 0x00040000 ),
254
+ ARM_MPU_RBAR (7 , IRAM_ADDR + 0x00040000 ),
250
255
ARM_MPU_RASR_EX (1u , ARM_MPU_AP_FULL, ARM_MPU_ACCESS_NORMAL (CACHE_MODE, CACHE_MODE, 0u ), 0u , ARM_MPU_REGION_SIZE_128KB)
251
256
},
252
257
// Peripherals
253
258
{
254
- ARM_MPU_RBAR (7 , 0x40000000 ),
259
+ ARM_MPU_RBAR (8 , 0x40000000 ),
255
260
ARM_MPU_RASR_EX (1u , ARM_MPU_AP_FULL, ARM_MPU_ACCESS_DEVICE (1u ), 0u , ARM_MPU_REGION_SIZE_16MB)
256
261
},
257
262
// USBHS
258
263
{
259
- ARM_MPU_RBAR (8 , 0xA0100000 ),
264
+ ARM_MPU_RBAR (9 , 0xA0100000 ),
260
265
ARM_MPU_RASR_EX (1u , ARM_MPU_AP_FULL, ARM_MPU_ACCESS_DEVICE (1u ), 0u , ARM_MPU_REGION_SIZE_1MB)
261
266
},
262
267
// ROM
263
268
{
264
- ARM_MPU_RBAR (9 , IROM_ADDR),
269
+ ARM_MPU_RBAR (10 , IROM_ADDR),
265
270
ARM_MPU_RASR_EX (0u , ARM_MPU_AP_RO, ARM_MPU_ACCESS_NORMAL (ARM_MPU_CACHEP_WT_NWA, ARM_MPU_CACHEP_WT_NWA, 0u ), 0u , ARM_MPU_REGION_SIZE_4MB)
266
271
},
267
272
// ARM Private Peripheral Bus
268
273
{
269
- ARM_MPU_RBAR (10 , 0xE0000000 ),
274
+ ARM_MPU_RBAR (11 , 0xE0000000 ),
270
275
ARM_MPU_RASR_EX (1u , ARM_MPU_AP_FULL, ARM_MPU_ACCESS_ORDERED, 0u , ARM_MPU_REGION_SIZE_1MB)
271
276
}
272
277
};
0 commit comments