diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 889b8d798c5..2ff92ee1bc8 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -60,5 +60,8 @@ config ARCH_CHIP
 	default "esp32"		if ARCH_CHIP_ESP32
 
 source arch/xtensa/src/lx6/Kconfig
+if ARCH_CHIP_ESP32
+source arch/xtensa/src/esp32/Kconfig
+endif
 
 endif # ARCH_XTENSA
diff --git a/configs/esp32-core/nsh/defconfig b/configs/esp32-core/nsh/defconfig
index 14d63fcdc9d..895a2d6bacd 100644
--- a/configs/esp32-core/nsh/defconfig
+++ b/configs/esp32-core/nsh/defconfig
@@ -64,6 +64,7 @@ CONFIG_DEBUG_FULLOPT=y
 # CONFIG_ARCH_MIPS is not set
 # CONFIG_ARCH_RGMP is not set
 # CONFIG_ARCH_RENESAS is not set
+# CONFIG_ARCH_RISCV is not set
 # CONFIG_ARCH_SIM is not set
 # CONFIG_ARCH_X86 is not set
 CONFIG_ARCH_XTENSA=y
@@ -79,6 +80,9 @@ CONFIG_XTENSA_HAVE_INTERRUPTS=y
 # CONFIG_XTENSA_USE_SWPRI is not set
 CONFIG_XTENSA_CALL0_ABI=y
 # CONFIG_XTENSA_USE_OVLY is not set
+CONFIG_ESP32_BT_RESERVE_DRAM=0
+CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0
+CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
 
 #
 # Architecture Options
@@ -91,7 +95,7 @@ CONFIG_XTENSA_CALL0_ABI=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
-# CONFIG_ARCH_HAVE_MULTICPU is not set
+CONFIG_ARCH_HAVE_MULTICPU=y
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -556,10 +560,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