From 9eb1994fd250174abb60ae71bbae33c54cd526f8 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 1 Jul 2014 15:17:40 +0200 Subject: [PATCH] bsps/arm: Rename bsp_mm_config_table Rename bsp_mm_config_table to arm_cp15_start_mmu_config_table and rename bsp_mm_config_table_size to arm_cp15_start_mmu_config_table_size to be in line with the other names in . --- .../libbsp/arm/raspberrypi/startup/mm_config_table.c | 10 +++------- c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h | 6 ++++-- c/src/lib/libbsp/arm/shared/mminit.c | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c b/c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c index 489ff2ebaa..398ba98096 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c +++ b/c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c @@ -20,13 +20,9 @@ * http://www.rtems.org/license/LICENSE. */ -#define ARM_CP15_TEXT_SECTION BSP_START_TEXT_SECTION - -#include #include -BSP_START_DATA_SECTION const arm_cp15_start_section_config -bsp_mm_config_table[] = { +const arm_cp15_start_section_config arm_cp15_start_mmu_config_table[] = { { .begin = (uint32_t) bsp_section_fast_text_begin, .end = (uint32_t) bsp_section_fast_text_end, @@ -74,5 +70,5 @@ bsp_mm_config_table[] = { } }; -BSP_START_DATA_SECTION const size_t bsp_mm_config_table_size = -RTEMS_ARRAY_SIZE(bsp_mm_config_table); +const size_t arm_cp15_start_mmu_config_table_size = + RTEMS_ARRAY_SIZE(arm_cp15_start_mmu_config_table); 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 33144d6785..7d5fd0fdf1 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 @@ -82,9 +82,11 @@ typedef struct { .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED \ } -extern const arm_cp15_start_section_config bsp_mm_config_table[]; +BSP_START_DATA_SECTION extern const arm_cp15_start_section_config + arm_cp15_start_mmu_config_table[]; -extern const size_t bsp_mm_config_table_size; +BSP_START_DATA_SECTION extern const size_t + arm_cp15_start_mmu_config_table_size; BSP_START_TEXT_SECTION static inline void arm_cp15_start_set_translation_table_entries( diff --git a/c/src/lib/libbsp/arm/shared/mminit.c b/c/src/lib/libbsp/arm/shared/mminit.c index 97c39ed43c..acfbfc0e36 100644 --- a/c/src/lib/libbsp/arm/shared/mminit.c +++ b/c/src/lib/libbsp/arm/shared/mminit.c @@ -23,7 +23,7 @@ BSP_START_TEXT_SECTION void bsp_memory_management_initialize(void) ctrl, (uint32_t *) bsp_translation_table_base, ARM_MMU_DEFAULT_CLIENT_DOMAIN, - &bsp_mm_config_table[0], - bsp_mm_config_table_size + &arm_cp15_start_mmu_config_table[0], + arm_cp15_start_mmu_config_table_size ); }