3 files changed, 5 insertions, 43 deletions
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 <bsp/start.h>
 #include <bsp/arm-cp15-start.h>
 #include <bsp/linker-symbols.h>
 #include <bsp/mm.h>
-#include <bsp/start.h>
 
 BSP_START_TEXT_SECTION void bsp_memory_management_initialize(void)
 {