|
29 | 29 | #include ALIF_CMSIS_H |
30 | 30 |
|
31 | 31 | static const ARM_MPU_Region_t mpu_table[] __STARTUP_RO_DATA_ATTRIBUTE = { |
32 | | - { /* SRAM0 - 4MB : RO-0, NP-1, XN-0 */ |
| 32 | + [MP_MPU_REGION_SRAM0] = { /* SRAM0 - 4MB : RO-0, NP-1, XN-0 */ |
33 | 33 | .RBAR = ARM_MPU_RBAR(0x02000000, ARM_MPU_SH_NON, 0, 1, 0), |
34 | | - .RLAR = ARM_MPU_RLAR(0x023FFFFF, MP_MPU_ATTR_INDEX_NORMAL_WT_RA_TRANSIENT) |
| 34 | + .RLAR = ARM_MPU_RLAR(0x023FFFFF, MP_MPU_ATTR_NORMAL_WT_RA_TRANSIENT) |
35 | 35 | }, |
36 | | - { /* SRAM1 - 2.5MB : RO-0, NP-1, XN-0 */ |
| 36 | + [MP_MPU_REGION_SRAM1] = { /* SRAM1 - 2.5MB : RO-0, NP-1, XN-0 */ |
37 | 37 | .RBAR = ARM_MPU_RBAR(0x08000000, ARM_MPU_SH_NON, 0, 1, 0), |
38 | | - .RLAR = ARM_MPU_RLAR(0x0827FFFF, MP_MPU_ATTR_INDEX_NORMAL_WB_RA_WA) |
| 38 | + .RLAR = ARM_MPU_RLAR(0x0827FFFF, MP_MPU_ATTR_NORMAL_WB_RA_WA) |
39 | 39 | }, |
40 | | - { /* Host Peripherals - 16MB : RO-0, NP-1, XN-1 */ |
| 40 | + [MP_MPU_REGION_HOST_PERIPHERALS] = { /* Host Peripherals - 16MB : RO-0, NP-1, XN-1 */ |
41 | 41 | .RBAR = ARM_MPU_RBAR(0x1A000000, ARM_MPU_SH_NON, 0, 1, 1), |
42 | | - .RLAR = ARM_MPU_RLAR(0x1AFFFFFF, MP_MPU_ATTR_INDEX_DEVICE_nGnRE) |
| 42 | + .RLAR = ARM_MPU_RLAR(0x1AFFFFFF, MP_MPU_ATTR_DEVICE_nGnRE) |
43 | 43 | }, |
44 | | - { /* MRAM - 5.5MB : RO-1, NP-1, XN-0 */ |
| 44 | + [MP_MPU_REGION_MRAM] = { /* MRAM - 5.5MB : RO-1, NP-1, XN-0 */ |
45 | 45 | .RBAR = ARM_MPU_RBAR(0x80000000, ARM_MPU_SH_NON, 1, 1, 0), |
46 | | - .RLAR = ARM_MPU_RLAR(0x8057FFFF, MP_MPU_ATTR_INDEX_NORMAL_WT_RA) |
| 46 | + .RLAR = ARM_MPU_RLAR(0x8057FFFF, MP_MPU_ATTR_NORMAL_WT_RA) |
47 | 47 | }, |
48 | | - { /* OSPI Regs - 16MB : RO-0, NP-1, XN-1 */ |
| 48 | + [MP_MPU_REGION_OSPI_REGISTERS] = { /* OSPI Regs - 16MB : RO-0, NP-1, XN-1 */ |
49 | 49 | .RBAR = ARM_MPU_RBAR(0x83000000, ARM_MPU_SH_NON, 0, 1, 1), |
50 | | - .RLAR = ARM_MPU_RLAR(0x83FFFFFF, MP_MPU_ATTR_INDEX_DEVICE_nGnRE) |
| 50 | + .RLAR = ARM_MPU_RLAR(0x83FFFFFF, MP_MPU_ATTR_DEVICE_nGnRE) |
51 | 51 | }, |
52 | | - { /* OSPI0 XIP flash - 512MB : RO-1, NP-1, XN-0 */ |
| 52 | + [MP_MPU_REGION_OSPI0_XIP] = { /* OSPI0 XIP flash - 512MB : RO-1, NP-1, XN-0 */ |
53 | 53 | .RBAR = ARM_MPU_RBAR(0xA0000000, ARM_MPU_SH_NON, 1, 1, 0), |
54 | | - .RLAR = ARM_MPU_RLAR(0xBFFFFFFF, MP_MPU_ATTR_INDEX_NORMAL_NON_CACHEABLE) |
| 54 | + .RLAR = ARM_MPU_RLAR(0xBFFFFFFF, MP_MPU_ATTR_NORMAL_NON_CACHEABLE) |
55 | 55 | }, |
56 | 56 | }; |
57 | 57 |
|
58 | 58 | void MPU_Load_Regions(void) { |
59 | 59 | // Configure memory attributes. |
60 | 60 |
|
61 | | - ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_WT_RA_TRANSIENT, |
| 61 | + ARM_MPU_SetMemAttr(MP_MPU_ATTR_NORMAL_WT_RA_TRANSIENT, |
62 | 62 | ARM_MPU_ATTR(ARM_MPU_ATTR_MEMORY_(0, 0, 1, 0), ARM_MPU_ATTR_MEMORY_(0, 0, 1, 0))); |
63 | 63 |
|
64 | | - ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_DEVICE_nGnRE, |
| 64 | + ARM_MPU_SetMemAttr(MP_MPU_ATTR_DEVICE_nGnRE, |
65 | 65 | ARM_MPU_ATTR(ARM_MPU_ATTR_DEVICE, ARM_MPU_ATTR_DEVICE_nGnRE)); |
66 | 66 |
|
67 | | - ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_WB_RA_WA, |
| 67 | + ARM_MPU_SetMemAttr(MP_MPU_ATTR_NORMAL_WB_RA_WA, |
68 | 68 | ARM_MPU_ATTR(ARM_MPU_ATTR_MEMORY_(1, 1, 1, 1), ARM_MPU_ATTR_MEMORY_(1, 1, 1, 1))); |
69 | 69 |
|
70 | | - ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_WT_RA, |
| 70 | + ARM_MPU_SetMemAttr(MP_MPU_ATTR_NORMAL_WT_RA, |
71 | 71 | ARM_MPU_ATTR(ARM_MPU_ATTR_MEMORY_(1, 0, 1, 0), ARM_MPU_ATTR_MEMORY_(1, 0, 1, 0))); |
72 | 72 |
|
73 | | - ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_NON_CACHEABLE, |
| 73 | + ARM_MPU_SetMemAttr(MP_MPU_ATTR_NORMAL_NON_CACHEABLE, |
74 | 74 | ARM_MPU_ATTR(ARM_MPU_ATTR_NON_CACHEABLE, ARM_MPU_ATTR_NON_CACHEABLE)); |
75 | 75 |
|
76 | 76 | // Load the MPU regions from the table. |
|
0 commit comments