diff --git a/Documentation/platforms/xtensa/esp32/boards/esp32-devkitc/index.rst b/Documentation/platforms/xtensa/esp32/boards/esp32-devkitc/index.rst
index 4ac3c2abad..ec376cb19e 100644
--- a/Documentation/platforms/xtensa/esp32/boards/esp32-devkitc/index.rst
+++ b/Documentation/platforms/xtensa/esp32/boards/esp32-devkitc/index.rst
@@ -559,6 +559,29 @@ nsh
 Basic NuttShell configuration (console enabled in UART0, exposed via
 USB connection by means of CP2102 converter, at 115200 bps).
 
+nxdiag
+------
+
+This configuration enables the NuttX diagnostics tool. By default, it will
+gather information about the NuttX system, its configuration, the compilation
+and linking flags used, the host system PATH and Espressif specific information.
+It can be used by executing the ``nxdiag`` application::
+
+    nsh> nxdiag --all
+    Nxdiag Report:
+
+    NuttX RTOS info:
+            Hostname:
+            Release: 10.4.0
+            Build: 75e13a67ba-dirty May 24 2023 14:53:27
+            Arch: xtensa
+            Config: esp32-devkitc:nxdiag
+
+    NuttX CFLAGS:
+            -fno-common
+            -Wall
+            ...
+
 nxlooper
 --------
 
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/nxdiag/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/nxdiag/defconfig
new file mode 100644
index 0000000000..b7feb3c00d
--- /dev/null
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/nxdiag/defconfig
@@ -0,0 +1,49 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_ARCH_LEDS is not set
+# CONFIG_NSH_ARGCAT is not set
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+CONFIG_ARCH="xtensa"
+CONFIG_ARCH_BOARD="esp32-devkitc"
+CONFIG_ARCH_BOARD_COMMON=y
+CONFIG_ARCH_BOARD_ESP32_DEVKITC=y
+CONFIG_ARCH_CHIP="esp32"
+CONFIG_ARCH_CHIP_ESP32=y
+CONFIG_ARCH_CHIP_ESP32WROVER=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_XTENSA=y
+CONFIG_BOARD_LOOPSPERMSEC=16717
+CONFIG_BUILTIN=y
+CONFIG_ESP32_UART0=y
+CONFIG_FS_PROCFS=y
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_IDLETHREAD_STACKSIZE=3072
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INTELHEX_BINARY=y
+CONFIG_MM_REGIONS=3
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=114688
+CONFIG_RAM_START=0x20000000
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=6
+CONFIG_START_MONTH=12
+CONFIG_START_YEAR=2011
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NXDIAG=y
+CONFIG_SYSTEM_NXDIAG_COMP_FLAGS=y
+CONFIG_SYSTEM_NXDIAG_CONF=y
+CONFIG_SYSTEM_NXDIAG_ESPRESSIF=y
+CONFIG_SYSTEM_NXDIAG_HOST_PATH=y
+CONFIG_UART0_SERIAL_CONSOLE=y