From 1df348b9609f2b51ce43dd2addb26c2cf069d485 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 24 Jun 2013 11:00:36 +0200 Subject: 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. --- c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c | 2 +- c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c | 2 +- c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h | 4 ++-- c/src/lib/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 03520624c8..3523792794 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 cabfe64d45..36d8963451 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 11efbcd400..8b38bf8401 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 84723234c7..ae09decdaf 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, -- cgit v1.2.3