From 5677fe215354c028688249920d2ce71ed3f58eb6 Mon Sep 17 00:00:00 2001 From: "chao.an" Date: Sat, 30 Apr 2022 12:58:59 +0800 Subject: [PATCH] arch/cortex-m/Make.defs: unify arch common source include Signed-off-by: chao.an --- arch/arm/src/armv6-m/Make.defs | 14 +++++++++++ arch/arm/src/armv7-m/Make.defs | 34 +++++++++++++++++++++++++ arch/arm/src/armv8-m/Make.defs | 35 ++++++++++++++++++++++++++ arch/arm/src/cxd56xx/Make.defs | 27 -------------------- arch/arm/src/efm32/Make.defs | 24 ------------------ arch/arm/src/eoss3/Make.defs | 16 ------------ arch/arm/src/imxrt/Make.defs | 26 ------------------- arch/arm/src/kinetis/Make.defs | 28 --------------------- arch/arm/src/kl/Make.defs | 10 -------- arch/arm/src/lc823450/Make.defs | 22 +--------------- arch/arm/src/lpc17xx_40xx/Make.defs | 24 ------------------ arch/arm/src/lpc43xx/Make.defs | 19 -------------- arch/arm/src/lpc54xx/Make.defs | 19 -------------- arch/arm/src/max326xx/Make.defs | 20 --------------- arch/arm/src/nrf52/Make.defs | 30 +++------------------- arch/arm/src/nuc1xx/Make.defs | 10 -------- arch/arm/src/phy62xx/Make.defs | 14 ++--------- arch/arm/src/rp2040/Make.defs | 14 ----------- arch/arm/src/rtl8720c/Make.defs | 10 -------- arch/arm/src/s32k1xx/Make.defs | 9 ------- arch/arm/src/s32k1xx/s32k11x/Make.defs | 10 -------- arch/arm/src/s32k1xx/s32k14x/Make.defs | 14 ----------- arch/arm/src/sam34/Make.defs | 21 ---------------- arch/arm/src/samd2l2/Make.defs | 10 -------- arch/arm/src/samd5e5/Make.defs | 21 ---------------- arch/arm/src/samv7/Make.defs | 26 ------------------- arch/arm/src/stm32/Make.defs | 32 ----------------------- arch/arm/src/stm32f0l0g0/Make.defs | 10 -------- arch/arm/src/stm32f7/Make.defs | 30 ---------------------- arch/arm/src/stm32h7/Make.defs | 32 ++--------------------- arch/arm/src/stm32l4/Make.defs | 24 ------------------ arch/arm/src/stm32l5/Make.defs | 25 ------------------ arch/arm/src/stm32u5/Make.defs | 28 --------------------- arch/arm/src/tiva/Make.defs | 23 ++--------------- arch/arm/src/xmc4/Make.defs | 27 -------------------- 35 files changed, 93 insertions(+), 645 deletions(-) diff --git a/arch/arm/src/armv6-m/Make.defs b/arch/arm/src/armv6-m/Make.defs index de3f30efce..a99c487961 100644 --- a/arch/arm/src/armv6-m/Make.defs +++ b/arch/arm/src/armv6-m/Make.defs @@ -21,3 +21,17 @@ # Common ARM files include common/Make.defs + +CMN_ASRCS += arm_exception.S + +CMN_CSRCS += arm_doirq.c arm_hardfault.c arm_initialstate.c +CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_svcall.c +CMN_CSRCS += arm_systemreset.c arm_tcbinfo.c arm_vectors.c + +ifeq ($(CONFIG_DEBUG_FEATURES),y) + CMN_CSRCS += arm_dumpnvic.c +endif + +ifeq ($(CONFIG_ARCH_RAMVECTORS),y) + CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c +endif diff --git a/arch/arm/src/armv7-m/Make.defs b/arch/arm/src/armv7-m/Make.defs index 8ef0c33694..a5e1b5dc69 100644 --- a/arch/arm/src/armv7-m/Make.defs +++ b/arch/arm/src/armv7-m/Make.defs @@ -21,3 +21,37 @@ # Common ARM files include common/Make.defs + +CMN_ASRCS += arm_exception.S + +CMN_CSRCS += arm_busfault.c arm_cache.c arm_doirq.c +CMN_CSRCS += arm_hardfault.c arm_initialstate.c arm_itm.c +CMN_CSRCS += arm_memfault.c arm_perf.c +CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c +CMN_CSRCS += arm_svcall.c arm_systemreset.c arm_tcbinfo.c +CMN_CSRCS += arm_trigger_irq.c arm_usagefault.c arm_vectors.c + +ifeq ($(CONFIG_ARMV7M_SYSTICK),y) + CMN_CSRCS += arm_systick.c +endif + +ifeq ($(CONFIG_ARMV7M_ITMSYSLOG),y) + CMN_CSRCS += arm_itm_syslog.c +endif + +ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) + CMN_CSRCS += arm_stackcheck.c +endif + +ifeq ($(CONFIG_ARCH_FPU),y) + CMN_CSRCS += arm_fpuconfig.c + CMN_CSRCS += arm_fpucmp.c +endif + +ifeq ($(CONFIG_ARCH_RAMVECTORS),y) + CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c +endif + +ifneq ($(filter y,$(CONFIG_ARM_MPU) $(CONFIG_ARM_MPU_EARLY_RESET)),) + CMN_CSRCS += arm_mpu.c +endif diff --git a/arch/arm/src/armv8-m/Make.defs b/arch/arm/src/armv8-m/Make.defs index c1e3f7676e..b4a0da3bed 100644 --- a/arch/arm/src/armv8-m/Make.defs +++ b/arch/arm/src/armv8-m/Make.defs @@ -21,3 +21,38 @@ # Common ARM files include common/Make.defs + +CMN_ASRCS += arm_exception.S + +CMN_CSRCS += arm_busfault.c arm_cache.c arm_doirq.c +CMN_CSRCS += arm_hardfault.c arm_initialstate.c arm_itm.c +CMN_CSRCS += arm_memfault.c arm_perf.c arm_sau.c +CMN_CSRCS += arm_schedulesigaction.c arm_securefault.c arm_secure_irq.c +CMN_CSRCS += arm_sigdeliver.c arm_svcall.c +CMN_CSRCS += arm_systemreset.c arm_tcbinfo.c +CMN_CSRCS += arm_trigger_irq.c arm_usagefault.c arm_vectors.c + +ifeq ($(CONFIG_ARMV8M_SYSTICK),y) + CMN_CSRCS += arm_systick.c +endif + +ifeq ($(CONFIG_ARMV8M_ITMSYSLOG),y) + CMN_CSRCS += arm_itm_syslog.c +endif + +ifeq ($(CONFIG_ARMV8M_STACKCHECK),y) + CMN_CSRCS += arm_stackcheck.c +endif + +ifeq ($(CONFIG_ARCH_FPU),y) + CMN_CSRCS += arm_fpuconfig.c + CMN_CSRCS += arm_fpucmp.c +endif + +ifeq ($(CONFIG_ARCH_RAMVECTORS),y) + CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c +endif + +ifneq ($(filter y,$(CONFIG_ARM_MPU) $(CONFIG_ARM_MPU_EARLY_RESET)),) + CMN_CSRCS += arm_mpu.c +endif diff --git a/arch/arm/src/cxd56xx/Make.defs b/arch/arm/src/cxd56xx/Make.defs index de0b5e60d1..ee2928dc9a 100644 --- a/arch/arm/src/cxd56xx/Make.defs +++ b/arch/arm/src/cxd56xx/Make.defs @@ -20,33 +20,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_initialstate.c arm_memfault.c arm_schedulesigaction.c -CMN_CSRCS += arm_sigdeliver.c arm_doirq.c arm_hardfault.c arm_svcall.c -CMN_CSRCS += arm_tcbinfo.c arm_vectors.c - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARCH_MEMCPY),y) -CMN_ASRCS += up_memcpy.S -endif - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARMV7M_ITMSYSLOG),y) -CMN_CSRCS += arm_itm_syslog.c -endif - CHIP_ASRCS += cxd56_farapistub.S CHIP_CSRCS = cxd56_allocateheap.c cxd56_idle.c diff --git a/arch/arm/src/efm32/Make.defs b/arch/arm/src/efm32/Make.defs index a154f0be91..3998938f1b 100644 --- a/arch/arm/src/efm32/Make.defs +++ b/arch/arm/src/efm32/Make.defs @@ -20,30 +20,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_itm.c arm_memfault.c arm_schedulesigaction.c -CMN_CSRCS += arm_sigdeliver.c arm_svcall.c arm_systemreset.c -CMN_CSRCS += arm_trigger_irq.c arm_tcbinfo.c - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARMV7M_ITMSYSLOG),y) -CMN_CSRCS += arm_itm_syslog.c -endif - CHIP_CSRCS = efm32_start.c efm32_clockconfig.c efm32_irq.c efm32_timerisr.c CHIP_CSRCS += efm32_gpio.c efm32_lowputc.c efm32_timer.c efm32_i2c.c diff --git a/arch/arm/src/eoss3/Make.defs b/arch/arm/src/eoss3/Make.defs index 8cd303f9d0..f210879f64 100644 --- a/arch/arm/src/eoss3/Make.defs +++ b/arch/arm/src/eoss3/Make.defs @@ -20,22 +20,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c -CMN_CSRCS += arm_initialstate.c arm_itm.c arm_memfault.c -CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_svcall.c -CMN_CSRCS += arm_systemreset.c arm_trigger_irq.c arm_tcbinfo.c - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - CHIP_CSRCS = eoss3_start.c eoss3_gpio.c eoss3_lowputc.c eoss3_clockconfig.c CHIP_CSRCS += eoss3_irq.c CHIP_CSRCS += eoss3_serial.c diff --git a/arch/arm/src/imxrt/Make.defs b/arch/arm/src/imxrt/Make.defs index 3d4fa61ba3..f67aa27b9c 100644 --- a/arch/arm/src/imxrt/Make.defs +++ b/arch/arm/src/imxrt/Make.defs @@ -22,32 +22,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_initialstate.c arm_memfault.c arm_schedulesigaction.c -CMN_CSRCS += arm_sigdeliver.c arm_doirq.c arm_hardfault.c -CMN_CSRCS += arm_svcall.c arm_trigger_irq.c arm_systemreset.c -CMN_CSRCS += arm_tcbinfo.c arm_vectors.c - -ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c -endif - -CMN_CSRCS += arm_cache.c - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - # Required i.MX RT files CHIP_CSRCS = imxrt_allocateheap.c imxrt_start.c imxrt_clockconfig.c diff --git a/arch/arm/src/kinetis/Make.defs b/arch/arm/src/kinetis/Make.defs index 098a387394..3cf29b248d 100644 --- a/arch/arm/src/kinetis/Make.defs +++ b/arch/arm/src/kinetis/Make.defs @@ -20,34 +20,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_memfault.c arm_initialstate.c -CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_doirq.c arm_hardfault.c arm_svcall.c -CMN_CSRCS += arm_systemreset.c arm_trigger_irq.c arm_tcbinfo.c - -ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARMV7M_ITMSYSLOG),y) -CMN_CSRCS += arm_itm_syslog.c -endif - # Required Kinetis files CHIP_CSRCS = kinetis_allocateheap.c kinetis_clockconfig.c kinetis_clrpend.c diff --git a/arch/arm/src/kl/Make.defs b/arch/arm/src/kl/Make.defs index f67ad84d97..80046d2395 100644 --- a/arch/arm/src/kl/Make.defs +++ b/arch/arm/src/kl/Make.defs @@ -20,16 +20,6 @@ include armv6-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_initialstate.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_systemreset.c arm_doirq.c arm_hardfault.c arm_svcall.c -CMN_CSRCS += arm_vectors.c arm_tcbinfo.c - -ifeq ($(CONFIG_DEBUG_FEATURES),y) -CMN_CSRCS += arm_dumpnvic.c -endif - CHIP_CSRCS = kl_clockconfig.c kl_gpio.c kl_irq.c kl_lowputc.c CHIP_CSRCS += kl_serial.c kl_start.c kl_cfmconfig.c diff --git a/arch/arm/src/lc823450/Make.defs b/arch/arm/src/lc823450/Make.defs index 1f1820c2fd..1d93056046 100644 --- a/arch/arm/src/lc823450/Make.defs +++ b/arch/arm/src/lc823450/Make.defs @@ -20,25 +20,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_initialstate.c arm_memfault.c -CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_systemreset.c -CMN_CSRCS += arm_doirq.c arm_hardfault.c arm_svcall.c arm_trigger_irq.c -CMN_CSRCS += arm_tcbinfo.c arm_vectors.c - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARCH_MEMCPY),y) -CMN_ASRCS += memcpy-armv7m.S -endif - -ifeq ($(CONFIG_ARCH_MEMMOVE),y) -CMN_CSRCS += up_memmove.c -endif - CHIP_CSRCS = lc823450_allocateheap2.c lc823450_start.c lc823450_irq.c lc823450_timer.c CHIP_CSRCS += lc823450_lowputc.c lc823450_serial.c lc823450_clockconfig.c CHIP_CSRCS += lc823450_syscontrol.c lc823450_gpio.c @@ -75,7 +56,7 @@ CHIP_CSRCS += lc823450_spi.c endif ifeq ($(CONFIG_ARCH_DMA), y) -CMN_CSRCS += lc823450_dma.c +CHIP_CSRCS += lc823450_dma.c endif ifeq ($(CONFIG_RTC),y) @@ -134,6 +115,5 @@ CHIP_CSRCS += lc823450_userspace.c endif ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c CHIP_CSRCS += lc823450_mpuinit2.c endif diff --git a/arch/arm/src/lpc17xx_40xx/Make.defs b/arch/arm/src/lpc17xx_40xx/Make.defs index 0f2e26c734..79c96c8a01 100644 --- a/arch/arm/src/lpc17xx_40xx/Make.defs +++ b/arch/arm/src/lpc17xx_40xx/Make.defs @@ -22,30 +22,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_memfault.c arm_initialstate.c -CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_trigger_irq.c -CMN_CSRCS += arm_doirq.c arm_hardfault.c arm_svcall.c arm_systemreset.c -CMN_CSRCS += arm_tcbinfo.c arm_perf.c - -ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - # Required LPC17xx files CHIP_CSRCS = lpc17_40_allocateheap.c lpc17_40_clockconfig.c lpc17_40_clrpend.c diff --git a/arch/arm/src/lpc43xx/Make.defs b/arch/arm/src/lpc43xx/Make.defs index d01bf2f065..ab3c658702 100644 --- a/arch/arm/src/lpc43xx/Make.defs +++ b/arch/arm/src/lpc43xx/Make.defs @@ -20,25 +20,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c -CMN_CSRCS += arm_initialstate.c arm_memfault.c arm_schedulesigaction.c -CMN_CSRCS += arm_sigdeliver.c arm_svcall.c arm_trigger_irq.c arm_tcbinfo.c - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - CHIP_CSRCS = lpc43_allocateheap.c lpc43_cgu.c lpc43_clrpend.c lpc43_gpio.c CHIP_CSRCS += lpc43_irq.c lpc43_pinconfig.c lpc43_rgu.c lpc43_serial.c CHIP_CSRCS += lpc43_start.c lpc43_uart.c diff --git a/arch/arm/src/lpc54xx/Make.defs b/arch/arm/src/lpc54xx/Make.defs index 3e5fcc2ab2..a9edb18d49 100644 --- a/arch/arm/src/lpc54xx/Make.defs +++ b/arch/arm/src/lpc54xx/Make.defs @@ -20,25 +20,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c -CMN_CSRCS += arm_initialstate.c arm_memfault.c arm_schedulesigaction.c -CMN_CSRCS += arm_sigdeliver.c arm_svcall.c arm_trigger_irq.c arm_tcbinfo.c - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - CHIP_CSRCS = lpc54_start.c lpc54_clockconfig.c lpc54_irq.c lpc54_clrpend.c CHIP_CSRCS += lpc54_allocateheap.c lpc54_lowputc.c lpc54_gpio.c lpc54_reset.c diff --git a/arch/arm/src/max326xx/Make.defs b/arch/arm/src/max326xx/Make.defs index e1d98ad598..02efb42e08 100644 --- a/arch/arm/src/max326xx/Make.defs +++ b/arch/arm/src/max326xx/Make.defs @@ -22,26 +22,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c -CMN_CSRCS += arm_initialstate.c arm_memfault.c -CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_svcall.c arm_trigger_irq.c arm_tcbinfo.c - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - # Common MAX326XX Source Files CHIP_CSRCS = max326_start.c max326_irq.c max326_clrpend.c diff --git a/arch/arm/src/nrf52/Make.defs b/arch/arm/src/nrf52/Make.defs index 3ba4ca824a..282976f9d7 100644 --- a/arch/arm/src/nrf52/Make.defs +++ b/arch/arm/src/nrf52/Make.defs @@ -20,39 +20,15 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_memfault.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_svcall.c arm_trigger_irq.c arm_systemreset.c -CMN_CSRCS += arm_tcbinfo.c - ifeq ($(CONFIG_NRF52_SYSTIMER_SYSTICK),y) -CMN_CSRCS += arm_systick.c nrf52_systick.c +CHIP_CSRCS += nrf52_systick.c else ifeq ($(CONFIG_NRF52_SYSTIMER_RTC),y) -CMN_CSRCS += nrf52_tickless_rtc.c +CHIP_CSRCS += nrf52_tickless_rtc.c endif endif -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -CHIP_CSRCS = nrf52_start.c nrf52_clockconfig.c nrf52_irq.c nrf52_utils.c +CHIP_CSRCS += nrf52_start.c nrf52_clockconfig.c nrf52_irq.c nrf52_utils.c CHIP_CSRCS += nrf52_allocateheap.c nrf52_lowputc.c nrf52_gpio.c nrf52_nvmc.c CHIP_CSRCS += nrf52_uid.c diff --git a/arch/arm/src/nuc1xx/Make.defs b/arch/arm/src/nuc1xx/Make.defs index 2d60aba1c8..44df844801 100644 --- a/arch/arm/src/nuc1xx/Make.defs +++ b/arch/arm/src/nuc1xx/Make.defs @@ -20,16 +20,6 @@ include armv6-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_initialstate.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_systemreset.c arm_doirq.c arm_hardfault.c arm_svcall.c -CMN_CSRCS += arm_vectors.c arm_tcbinfo.c - -ifeq ($(CONFIG_DEBUG_FEATURES),y) -CMN_CSRCS += arm_dumpnvic.c -endif - CHIP_CSRCS = nuc_clockconfig.c nuc_gpio.c nuc_irq.c nuc_lowputc.c CHIP_CSRCS += nuc_serial.c nuc_start.c diff --git a/arch/arm/src/phy62xx/Make.defs b/arch/arm/src/phy62xx/Make.defs index 9c99eed685..846f005da9 100644 --- a/arch/arm/src/phy62xx/Make.defs +++ b/arch/arm/src/phy62xx/Make.defs @@ -20,20 +20,10 @@ include armv6-m/Make.defs +CMN_ASRCS := $(filter-out arm_exception.S,$(CMN_ASRCS)) + CMN_ASRCS += phy62xx_exception.S phy62xx_start.S -CMN_CSRCS += arm_initialstate.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_systemreset.c arm_doirq.c phy62xx_hardfault.c -CMN_CSRCS += arm_svcall.c arm_vectors.c arm_tcbinfo.c - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -CMN_CSRCS += arm_pthread_exit.c -endif - -ifeq ($(CONFIG_DEBUG_FEATURES),y) -CMN_CSRCS += arm_dumpnvic.c -endif - CHIP_CSRCS = start.c gpio.c irq.c timer.c uart.c pwrmgr.c idle.c my_printf.c #CHIP_CSRCS = start.c gpio.c irq.c timer.c clock.c uart.c pwrmgr.c idle.c my_printf.c flash.c CHIP_CSRCS += jump_table.c diff --git a/arch/arm/src/rp2040/Make.defs b/arch/arm/src/rp2040/Make.defs index 6207e4db8f..3b19c39865 100644 --- a/arch/arm/src/rp2040/Make.defs +++ b/arch/arm/src/rp2040/Make.defs @@ -20,20 +20,6 @@ include armv6-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_initialstate.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_systemreset.c arm_doirq.c arm_hardfault.c arm_svcall.c -CMN_CSRCS += arm_vectors.c arm_tcbinfo.c - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_DEBUG_FEATURES),y) -CMN_CSRCS += arm_dumpnvic.c -endif - CHIP_CSRCS += rp2040_idle.c CHIP_CSRCS += rp2040_irq.c CHIP_CSRCS += rp2040_uart.c diff --git a/arch/arm/src/rtl8720c/Make.defs b/arch/arm/src/rtl8720c/Make.defs index 797d5339fe..b816787078 100644 --- a/arch/arm/src/rtl8720c/Make.defs +++ b/arch/arm/src/rtl8720c/Make.defs @@ -20,16 +20,6 @@ include armv8-m/Make.defs -# arch/arm/src/armv8-m -# -CMN_ASRCS += arm_exception.S arm_setjmp.S - -CMN_CSRCS += arm_cache.c arm_doirq.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_itm_syslog.c arm_memfault.c arm_mpu.c arm_ramvec_attach.c -CMN_CSRCS += arm_ramvec_initialize.c arm_schedulesigaction.c -CMN_CSRCS += arm_sigdeliver.c arm_stackcheck.c arm_svcall.c arm_systick.c -CMN_CSRCS += arm_tcbinfo.c - # arch/arm/src/rtl8720c # CHIP_CSRCS += ameba_nvic.c ameba_heap.c ameba_idle.c ameba_uart.c ameba_start.c diff --git a/arch/arm/src/s32k1xx/Make.defs b/arch/arm/src/s32k1xx/Make.defs index 5ccf534e50..83d6d92a19 100644 --- a/arch/arm/src/s32k1xx/Make.defs +++ b/arch/arm/src/s32k1xx/Make.defs @@ -18,15 +18,6 @@ # ############################################################################ -# Common ARM source files - -CMN_CSRCS += arm_tcbinfo.c - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - # Source files common to all S32K1xx chip families. CHIP_CSRCS = s32k1xx_start.c s32k1xx_lowputc.c s32k1xx_clockconfig.c diff --git a/arch/arm/src/s32k1xx/s32k11x/Make.defs b/arch/arm/src/s32k1xx/s32k11x/Make.defs index 142bae38d1..15d41d08d3 100644 --- a/arch/arm/src/s32k1xx/s32k11x/Make.defs +++ b/arch/arm/src/s32k1xx/s32k11x/Make.defs @@ -22,16 +22,6 @@ include armv6-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_initialstate.c arm_schedulesigaction.c -CMN_CSRCS += arm_sigdeliver.c arm_systemreset.c arm_doirq.c -CMN_CSRCS += arm_hardfault.c arm_svcall.c arm_vectors.c - -ifeq ($(CONFIG_DEBUG_FEATURES),y) -CMN_CSRCS += arm_dumpnvic.c -endif - # Source file specific to the S32k11x family CHIP_CSRCS += s32k11x_irq.c s32k11x_clockmapping.c s32k11x_periphfeatures.c diff --git a/arch/arm/src/s32k1xx/s32k14x/Make.defs b/arch/arm/src/s32k1xx/s32k14x/Make.defs index 76e6b650d3..54cc997543 100644 --- a/arch/arm/src/s32k1xx/s32k14x/Make.defs +++ b/arch/arm/src/s32k1xx/s32k14x/Make.defs @@ -22,20 +22,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c -CMN_CSRCS += arm_initialstate.c arm_memfault.c arm_schedulesigaction.c -CMN_CSRCS += arm_sigdeliver.c arm_svcall.c arm_trigger_irq.c arm_systemreset.c - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -CMN_CSRCS += arm_mpu.c -endif - # Source file specific to the S32k11x family CHIP_CSRCS += s32k14x_irq.c s32k14x_clrpend.c s32k14x_clockmapping.c diff --git a/arch/arm/src/sam34/Make.defs b/arch/arm/src/sam34/Make.defs index 2bd00fedba..9bda3fdcbf 100644 --- a/arch/arm/src/sam34/Make.defs +++ b/arch/arm/src/sam34/Make.defs @@ -24,27 +24,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_memfault.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_svcall.c arm_trigger_irq.c arm_tcbinfo.c - -# Configuration-dependent common files - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - # Required SAM3/4 files CHIP_CSRCS = sam_allocateheap.c sam_irq.c sam_lowputc.c sam_serial.c diff --git a/arch/arm/src/samd2l2/Make.defs b/arch/arm/src/samd2l2/Make.defs index 771af79af3..67645899a5 100644 --- a/arch/arm/src/samd2l2/Make.defs +++ b/arch/arm/src/samd2l2/Make.defs @@ -20,16 +20,6 @@ include armv6-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_initialstate.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_systemreset.c arm_doirq.c arm_hardfault.c arm_svcall.c -CMN_CSRCS += arm_vectors.c arm_tcbinfo.c - -ifeq ($(CONFIG_DEBUG_FEATURES),y) -CMN_CSRCS += arm_dumpnvic.c -endif - CHIP_CSRCS = sam_irq.c sam_lowputc.c sam_port.c sam_sercom.c sam_serial.c CHIP_CSRCS += sam_start.c sam_usart.c diff --git a/arch/arm/src/samd5e5/Make.defs b/arch/arm/src/samd5e5/Make.defs index 1b8fd5a3b7..295e69804c 100644 --- a/arch/arm/src/samd5e5/Make.defs +++ b/arch/arm/src/samd5e5/Make.defs @@ -24,27 +24,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_initialstate.c arm_memfault.c -CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_svcall.c -CMN_CSRCS += arm_trigger_irq.c arm_doirq.c arm_hardfault.c arm_tcbinfo.c - -# Configuration-dependent common files - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - # Required SAMD5x/E5x files CHIP_CSRCS = sam_clockconfig.c sam_gclk.c sam_irq.c sam_lowputc.c diff --git a/arch/arm/src/samv7/Make.defs b/arch/arm/src/samv7/Make.defs index e633f88f6c..e57e17a7aa 100644 --- a/arch/arm/src/samv7/Make.defs +++ b/arch/arm/src/samv7/Make.defs @@ -25,32 +25,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_systemreset.c arm_memfault.c arm_schedulesigaction.c -CMN_CSRCS += arm_sigdeliver.c arm_svcall.c arm_trigger_irq.c -CMN_CSRCS += arm_doirq.c arm_tcbinfo.c arm_cache.c - -# Configuration-dependent common files - -ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c -endif - # Required SAMV7 files CHIP_CSRCS = sam_start.c sam_clockconfig.c sam_irq.c sam_allocateheap.c diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs index dcb658fd32..b58ebd8149 100644 --- a/arch/arm/src/stm32/Make.defs +++ b/arch/arm/src/stm32/Make.defs @@ -20,38 +20,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_memfault.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_svcall.c arm_systemreset.c arm_trigger_irq.c -CMN_CSRCS += arm_doirq.c arm_tcbinfo.c arm_perf.c - -ifeq ($(CONFIG_STM32_TICKLESS_SYSTICK),y) -CMN_CSRCS += arm_systick.c -endif - -ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifneq ($(filter y,$(CONFIG_ARM_MPU) $(CONFIG_ARM_MPU_EARLY_RESET)),) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARMV7M_ITMSYSLOG),y) -CMN_CSRCS += arm_itm_syslog.c -endif - CHIP_CSRCS = stm32_allocateheap.c stm32_start.c stm32_rcc.c stm32_lse.c CHIP_CSRCS += stm32_lsi.c stm32_gpio.c stm32_exti_gpio.c stm32_flash.c CHIP_CSRCS += stm32_irq.c stm32_lowputc.c diff --git a/arch/arm/src/stm32f0l0g0/Make.defs b/arch/arm/src/stm32f0l0g0/Make.defs index e2136a709c..2b63457ada 100644 --- a/arch/arm/src/stm32f0l0g0/Make.defs +++ b/arch/arm/src/stm32f0l0g0/Make.defs @@ -20,16 +20,6 @@ include armv6-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_initialstate.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_systemreset.c arm_doirq.c arm_hardfault.c arm_svcall.c -CMN_CSRCS += arm_vectors.c arm_tcbinfo.c - -ifeq ($(CONFIG_DEBUG_FEATURES),y) -CMN_CSRCS += arm_dumpnvic.c -endif - CHIP_CSRCS = stm32_start.c stm32_gpio.c stm32_exti_gpio.c stm32_irq.c CHIP_CSRCS += stm32_lse.c stm32_lowputc.c stm32_serial.c stm32_rcc.c diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs index 5aeb26319a..7addd28371 100644 --- a/arch/arm/src/stm32f7/Make.defs +++ b/arch/arm/src/stm32f7/Make.defs @@ -25,36 +25,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_memfault.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_svcall.c arm_systemreset.c arm_trigger_irq.c -CMN_CSRCS += arm_tcbinfo.c arm_cache.c - -ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -# Configuration-dependent common files - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARMV7M_ITMSYSLOG),y) -CMN_CSRCS += arm_itm_syslog.c -endif - -ifneq ($(filter y,$(CONFIG_ARM_MPU) $(CONFIG_ARM_MPU_EARLY_RESET)),) -CMN_CSRCS += arm_mpu.c -endif - # Required STM32F7 files CHIP_CSRCS = stm32_allocateheap.c stm32_exti_gpio.c stm32_gpio.c diff --git a/arch/arm/src/stm32h7/Make.defs b/arch/arm/src/stm32h7/Make.defs index 3b6ac34527..643f8c2e15 100644 --- a/arch/arm/src/stm32h7/Make.defs +++ b/arch/arm/src/stm32h7/Make.defs @@ -25,41 +25,13 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_memfault.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_svcall.c arm_systemreset.c arm_trigger_irq.c -CMN_CSRCS += arm_tcbinfo.c arm_cache.c arm_perf.c - -ifeq ($(CONFIG_ARMV7M_SYSTICK),y) -CMN_CSRCS += arm_systick.c -endif - -ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - ifeq ($(CONFIG_STM32H7_PROGMEM),y) -CMN_CSRCS += stm32_flash.c -endif - -ifneq ($(filter y,$(CONFIG_ARM_MPU) $(CONFIG_ARM_MPU_EARLY_RESET)),) -CMN_CSRCS += arm_mpu.c +CHIP_CSRCS += stm32_flash.c endif # Required STM32H7 files -CHIP_CSRCS = stm32_allocateheap.c stm32_exti_gpio.c stm32_gpio.c stm32_irq.c +CHIP_CSRCS += stm32_allocateheap.c stm32_exti_gpio.c stm32_gpio.c stm32_irq.c CHIP_CSRCS += stm32_start.c stm32_rcc.c stm32_lowputc.c stm32_serial.c CHIP_CSRCS += stm32_uid.c diff --git a/arch/arm/src/stm32l4/Make.defs b/arch/arm/src/stm32l4/Make.defs index d3026ca242..72120d951d 100644 --- a/arch/arm/src/stm32l4/Make.defs +++ b/arch/arm/src/stm32l4/Make.defs @@ -25,30 +25,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_doirq.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_memfault.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_svcall.c arm_systemreset.c arm_trigger_irq.c -CMN_CSRCS += arm_tcbinfo.c arm_vectors.c - -ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c -endif - # Required STM32L4 files CHIP_CSRCS = stm32l4_allocateheap.c stm32l4_exti_gpio.c stm32l4_gpio.c diff --git a/arch/arm/src/stm32l5/Make.defs b/arch/arm/src/stm32l5/Make.defs index a9c3de418c..e31d3004ad 100644 --- a/arch/arm/src/stm32l5/Make.defs +++ b/arch/arm/src/stm32l5/Make.defs @@ -27,31 +27,6 @@ HEAD_ASRC = include armv8-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_memfault.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_svcall.c arm_systemreset.c arm_trigger_irq.c arm_tcbinfo.c - -# Configuration-dependent common files - -ifeq ($(CONFIG_ARMV8M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -CMN_CSRCS += arm_mpu.c -endif - # Required STM32L5 files CHIP_ASRCS = diff --git a/arch/arm/src/stm32u5/Make.defs b/arch/arm/src/stm32u5/Make.defs index d0b410818e..c72ebb1423 100644 --- a/arch/arm/src/stm32u5/Make.defs +++ b/arch/arm/src/stm32u5/Make.defs @@ -27,34 +27,6 @@ HEAD_ASRC = include armv8-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_hardfault.c -CMN_CSRCS += arm_initialstate.c arm_memfault.c -CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_svcall.c arm_systemreset.c arm_tcbinfo.c -CMN_CSRCS += arm_trigger_irq.c - -# Configuration-dependent common files - -ifeq ($(CONFIG_ARMV8M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -CMN_CSRCS += arm_mpu.c -CMN_CSRCS += arm_pthread_exit.c -endif - # Required STM32U5 files CHIP_ASRCS = diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs index fda99d999b..3c4b66324d 100644 --- a/arch/arm/src/tiva/Make.defs +++ b/arch/arm/src/tiva/Make.defs @@ -20,30 +20,11 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_doirq.c arm_hardfault.c arm_initialstate.c -CMN_CSRCS += arm_memfault.c arm_schedulesigaction.c arm_sigdeliver.c -CMN_CSRCS += arm_svcall.c arm_trigger_irq.c arm_tcbinfo.c arm_vectors.c - ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y) - CMN_CSRCS += tiva_idle.c + CHIP_CSRCS += tiva_idle.c endif -ifeq ($(CONFIG_ARCH_FPU),y) - CMN_CSRCS += arm_fpuconfig.c - CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) - CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c -endif - -CHIP_CSRCS = tiva_allocateheap.c tiva_irq.c tiva_lowputc.c tiva_serial.c +CHIP_CSRCS += tiva_allocateheap.c tiva_irq.c tiva_lowputc.c tiva_serial.c CHIP_CSRCS += tiva_ssi.c ifeq ($(CONFIG_ARCH_CHIP_LM3S),y) diff --git a/arch/arm/src/xmc4/Make.defs b/arch/arm/src/xmc4/Make.defs index 13f7d66b95..2060484161 100644 --- a/arch/arm/src/xmc4/Make.defs +++ b/arch/arm/src/xmc4/Make.defs @@ -20,33 +20,6 @@ include armv7-m/Make.defs -CMN_ASRCS += arm_exception.S - -CMN_CSRCS += arm_vectors.c arm_doirq.c arm_initialstate.c -CMN_CSRCS += arm_hardfault.c arm_memfault.c arm_schedulesigaction.c -CMN_CSRCS += arm_sigdeliver.c arm_svcall.c arm_systemreset.c arm_tcbinfo.c - -ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) -CMN_CSRCS += arm_stackcheck.c -endif - -ifeq ($(CONFIG_ARCH_RAMVECTORS),y) -CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c -endif - -ifeq ($(CONFIG_ARM_MPU),y) -CMN_CSRCS += arm_mpu.c -endif - -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_CSRCS += arm_fpuconfig.c -CMN_CSRCS += arm_fpucmp.c -endif - -ifeq ($(CONFIG_ARMV7M_ITMSYSLOG),y) -CMN_CSRCS += arm_itm_syslog.c -endif - # Required XMC4xxx files CHIP_CSRCS = xmc4_allocateheap.c xmc4_clockconfig.c xmc4_clockutils.c