From 2d3caccf86584f9a540655e334c8c7f9addce594 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 5 Jun 2014 13:22:08 +0200 Subject: bsps/arm: Define ARM_CP15_TEXT_SECTION Define ARM_CP15_TEXT_SECTION to BSP_START_TEXT_SECTION so that the start code is in the right section. --- .../arm/altera-cyclone-v/startup/bspstarthooks.c | 4 +++- .../lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c | 2 ++ .../arm/raspberrypi/startup/mm_config_table.c | 2 ++ .../arm/realview-pbx-a9/startup/bspstarthooks.c | 2 ++ .../libbsp/arm/shared/include/arm-a9mpcore-start.h | 18 ---------------- .../lib/libbsp/arm/shared/include/arm-cp15-start.h | 25 +--------------------- c/src/lib/libbsp/arm/shared/mminit.c | 5 ++++- .../libbsp/arm/xilinx-zynq/startup/bspstarthooks.c | 2 ++ .../libbsp/arm/xilinx-zynq/startup/bspstartmmu.c | 2 ++ 9 files changed, 18 insertions(+), 44 deletions(-) diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c index e9147ea186..7236d3158c 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c @@ -12,6 +12,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define ARM_CP15_TEXT_SECTION BSP_START_TEXT_SECTION + #include #include #include @@ -199,4 +201,4 @@ BSP_START_TEXT_SECTION void bsp_start_hook_1( void ) bsp_start_copy_sections(); bsp_start_clear_bss(); -} \ No newline at end of file +} diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c b/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c index a5a2e7072a..1df21b4343 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c +++ b/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c @@ -20,6 +20,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define ARM_CP15_TEXT_SECTION BSP_START_TEXT_SECTION + #include #include #include 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 824bfec7c7..489ff2ebaa 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,6 +20,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define ARM_CP15_TEXT_SECTION BSP_START_TEXT_SECTION + #include #include 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 ade9001e74..df9e717c2c 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 @@ -12,6 +12,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define ARM_CP15_TEXT_SECTION BSP_START_TEXT_SECTION + #include #include #include diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h b/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h index 76a2f32f6d..7d6185b39e 100644 --- a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h +++ b/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h @@ -36,24 +36,6 @@ extern "C" { #endif /* __cplusplus */ -BSP_START_TEXT_SECTION static inline uint32_t -arm_cp15_get_control(void); - -BSP_START_TEXT_SECTION static inline void -arm_cp15_set_control(uint32_t val); - -BSP_START_TEXT_SECTION static inline uint32_t -arm_cp15_get_auxiliary_control(void); - -BSP_START_TEXT_SECTION static inline void -arm_cp15_set_auxiliary_control(uint32_t val); - -BSP_START_TEXT_SECTION static inline void -arm_cp15_set_vector_base_address(void *base); - -BSP_START_TEXT_SECTION static inline void -arm_cp15_branch_predictor_invalidate_all(void); - BSP_START_TEXT_SECTION static inline void arm_a9mpcore_start_set_vector_base(void) { 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 12b63a5766..33144d6785 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 @@ -83,31 +83,8 @@ typedef struct { } extern const arm_cp15_start_section_config bsp_mm_config_table[]; -extern const size_t bsp_mm_config_table_size; - -BSP_START_TEXT_SECTION static inline void -arm_cp15_set_domain_access_control(uint32_t val); - -BSP_START_TEXT_SECTION static inline void -arm_cp15_set_translation_table_base(uint32_t *base); - -BSP_START_TEXT_SECTION static inline void -arm_cp15_set_control(uint32_t val); - -BSP_START_TEXT_SECTION static inline uint32_t -arm_cp15_get_control(void); -BSP_START_TEXT_SECTION static inline void -arm_cp15_cache_invalidate(void); - -BSP_START_TEXT_SECTION static inline void -arm_cp15_tlb_invalidate(void); - -BSP_START_TEXT_SECTION static inline uint32_t -arm_cp15_get_multiprocessor_affinity(void); - -BSP_START_TEXT_SECTION static inline uint32_t -arm_cortex_a9_get_multiprocessor_cpu_id(void); +extern const size_t bsp_mm_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 0e90344372..97c39ed43c 100644 --- a/c/src/lib/libbsp/arm/shared/mminit.c +++ b/c/src/lib/libbsp/arm/shared/mminit.c @@ -5,10 +5,13 @@ * found in the file LICENSE in this distribution or at * http://www.rtems.org/license/LICENSE. */ + +#define ARM_CP15_TEXT_SECTION BSP_START_TEXT_SECTION + +#include #include #include #include -#include BSP_START_TEXT_SECTION void bsp_memory_management_initialize(void) { 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 e2390c4268..d8834f017e 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c +++ b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c @@ -12,6 +12,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define ARM_CP15_TEXT_SECTION BSP_START_TEXT_SECTION + #include #include #include diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstartmmu.c b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstartmmu.c index 4d1852b39a..c7a1089bf4 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstartmmu.c +++ b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstartmmu.c @@ -12,6 +12,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define ARM_CP15_TEXT_SECTION BSP_START_TEXT_SECTION + #include #include #include -- cgit v1.2.3