cpu/cortexm: make SVC call non removable

Signed-off-by: Dylan Laduranty <[email protected]>
RIOT-OS · May 15, 2024 · 4cc94fe · 4cc94fe
1 parent 2279524
commit 4cc94fe
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 14 deletions.
diff --git a/cpu/cortexm_common/Makefile.features b/cpu/cortexm_common/Makefile.features
@@ -1,6 +1,5 @@
 FEATURES_PROVIDED += arch_32bit
 FEATURES_PROVIDED += arch_arm
-FEATURES_PROVIDED += cortexm_svc
 FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += cpu_check_address
 FEATURES_PROVIDED += cpu_core_cortexm

diff --git a/cpu/cortexm_common/thread_arch.c b/cpu/cortexm_common/thread_arch.c
@@ -453,7 +453,6 @@ void __attribute__((naked)) __attribute__((used)) isr_pendsv(void) {
 }
 #endif
 
-#ifdef MODULE_CORTEXM_SVC
 void __attribute__((naked)) __attribute__((used)) isr_svc(void)
 {
     /* these two variants do exactly the same, but Cortex-M3 can use Thumb2
@@ -522,13 +521,6 @@ static void __attribute__((used)) _svc_dispatch(unsigned int *svc_args)
     }
 }
 
-#else /* MODULE_CORTEXM_SVC */
-void __attribute__((used)) isr_svc(void)
-{
-    SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
-}
-#endif /* MODULE_CORTEXM_SVC */
-
 void sched_arch_idle(void)
 {
 #ifdef MODULE_PM_LAYERED

diff --git a/makefiles/features_existing.inc.mk b/makefiles/features_existing.inc.mk
@@ -47,7 +47,6 @@ FEATURES_EXISTING := \
     cortexm_fpu \
     cortexm_mpu \
     cortexm_stack_limit \
-    cortexm_svc \
     cpp \
     cpu_arm7tdmi_gba \
     cpu_atmega1281 \

diff --git a/makefiles/features_modules.inc.mk b/makefiles/features_modules.inc.mk
@@ -82,9 +82,6 @@ endif
 # feature is used
 USEMODULE += $(filter cortexm_stack_limit, $(FEATURES_USED))
 
-# select cortexm_svc pseudomodule if the corresponding feature is used
-USEMODULE += $(filter cortexm_svc, $(FEATURES_USED))
-
 # select core_idle_thread if the feature no_idle_thread is *not* used
 ifeq (, $(filter no_idle_thread, $(FEATURES_USED)))
   ifneq (,$(filter core_thread, $(USEMODULE)))

diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk
@@ -55,7 +55,6 @@ PSEUDOMODULES += conn_can_isotp_multi
 PSEUDOMODULES += cord_ep_standalone
 PSEUDOMODULES += core_%
 PSEUDOMODULES += cortexm_fpu
-PSEUDOMODULES += cortexm_svc
 PSEUDOMODULES += cpp
 PSEUDOMODULES += cpu_check_address
 PSEUDOMODULES += crc16_fast