diff --git a/arch/xtensa/src/common/xtensa_macros.h b/arch/xtensa/src/common/xtensa_macros.h
index 3e8952be88..aabe43b848 100644
--- a/arch/xtensa/src/common/xtensa_macros.h
+++ b/arch/xtensa/src/common/xtensa_macros.h
@@ -38,7 +38,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include chip_macros.h"
+#include "chip_macros.h"
 
 /****************************************************************************
  * Assembly Language Macros
diff --git a/arch/xtensa/src/common/xtensa_vectors.S b/arch/xtensa/src/common/xtensa_vectors.S
index 6af479677c..35de6b3239 100644
--- a/arch/xtensa/src/common/xtensa_vectors.S
+++ b/arch/xtensa/src/common/xtensa_vectors.S
@@ -152,5 +152,3 @@ _xtensa_level6_vector:
 
 	.size	_xtensa_level6_vector, . - _xtensa_level6_vector
 #endif
-
-	.end
diff --git a/configs/esp32-core/nsh/defconfig b/configs/esp32-core/nsh/defconfig
index 895a2d6bac..6e1935c244 100644
--- a/configs/esp32-core/nsh/defconfig
+++ b/configs/esp32-core/nsh/defconfig
@@ -75,6 +75,8 @@ CONFIG_ARCH_CHIP="esp32"
 CONFIG_ARCH_CHIP_ESP32=y
 CONFIG_ARCH_FAMILY_LX6=y
 CONFIG_XTENSA_NCOPROCESSORS=1
+CONFIG_XTENSA_INT_NLEVELS=5
+CONFIG_XTENSA_EXCM_LEVEL=3
 # CONFIG_XTENSA_HAVE_LOOPS is not set
 CONFIG_XTENSA_HAVE_INTERRUPTS=y
 # CONFIG_XTENSA_USE_SWPRI is not set
@@ -482,6 +484,8 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
 # CONFIG_LIBC_IOCTL_VARIADIC is not set
+# CONFIG_LIBC_WCHAR is not set
+# CONFIG_LIBC_LOCALE is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set