1 files changed, 13 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c b/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c
index a049a55d1d..48e174a0ad 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c
@@ -27,51 +27,51 @@ rvpbxa9_mmu_config_table[] = {
   {
     .begin = (uint32_t) bsp_section_fast_text_begin,
     .end = (uint32_t) bsp_section_fast_text_end,
-    .flags = BSP_ARM_MMU_CODE
+    .flags = ARMV7_MMU_CODE_CACHED
   }, {
     .begin = (uint32_t) bsp_section_fast_data_begin,
     .end = (uint32_t) bsp_section_fast_data_end,
-    .flags = BSP_ARM_MMU_READ_WRITE_DATA
+    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
   }, {
     .begin = (uint32_t) bsp_section_start_begin,
     .end = (uint32_t) bsp_section_start_end,
-    .flags = BSP_ARM_MMU_CODE
+    .flags = ARMV7_MMU_CODE_CACHED
   }, {
     .begin = (uint32_t) bsp_section_vector_begin,
     .end = (uint32_t) bsp_section_vector_end,
-    .flags = BSP_ARM_MMU_READ_WRITE_CACHED
+    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
   }, {
     .begin = (uint32_t) bsp_section_text_begin,
     .end = (uint32_t) bsp_section_text_end,
-    .flags = BSP_ARM_MMU_CODE
+    .flags = ARMV7_MMU_CODE_CACHED
   }, {
     .begin = (uint32_t) bsp_section_rodata_begin,
     .end = (uint32_t) bsp_section_rodata_end,
-    .flags = BSP_ARM_MMU_READ_ONLY_DATA
+    .flags = ARMV7_MMU_DATA_READ_ONLY_CACHED
   }, {
     .begin = (uint32_t) bsp_section_data_begin,
     .end = (uint32_t) bsp_section_data_end,
-    .flags = BSP_ARM_MMU_READ_WRITE_DATA
+    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
   }, {
     .begin = (uint32_t) bsp_section_bss_begin,
     .end = (uint32_t) bsp_section_bss_end,
-    .flags = BSP_ARM_MMU_READ_WRITE_DATA
+    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
   }, {
     .begin = (uint32_t) bsp_section_work_begin,
     .end = (uint32_t) bsp_section_work_end,
-    .flags = BSP_ARM_MMU_READ_WRITE_DATA
+    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
   }, {
     .begin = (uint32_t) bsp_section_stack_begin,
     .end = (uint32_t) bsp_section_stack_end,
-    .flags = BSP_ARM_MMU_READ_WRITE_DATA
+    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
   }, {
     .begin = 0x10000000U,
     .end = 0x10020000U,
-    .flags = BSP_ARM_MMU_READ_WRITE
+    .flags = ARMV7_MMU_DEVICE
   }, {
     .begin = 0x1f000000U,
     .end = 0x20000000U,
-    .flags = BSP_ARM_MMU_READ_WRITE
+    .flags = ARMV7_MMU_DEVICE
   }
 };
 
@@ -85,7 +85,7 @@ BSP_START_TEXT_SECTION static void setup_mmu_and_cache(void)
   arm_cp15_start_setup_translation_table_and_enable_mmu(
     ctrl,
     (uint32_t *) bsp_translation_table_base,
-    BSP_ARM_MMU_CLIENT_DOMAIN,
+    ARM_MMU_DEFAULT_CLIENT_DOMAIN,
     &rvpbxa9_mmu_config_table[0],
     RTEMS_ARRAY_SIZE(rvpbxa9_mmu_config_table)
   );