[rtems commit] bsps/arm: Rename function

Sebastian Huber sebh at rtems.org
Mon Jun 24 08:56:31 UTC 2013


Module:    rtems
Branch:    master
Commit:    1df348b9609f2b51ce43dd2addb26c2cf069d485
Changeset: http://git.rtems.org/rtems/commit/?id=1df348b9609f2b51ce43dd2addb26c2cf069d485

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Jun 24 11:00:36 2013 +0200

bsps/arm: Rename function

Rename arm_cp15_start_setup_translation_table_and_enable_mmu()
in arm_cp15_start_setup_translation_table_and_enable_mmu_and_cache()
to emphasize that the cache is also enabled after this operation.

---

 .../lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c |    2 +-
 .../arm/realview-pbx-a9/startup/bspstarthooks.c    |    2 +-
 .../lib/libbsp/arm/shared/include/arm-cp15-start.h |    4 ++--
 .../libbsp/arm/xilinx-zynq/startup/bspstarthooks.c |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c b/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c
index 0352062..3523792 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c
+++ b/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c
@@ -126,7 +126,7 @@ static BSP_START_TEXT_SECTION void setup_mmu_and_cache(void)
   arm_cp15_cache_invalidate();
 
   #ifndef LPC32XX_DISABLE_MMU
-    arm_cp15_start_setup_translation_table_and_enable_mmu(
+    arm_cp15_start_setup_translation_table_and_enable_mmu_and_cache(
       ctrl,
       (uint32_t *) bsp_translation_table_base,
       LPC32XX_MMU_CLIENT_DOMAIN,
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 cabfe64..36d8963 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
@@ -84,7 +84,7 @@ BSP_START_TEXT_SECTION static void setup_mmu_and_cache(void)
     ARM_CP15_CTRL_AFE | ARM_CP15_CTRL_Z
   );
 
-  arm_cp15_start_setup_translation_table_and_enable_mmu(
+  arm_cp15_start_setup_translation_table_and_enable_mmu_and_cache(
     ctrl,
     (uint32_t *) bsp_translation_table_base,
     ARM_MMU_DEFAULT_CLIENT_DOMAIN,
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h b/c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h
index 11efbcd..8b38bf8 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h
+++ b/c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h
@@ -71,8 +71,8 @@ arm_cp15_start_set_translation_table_entries(
   }
 }
 
-BSP_START_TEXT_SECTION static void
-arm_cp15_start_setup_translation_table_and_enable_mmu(
+BSP_START_TEXT_SECTION static inline void
+arm_cp15_start_setup_translation_table_and_enable_mmu_and_cache(
   uint32_t ctrl,
   uint32_t *ttb,
   uint32_t client_domain,
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c
index 8472323..ae09dec 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c
@@ -84,7 +84,7 @@ BSP_START_TEXT_SECTION static void setup_mmu_and_cache(void)
     ARM_CP15_CTRL_AFE | ARM_CP15_CTRL_Z
   );
 
-  arm_cp15_start_setup_translation_table_and_enable_mmu(
+  arm_cp15_start_setup_translation_table_and_enable_mmu_and_cache(
     ctrl,
     (uint32_t *) bsp_translation_table_base,
     ARM_MMU_DEFAULT_CLIENT_DOMAIN,




More information about the vc mailing list