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

Xtensa: Some things in Kconfig are really core options, not user configurations.

Browse Source
This commit is contained in:
Gregory Nutt 2016-10-22 12:25:56 -06:00
parent 53de345f05
commit 23b003c649
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/xtensa/Kconfig
View File

@ -35,10 +35,6 @@ config XTENSA_NCOPROCESSORS
int "Number of co-processors"
default 1
config XTENSA_HAVE_INTERRUPTS
bool
default n
config XTENSA_USE_SWPRI
bool "Use SWPRI"
default n
@ -46,10 +42,15 @@ config XTENSA_USE_SWPRI
config XTENSA_CALL0_ABI
bool "CALL0 ABI"
default y
---help---
The Window ABI is not supported. Only the CALL0 ABI is supported in the
current implementation.
config XTENSA_USE_OVLY
bool "Use overlay"
bool
default n
---help---
Enable code overlay support. This option is currently unsupported.
config ARCH_CHIP
string

18
arch/xtensa/src/common/xtensa_context.S
View File

@ -65,10 +65,6 @@
#include "xtensa_specregs.h"
#ifdef CONFIG_XTENSA_USE_OVLY
# include <xtensa/overlay_os_asm.h>
#endif
#warning REVIST XTENSA_EXTRA_SA_SIZE is not yet provided
#define XTENSA_EXTRA_SA_SIZE 0 /* REMOVE ME */
@ -175,15 +171,13 @@ _xtensa_context_save:
s32i a13, a2, (4 * REG_TMP1)
s32i a9, a2, (4 * REG_TMP2)
#ifdef CONFIG_XTENSA_USE_OVLY
/* Save the overlay state if we are supporting overlays. Since we just
* saved three registers, we can conveniently use them here. Note that
* as of now, overlays only work for windowed calling ABI.
*/
#ifdef CONFIG_XTENSA_USE_OVLY
l32i a9, a2, (4 * REG_PC) /* Recover saved PC */
_xt_overlay_get_state a9, a12, a13
s32i a9, a2, (4 * REG_OVLY) /* Save overlay state */
#error Overly support is not implemented
#endif
l32i a12, a2, (4 * REG_A12) /* Recover original a9,12,13 */
@ -356,13 +350,7 @@ _xtensa_context_restore:
* to be restored.
*/
l32i a2, a2, (4 * REG_PC) /* Retrieve PC */
l32i a3, a2, (4 * REG_PS) /* Retrieve PS */
l32i a4, a2, (4 * REG_OVLY) /* Retrieve overlay state */
l32i a5, a2, (4 * REG_A1) /* Retrieve stack ptr */
_xt_overlay_check_map a2, a3, a4, a5, a6
s32i a2, a2, (4 * REG_PC) /* Save updated PC */
s32i a3, a2, (4 * REG_PS) /* Save updated PS */
#error Overly support is not implemented
#endif
#ifdef CONFIG_XTENSA_USE_SWPRI

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

@ -75,7 +75,6 @@ CONFIG_ARCH_CHIP="esp32"
CONFIG_ARCH_CHIP_ESP32=y
CONFIG_ARCH_FAMILY_LX6=y
CONFIG_XTENSA_NCOPROCESSORS=1
CONFIG_XTENSA_HAVE_INTERRUPTS=y
# CONFIG_XTENSA_USE_SWPRI is not set
CONFIG_XTENSA_CALL0_ABI=y
# CONFIG_XTENSA_USE_OVLY is not set
@ -537,6 +536,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
#
# Examples
#
# CONFIG_EXAMPLES_CCTYPE is not set
# CONFIG_EXAMPLES_CHAT is not set
# CONFIG_EXAMPLES_CONFIGDATA is not set
# CONFIG_EXAMPLES_CXXTEST is not set
@ -558,10 +558,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