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/07/05 15:07:07 UTC
[incubator-nuttx] branch master updated (664d45dcba -> f3e8decad2)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from 664d45dcba New rules of triggering redrawing display.
new b9703619b5 xtensa: Unify common options within a single Make.defs
new cd1ed92844 xtensa: Build sources for supporting CONFIG_SCHED_BACKTRACE
new f3e8decad2 xtensa: Build sources required for supporting CONFIG_BUILD_PROTECTED
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/xtensa/src/{esp32s2 => common}/Make.defs | 78 +++++++--------------------
arch/xtensa/src/esp32/Make.defs | 51 +-----------------
arch/xtensa/src/esp32s2/Make.defs | 43 +--------------
arch/xtensa/src/esp32s3/Make.defs | 49 +----------------
4 files changed, 24 insertions(+), 197 deletions(-)
copy arch/xtensa/src/{esp32s2 => common}/Make.defs (62%)
[incubator-nuttx] 02/03: xtensa: Build sources for supporting CONFIG_SCHED_BACKTRACE
Posted by xi...@apache.org.
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 cd1ed928440377a843367ee35f3b4770e52b2e2b
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Tue Jul 5 10:19:42 2022 -0300
xtensa: Build sources for supporting CONFIG_SCHED_BACKTRACE
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
arch/xtensa/src/common/Make.defs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/xtensa/src/common/Make.defs b/arch/xtensa/src/common/Make.defs
index 629c19d2bf..f50485ced0 100644
--- a/arch/xtensa/src/common/Make.defs
+++ b/arch/xtensa/src/common/Make.defs
@@ -52,6 +52,10 @@ ifeq ($(CONFIG_ARCH_FPU),y)
CMN_CSRCS += xtensa_fpucmp.c
endif
+ifeq ($(CONFIG_SCHED_BACKTRACE),y)
+ CMN_CSRCS += xtensa_backtrace.c
+endif
+
ifeq ($(CONFIG_SPINLOCK),y)
CMN_CSRCS += xtensa_testset.c
endif
[incubator-nuttx] 03/03: xtensa: Build sources required for supporting CONFIG_BUILD_PROTECTED
Posted by xi...@apache.org.
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 f3e8decad25ba03c420a6b7fd37442dffed9904d
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Tue Jul 5 10:20:40 2022 -0300
xtensa: Build sources required for supporting CONFIG_BUILD_PROTECTED
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
arch/xtensa/src/common/Make.defs | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/xtensa/src/common/Make.defs b/arch/xtensa/src/common/Make.defs
index f50485ced0..0d1c0162f5 100644
--- a/arch/xtensa/src/common/Make.defs
+++ b/arch/xtensa/src/common/Make.defs
@@ -72,3 +72,9 @@ ifeq ($(CONFIG_XTENSA_SEMIHOSTING_HOSTFS),y)
CMN_ASRCS += xtensa_simcall.S
CMN_CSRCS += xtensa_hostfs.c
endif
+
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
+ CMN_UASRCS += xtensa_signal_handler.S
+ CMN_ASRCS += xtensa_dispatch_syscall.S
+ CMN_CSRCS += xtensa_signal_dispatch.c xtensa_task_start.c xtensa_pthread_start.c
+endif
[incubator-nuttx] 01/03: xtensa: Unify common options within a single Make.defs
Posted by xi...@apache.org.
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 b9703619b5b4a626c5b13943168fa5ea3b6a0570
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Mon Jul 4 15:45:36 2022 -0300
xtensa: Unify common options within a single Make.defs
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
arch/xtensa/src/{esp32s2 => common}/Make.defs | 72 ++++-----------------------
arch/xtensa/src/esp32/Make.defs | 51 +------------------
arch/xtensa/src/esp32s2/Make.defs | 43 +---------------
arch/xtensa/src/esp32s3/Make.defs | 49 +-----------------
4 files changed, 16 insertions(+), 199 deletions(-)
diff --git a/arch/xtensa/src/esp32s2/Make.defs b/arch/xtensa/src/common/Make.defs
similarity index 62%
copy from arch/xtensa/src/esp32s2/Make.defs
copy to arch/xtensa/src/common/Make.defs
index 46d6f1c847..629c19d2bf 100644
--- a/arch/xtensa/src/esp32s2/Make.defs
+++ b/arch/xtensa/src/common/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# arch/xtensa/src/esp32s2/Make.defs
+# nuttx/arch/xtensa/src/common/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -18,15 +18,12 @@
#
############################################################################
-include chip/Bootloader.mk
-
# The start-up, "head", file. May be either a .S or a .c file.
HEAD_ASRC = xtensa_vectors.S xtensa_window_vector.S xtensa_windowspill.S
HEAD_ASRC += xtensa_int_handlers.S xtensa_user_handler.S
-HEAD_CSRC = esp32s2_start.c esp32s2_wdt.c
-# Common XTENSA files (arch/xtensa/src/common)
+# Common Xtensa files (arch/xtensa/src/common)
CMN_ASRCS = xtensa_context.S xtensa_cpuint.S xtensa_panic.S
@@ -41,7 +38,7 @@ CMN_CSRCS += xtensa_sigdeliver.c xtensa_stackframe.c xtensa_udelay.c
CMN_CSRCS += xtensa_unblocktask.c xtensa_usestack.c xtensa_swint.c
CMN_CSRCS += xtensa_saveusercontext.c
-# Configuration-dependent common XTENSA files
+# Configuration-dependent common Xtensa files
ifeq ($(CONFIG_DEBUG_TCBINFO),y)
CMN_CSRCS += xtensa_tcbinfo.c
@@ -51,10 +48,18 @@ ifeq ($(CONFIG_DEBUG_ALERT),y)
CMN_CSRCS += xtensa_dumpstate.c
endif
+ifeq ($(CONFIG_ARCH_FPU),y)
+ CMN_CSRCS += xtensa_fpucmp.c
+endif
+
ifeq ($(CONFIG_SPINLOCK),y)
CMN_CSRCS += xtensa_testset.c
endif
+ifeq ($(CONFIG_SMP),y)
+ CMN_CSRCS += xtensa_cpupause.c
+endif
+
ifeq ($(CONFIG_STACK_COLORATION),y)
CMN_CSRCS += xtensa_checkstack.c
endif
@@ -63,58 +68,3 @@ ifeq ($(CONFIG_XTENSA_SEMIHOSTING_HOSTFS),y)
CMN_ASRCS += xtensa_simcall.S
CMN_CSRCS += xtensa_hostfs.c
endif
-
-# Required ESP32-S2 files (arch/xtensa/src/lx7)
-
-CHIP_CSRCS = esp32s2_allocateheap.c esp32s2_clockconfig.c esp32s2_irq.c
-CHIP_CSRCS += esp32s2_gpio.c esp32s2_region.c esp32s2_user.c
-CHIP_CSRCS += esp32s2_timerisr.c esp32s2_lowputc.c esp32s2_systemreset.c
-
-# Configuration-dependent ESP32-S2 files
-
-ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
-CHIP_CSRCS += esp32s2_idle.c
-endif
-
-ifeq ($(CONFIG_ESP32S2_UART),y)
-CHIP_CSRCS += esp32s2_serial.c
-endif
-
-ifeq ($(CONFIG_ESP32S2_RNG),y)
-CHIP_CSRCS += esp32s2_rng.c
-endif
-
-ifeq ($(CONFIG_ESP32S2_I2C),y)
-CHIP_CSRCS += esp32s2_i2c.c
-endif
-
-ifeq ($(CONFIG_ESP32S2_TIMER),y)
-CHIP_CSRCS += esp32s2_tim.c
-ifeq ($(CONFIG_TIMER),y)
-CHIP_CSRCS += esp32s2_tim_lowerhalf.c
-endif
-endif
-
-ifeq ($(CONFIG_WATCHDOG),y)
-CHIP_CSRCS += esp32s2_wdt_lowerhalf.c
-endif
-
-ifeq ($(CONFIG_ESP32S2_FREERUN),y)
-CHIP_CSRCS += esp32s2_freerun.c
-endif
-
-ifeq ($(CONFIG_ESP32S2_RT_TIMER),y)
-CHIP_CSRCS += esp32s2_rt_timer.c
-endif
-
-ifeq ($(CONFIG_ESP32S2_ONESHOT),y)
-CHIP_CSRCS += esp32s2_oneshot.c
-ifeq ($(CONFIG_ONESHOT),y)
-CHIP_CSRCS += esp32s2_oneshot_lowerhalf.c
-endif
-endif
-
-ifeq ($(CONFIG_ESP32S2_SPIRAM),y)
-CHIP_CSRCS += esp32s2_spiram.c
-CHIP_CSRCS += esp32s2_psram.c
-endif
diff --git a/arch/xtensa/src/esp32/Make.defs b/arch/xtensa/src/esp32/Make.defs
index e21a20b8e7..2d6a50ae1c 100644
--- a/arch/xtensa/src/esp32/Make.defs
+++ b/arch/xtensa/src/esp32/Make.defs
@@ -19,58 +19,11 @@
############################################################################
include chip/Bootloader.mk
+include common/Make.defs
# The start-up, "head", file. May be either a .S or a .c file.
-HEAD_ASRC = xtensa_vectors.S xtensa_window_vector.S xtensa_windowspill.S
-HEAD_ASRC += xtensa_int_handlers.S xtensa_user_handler.S
-HEAD_CSRC = esp32_start.c esp32_wdt.c
-
-# Common XTENSA files (arch/xtensa/src/common)
-
-CMN_ASRCS = xtensa_context.S xtensa_cpuint.S xtensa_panic.S
-
-CMN_CSRCS = xtensa_assert.c xtensa_blocktask.c
-CMN_CSRCS += xtensa_cpenable.c xtensa_createstack.c xtensa_exit.c
-CMN_CSRCS += xtensa_initialize.c xtensa_initialstate.c
-CMN_CSRCS += xtensa_irqdispatch.c xtensa_lowputs.c xtensa_mdelay.c
-CMN_CSRCS += xtensa_modifyreg8.c xtensa_modifyreg16.c xtensa_modifyreg32.c
-CMN_CSRCS += xtensa_puts.c xtensa_releasepending.c xtensa_releasestack.c
-CMN_CSRCS += xtensa_reprioritizertr.c xtensa_schedsigaction.c
-CMN_CSRCS += xtensa_sigdeliver.c xtensa_stackframe.c xtensa_udelay.c
-CMN_CSRCS += xtensa_unblocktask.c xtensa_usestack.c xtensa_swint.c
-CMN_CSRCS += xtensa_saveusercontext.c
-
-# Configuration-dependent common XTENSA files
-
-ifeq ($(CONFIG_DEBUG_TCBINFO),y)
- CMN_CSRCS += xtensa_tcbinfo.c
-endif
-
-ifeq ($(CONFIG_DEBUG_ALERT),y)
- CMN_CSRCS += xtensa_dumpstate.c
-endif
-
-ifeq ($(CONFIG_ARCH_FPU),y)
- CMN_CSRCS += xtensa_fpucmp.c
-endif
-
-ifeq ($(CONFIG_SPINLOCK),y)
- CMN_CSRCS += xtensa_testset.c
-endif
-
-ifeq ($(CONFIG_SMP),y)
- CMN_CSRCS += xtensa_cpupause.c
-endif
-
-ifeq ($(CONFIG_STACK_COLORATION),y)
- CMN_CSRCS += xtensa_checkstack.c
-endif
-
-ifeq ($(CONFIG_XTENSA_SEMIHOSTING_HOSTFS),y)
- CMN_ASRCS += xtensa_simcall.S
- CMN_CSRCS += xtensa_hostfs.c
-endif
+HEAD_CSRC = esp32_start.c esp32_wdt.c
# Required ESP32 files (arch/xtensa/src/lx6)
diff --git a/arch/xtensa/src/esp32s2/Make.defs b/arch/xtensa/src/esp32s2/Make.defs
index 46d6f1c847..db87863817 100644
--- a/arch/xtensa/src/esp32s2/Make.defs
+++ b/arch/xtensa/src/esp32s2/Make.defs
@@ -19,52 +19,13 @@
############################################################################
include chip/Bootloader.mk
+include common/Make.defs
# The start-up, "head", file. May be either a .S or a .c file.
-HEAD_ASRC = xtensa_vectors.S xtensa_window_vector.S xtensa_windowspill.S
-HEAD_ASRC += xtensa_int_handlers.S xtensa_user_handler.S
HEAD_CSRC = esp32s2_start.c esp32s2_wdt.c
-# Common XTENSA files (arch/xtensa/src/common)
-
-CMN_ASRCS = xtensa_context.S xtensa_cpuint.S xtensa_panic.S
-
-CMN_CSRCS = xtensa_assert.c xtensa_blocktask.c
-CMN_CSRCS += xtensa_cpenable.c xtensa_createstack.c xtensa_exit.c
-CMN_CSRCS += xtensa_initialize.c xtensa_initialstate.c
-CMN_CSRCS += xtensa_irqdispatch.c xtensa_lowputs.c xtensa_mdelay.c
-CMN_CSRCS += xtensa_modifyreg8.c xtensa_modifyreg16.c xtensa_modifyreg32.c
-CMN_CSRCS += xtensa_puts.c xtensa_releasepending.c xtensa_releasestack.c
-CMN_CSRCS += xtensa_reprioritizertr.c xtensa_schedsigaction.c
-CMN_CSRCS += xtensa_sigdeliver.c xtensa_stackframe.c xtensa_udelay.c
-CMN_CSRCS += xtensa_unblocktask.c xtensa_usestack.c xtensa_swint.c
-CMN_CSRCS += xtensa_saveusercontext.c
-
-# Configuration-dependent common XTENSA files
-
-ifeq ($(CONFIG_DEBUG_TCBINFO),y)
- CMN_CSRCS += xtensa_tcbinfo.c
-endif
-
-ifeq ($(CONFIG_DEBUG_ALERT),y)
- CMN_CSRCS += xtensa_dumpstate.c
-endif
-
-ifeq ($(CONFIG_SPINLOCK),y)
- CMN_CSRCS += xtensa_testset.c
-endif
-
-ifeq ($(CONFIG_STACK_COLORATION),y)
- CMN_CSRCS += xtensa_checkstack.c
-endif
-
-ifeq ($(CONFIG_XTENSA_SEMIHOSTING_HOSTFS),y)
- CMN_ASRCS += xtensa_simcall.S
- CMN_CSRCS += xtensa_hostfs.c
-endif
-
-# Required ESP32-S2 files (arch/xtensa/src/lx7)
+# Required ESP32-S2 files (arch/xtensa/src/esp32s2)
CHIP_CSRCS = esp32s2_allocateheap.c esp32s2_clockconfig.c esp32s2_irq.c
CHIP_CSRCS += esp32s2_gpio.c esp32s2_region.c esp32s2_user.c
diff --git a/arch/xtensa/src/esp32s3/Make.defs b/arch/xtensa/src/esp32s3/Make.defs
index e66eff5ae9..4850b6990c 100644
--- a/arch/xtensa/src/esp32s3/Make.defs
+++ b/arch/xtensa/src/esp32s3/Make.defs
@@ -19,59 +19,12 @@
############################################################################
include chip/Bootloader.mk
+include common/Make.defs
# The start-up, "head", file. May be either a .S or a .c file.
-HEAD_ASRC = xtensa_vectors.S xtensa_window_vector.S xtensa_windowspill.S
-HEAD_ASRC += xtensa_int_handlers.S xtensa_user_handler.S
HEAD_CSRC = esp32s3_start.c
-# Common XTENSA files (arch/xtensa/src/common)
-
-CMN_ASRCS = xtensa_context.S xtensa_cpuint.S xtensa_panic.S
-
-CMN_CSRCS = xtensa_assert.c xtensa_blocktask.c
-CMN_CSRCS += xtensa_cpenable.c xtensa_createstack.c xtensa_exit.c
-CMN_CSRCS += xtensa_initialize.c xtensa_initialstate.c
-CMN_CSRCS += xtensa_irqdispatch.c xtensa_lowputs.c xtensa_mdelay.c
-CMN_CSRCS += xtensa_modifyreg8.c xtensa_modifyreg16.c xtensa_modifyreg32.c
-CMN_CSRCS += xtensa_puts.c xtensa_releasepending.c xtensa_releasestack.c
-CMN_CSRCS += xtensa_reprioritizertr.c xtensa_schedsigaction.c
-CMN_CSRCS += xtensa_sigdeliver.c xtensa_stackframe.c xtensa_udelay.c
-CMN_CSRCS += xtensa_unblocktask.c xtensa_usestack.c xtensa_swint.c
-CMN_CSRCS += xtensa_saveusercontext.c
-
-# Configuration-dependent common XTENSA files
-
-ifeq ($(CONFIG_DEBUG_TCBINFO),y)
- CMN_CSRCS += xtensa_tcbinfo.c
-endif
-
-ifeq ($(CONFIG_DEBUG_ALERT),y)
- CMN_CSRCS += xtensa_dumpstate.c
-endif
-
-ifeq ($(CONFIG_ARCH_FPU),y)
- CMN_CSRCS += xtensa_fpucmp.c
-endif
-
-ifeq ($(CONFIG_SPINLOCK),y)
- CMN_CSRCS += xtensa_testset.c
-endif
-
-ifeq ($(CONFIG_SMP),y)
- CMN_CSRCS += xtensa_cpupause.c
-endif
-
-ifeq ($(CONFIG_STACK_COLORATION),y)
- CMN_CSRCS += xtensa_checkstack.c
-endif
-
-ifeq ($(CONFIG_XTENSA_SEMIHOSTING_HOSTFS),y)
- CMN_ASRCS += xtensa_simcall.S
- CMN_CSRCS += xtensa_hostfs.c
-endif
-
# Required ESP32-S3 files (arch/xtensa/src/esp32s3)
CHIP_CSRCS = esp32s3_irq.c esp32s3_clockconfig.c esp32s3_region.c