sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XTENSA: Hook xtensa_irq.S into build

Browse Source
This commit is contained in:
Gregory Nutt 2016-10-15 11:46:21 -06:00
parent 4621784617
commit 8ffbf6d95e
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/xtensa/src/common/xtensa_irq.S
View File

@ -39,12 +39,12 @@
#include "xtensa_specregs.h"
#include "xtensa_macros.h"
#ifdef CONFIG_XTENSA_HAVE_INTERRUPTS
/****************************************************************************
* Public Data
****************************************************************************/
#ifdef CONFIG_XTENSA_HAVE_INTERRUPTS
/* INTENABLE virtualization information. */
.data
@ -64,7 +64,7 @@ _xtensa_vprimask:
.word 0xffffffff /* Virtual priority mask */
.size _xtensa_vprimask, 4
#endif /* XCHAL_HAVE_INTERRUPTS */
#endif /* CONFIG_XTENSA_HAVE_INTERRUPTS */
/****************************************************************************
* Public Functions
@ -89,7 +89,7 @@ _xtensa_vprimask:
xtensa_enable_interrupts:
ENTRY0
#if XCHAL_HAVE_INTERRUPTS
#ifdef CONFIG_XTENSA_HAVE_INTERRUPTS
movi a3, 0
movi a4, _xtensa_intdata
xsr a3, INTENABLE /* Disables all interrupts */
@ -127,7 +127,7 @@ xtensa_enable_interrupts:
xtensa_disable_interrupts:
ENTRY0
#if XCHAL_HAVE_INTERRUPTS
#ifdef CONFIG_XTENSA_HAVE_INTERRUPTS
movi a3, 0
movi a4, _xtensa_intdata
xsr a3, INTENABLE /* Disables all interrupts */

2
arch/xtensa/src/common/xtensa_macros.h
View File

@ -30,7 +30,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************************************************************/
#ifdef __ARCH_XTENSA_SRC_COMMON_XTENSA_MACROS_H
#ifndef __ARCH_XTENSA_SRC_COMMON_XTENSA_MACROS_H
#define __ARCH_XTENSA_SRC_COMMON_XTENSA_MACROS_H 1
/****************************************************************************

2
arch/xtensa/src/esp32/Make.defs
View File

@ -39,7 +39,7 @@ HEAD_ASRC =
# Common XTENSA files (arch/xtensa/src/common)
CMN_ASRCS =
CMN_ASRCS = xtensa_irq.S
CMN_CSRCS = xtensa_allocateheap.c xtensa_createstack.c xtensa_exit.c
CMN_CSRCS += xtensa_idle.c xtensa_initialize.c xtensa_interruptcontext.c
CMN_CSRCS += xtensa_lowputs.c xtensa_mdelay.c xtensa_modifyreg8.c

7
configs/esp32-core/nsh/defconfig
View File

@ -73,6 +73,11 @@ CONFIG_ARCH="xtensa"
CONFIG_ARCH_CHIP="esp32"
CONFIG_ARCH_CHIP_ESP32=y
CONFIG_ARCH_FAMILY_LX6=y
# CONFIG_XTENSA_HAVE_LOOPS is not set
CONFIG_XTENSA_HAVE_INTERRUPTS=y
# CONFIG_XTENSA_USE_SWPRI is not set
CONFIG_XTENSA_CALL0_ABI=y
# CONFIG_XTENSA_USE_OVLY is not set
#
# Architecture Options
@ -550,10 +555,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
CONFIG_EXAMPLES_NSH=y
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_EXAMPLES_NULL is not set
# CONFIG_EXAMPLES_NX is not set
# CONFIG_EXAMPLES_NXFFS is not set
# CONFIG_EXAMPLES_NXHELLO is not set
# CONFIG_EXAMPLES_NXIMAGE is not set
# CONFIG_EXAMPLES_NX is not set
# CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTERM is not set
# CONFIG_EXAMPLES_NXTEXT is not set