You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/04/30 13:50:25 UTC
[incubator-nuttx] 04/04: arch/arm/Make.defs: unify arch common source include
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 3ec2f7004686b2a6b05e7f18523eb87285f27f64
Author: chao.an <an...@xiaomi.com>
AuthorDate: Sat Apr 30 12:57:50 2022 +0800
arch/arm/Make.defs: unify arch common source include
Signed-off-by: chao.an <an...@xiaomi.com>
---
arch/arm/src/arm/Make.defs | 14 ++++++++++++++
arch/arm/src/c5471/Make.defs | 6 +-----
arch/arm/src/dm320/Make.defs | 9 ---------
arch/arm/src/imx1/Make.defs | 9 ---------
arch/arm/src/lpc214x/Make.defs | 5 -----
arch/arm/src/lpc2378/Make.defs | 7 +------
arch/arm/src/lpc31xx/Make.defs | 13 -------------
arch/arm/src/moxart/Make.defs | 11 +++--------
arch/arm/src/str71x/Make.defs | 6 ------
9 files changed, 19 insertions(+), 61 deletions(-)
diff --git a/arch/arm/src/arm/Make.defs b/arch/arm/src/arm/Make.defs
index dac854c713..15de378691 100644
--- a/arch/arm/src/arm/Make.defs
+++ b/arch/arm/src/arm/Make.defs
@@ -21,3 +21,17 @@
# Common ARM files
include common/Make.defs
+
+HEAD_ASRC = arm_head.S
+
+CMN_CSRCS += arm_dataabort.c arm_doirq.c arm_initialstate.c
+CMN_CSRCS += arm_prefetchabort.c arm_schedulesigaction.c
+CMN_CSRCS += arm_sigdeliver.c arm_syscall.c arm_tcbinfo.c
+CMN_CSRCS += arm_undefinedinsn.c
+
+CMN_ASRCS += arm_cache.S arm_vectoraddrexcptn.S
+CMN_ASRCS += arm_vectors.S arm_vectortab.S
+
+ifeq ($(CONFIG_PAGING),y)
+ CMN_CSRCS += arm_pginitialize.c arm_checkmapping.c arm_allocpage.c arm_va2pte.c
+endif
diff --git a/arch/arm/src/c5471/Make.defs b/arch/arm/src/c5471/Make.defs
index de9a6e30d1..b79fb2d35e 100644
--- a/arch/arm/src/c5471/Make.defs
+++ b/arch/arm/src/c5471/Make.defs
@@ -20,11 +20,7 @@
include arm/Make.defs
-HEAD_ASRC = arm_nommuhead.S
-
-CMN_CSRCS += arm_dataabort.c arm_doirq.c arm_initialstate.c
-CMN_CSRCS += arm_prefetchabort.c arm_schedulesigaction.c arm_sigdeliver.c
-CMN_CSRCS += arm_syscall.c arm_undefinedinsn.c arm_tcbinfo.c
+HEAD_ASRC = arm_nommuhead.S
CHIP_ASRCS = c5471_lowputc.S c5471_vectors.S
CHIP_CSRCS = c5471_irq.c c5471_serial.c c5471_watchdog.c c5471_ethernet.c
diff --git a/arch/arm/src/dm320/Make.defs b/arch/arm/src/dm320/Make.defs
index 13cc78ad82..349f9ef3ab 100644
--- a/arch/arm/src/dm320/Make.defs
+++ b/arch/arm/src/dm320/Make.defs
@@ -20,15 +20,6 @@
include arm/Make.defs
-HEAD_ASRC = arm_head.S
-
-CMN_ASRCS += arm_cache.S arm_vectors.S
-CMN_ASRCS += arm_vectoraddrexcptn.S arm_vectortab.S
-
-CMN_CSRCS += arm_dataabort.c arm_initialstate.c arm_prefetchabort.c
-CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_syscall.c
-CMN_CSRCS += arm_undefinedinsn.c arm_tcbinfo.c
-
CHIP_ASRCS = dm320_lowputc.S dm320_restart.S
CHIP_CSRCS = dm320_allocateheap.c dm320_boot.c dm320_decodeirq.c
diff --git a/arch/arm/src/imx1/Make.defs b/arch/arm/src/imx1/Make.defs
index e8e84ce83c..7ba3a87868 100644
--- a/arch/arm/src/imx1/Make.defs
+++ b/arch/arm/src/imx1/Make.defs
@@ -20,15 +20,6 @@
include arm/Make.defs
-HEAD_ASRC = arm_head.S
-
-CMN_ASRCS += arm_cache.S
-CMN_ASRCS += arm_vectors.S arm_vectoraddrexcptn.S arm_vectortab.S
-
-CMN_CSRCS += arm_dataabort.c arm_initialstate.c arm_prefetchabort.c
-CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_syscall.c
-CMN_CSRCS += arm_undefinedinsn.c arm_tcbinfo.c
-
CHIP_ASRCS = imx_lowputc.S
CHIP_CSRCS = imx_boot.c imx_gpio.c imx_allocateheap.c imx_irq.c
CHIP_CSRCS += imx_serial.c imx_decodeirq.c imx_spi.c
diff --git a/arch/arm/src/lpc214x/Make.defs b/arch/arm/src/lpc214x/Make.defs
index 5fdf5e1867..887e288a69 100644
--- a/arch/arm/src/lpc214x/Make.defs
+++ b/arch/arm/src/lpc214x/Make.defs
@@ -21,11 +21,6 @@
include arm/Make.defs
HEAD_ASRC = lpc214x_head.S
-CMN_ASRCS += arm_vectors.S
-
-CMN_CSRCS += arm_dataabort.c arm_initialstate.c arm_prefetchabort.c
-CMN_CSRCS += arm_syscall.c arm_undefinedinsn.c arm_schedulesigaction.c
-CMN_CSRCS += arm_sigdeliver.c arm_tcbinfo.c
CHIP_ASRCS = lpc214x_lowputc.S
CHIP_CSRCS = lpc214x_decodeirq.c lpc214x_irq.c lpc214x_serial.c
diff --git a/arch/arm/src/lpc2378/Make.defs b/arch/arm/src/lpc2378/Make.defs
index 62ba3b48b4..b95622df2c 100644
--- a/arch/arm/src/lpc2378/Make.defs
+++ b/arch/arm/src/lpc2378/Make.defs
@@ -20,12 +20,7 @@
include arm/Make.defs
-HEAD_ASRC = lpc23xx_head.S
-CMN_ASRCS += arm_vectors.S
-
-CMN_CSRCS += arm_dataabort.c arm_initialstate.c arm_prefetchabort.c
-CMN_CSRCS += arm_syscall.c arm_undefinedinsn.c arm_schedulesigaction.c
-CMN_CSRCS += arm_sigdeliver.c arm_tcbinfo.c
+HEAD_ASRC = lpc23xx_head.S
CHIP_ASRCS = lpc23xx_lowputc.S
CHIP_CSRCS += lpc23xx_pllsetup.c lpc23xx_decodeirq.c lpc23xx_irq.c
diff --git a/arch/arm/src/lpc31xx/Make.defs b/arch/arm/src/lpc31xx/Make.defs
index 4c03acedab..93d02ce3c8 100644
--- a/arch/arm/src/lpc31xx/Make.defs
+++ b/arch/arm/src/lpc31xx/Make.defs
@@ -20,19 +20,6 @@
include arm/Make.defs
-HEAD_ASRC = arm_head.S
-
-CMN_ASRCS += arm_cache.S
-CMN_ASRCS += arm_vectors.S arm_vectoraddrexcptn.S arm_vectortab.S
-
-CMN_CSRCS += arm_dataabort.c arm_initialstate.c arm_prefetchabort.c
-CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_syscall.c
-CMN_CSRCS += arm_undefinedinsn.c arm_tcbinfo.c
-
-ifeq ($(CONFIG_PAGING),y)
-CMN_CSRCS += arm_pginitialize.c arm_checkmapping.c arm_allocpage.c arm_va2pte.c
-endif
-
CGU_CSRCS = lpc31_bcrndx.c lpc31_clkdomain.c lpc31_clkexten.c
CGU_CSRCS += lpc31_clkfreq.c lpc31_clkinit.c lpc31_defclk.c
CGU_CSRCS += lpc31_esrndx.c lpc31_fdcndx.c lpc31_fdivinit.c
diff --git a/arch/arm/src/moxart/Make.defs b/arch/arm/src/moxart/Make.defs
index 7da794efc3..b431414868 100644
--- a/arch/arm/src/moxart/Make.defs
+++ b/arch/arm/src/moxart/Make.defs
@@ -20,16 +20,11 @@
include arm/Make.defs
-HEAD_ASRC = moxart_head.S
-CMN_ASRCS += arm_vectors.S arm_nommuhead.S
+HEAD_ASRC = moxart_head.S
-CMN_CSRCS += arm_dataabort.c arm_initialstate.c arm_prefetchabort.c
-CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_syscall.c
-CMN_CSRCS += arm_undefinedinsn.c arm_tcbinfo.c
+CHIP_ASRCS = moxart_lowputc.S
-CHIP_ASRCS = moxart_lowputc.S
-
-CHIP_CSRCS = moxart_16550.c moxart_irq.c moxart_timer.c moxart_systemreset.c
+CHIP_CSRCS = moxart_16550.c moxart_irq.c moxart_timer.c moxart_systemreset.c
# Configuration-dependent Kinetis K files
diff --git a/arch/arm/src/str71x/Make.defs b/arch/arm/src/str71x/Make.defs
index fb9e080707..4d38b40360 100644
--- a/arch/arm/src/str71x/Make.defs
+++ b/arch/arm/src/str71x/Make.defs
@@ -22,12 +22,6 @@ include arm/Make.defs
HEAD_ASRC = str71x_head.S
-CMN_ASRCS += arm_vectors.S
-
-CMN_CSRCS += arm_dataabort.c arm_initialstate.c arm_prefetchabort.c
-CMN_CSRCS += arm_syscall.c arm_undefinedinsn.c arm_schedulesigaction.c
-CMN_CSRCS += arm_sigdeliver.c arm_tcbinfo.c
-
CHIP_CSRCS = str71x_prccu.c str71x_lowputc.c str71x_decodeirq.c str71x_irq.c
CHIP_CSRCS += str71x_serial.c