diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/aes/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/aes/defconfig
index 02218687f1..abd7d8071c 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/aes/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/aes/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig
index 5b8af1d533..8c25496b83 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig
index 5c3a7e7c78..6f1c2b6a81 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig
@@ -19,6 +19,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig
index 2cad464cac..022830287b 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig
index f7b569e06f..d037b56537 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig
index e0175b02b3..22681deb7d 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig
@@ -11,6 +11,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig
index 6d45066a2c..bce8a3c0c9 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig
index b26a42aa0d..a827d15ac0 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig
index c81ecab518..01604ee39b 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig
index 0359527522..23eafc67ac 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
index dd6a90d561..4191227f31 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig
index d2e2da818f..446f47ca73 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
index 287ac2fa34..be35ce4581 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig
index 5ed701b603..2a7c6b02fa 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig
index da719b4c91..9881ca9e22 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-devkitc"
 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
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig
index 0c95d6ee70..a90db44783 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig
@@ -13,6 +13,7 @@ CONFIG_ARCH_BOARD="esp32-ethernet-kit"
 CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=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
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig
index f683d61b96..75f27383c4 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig
@@ -13,6 +13,7 @@ CONFIG_ARCH_BOARD="esp32-ethernet-kit"
 CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=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
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
index 1f725c8289..a70bdc84a7 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
@@ -13,6 +13,7 @@ CONFIG_ARCH_BOARD="esp32-ethernet-kit"
 CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=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
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig
index e95cd84ebd..0d527f6028 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-wrover-kit"
 CONFIG_ARCH_BOARD_ESP32_WROVERKIT=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
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig
index 34212860e3..c8860a27a1 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-wrover-kit"
 CONFIG_ARCH_BOARD_ESP32_WROVERKIT=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
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig
index a6d822c8f5..a4d65f63ef 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-wrover-kit"
 CONFIG_ARCH_BOARD_ESP32_WROVERKIT=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
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
index fc3dc3ff80..eae4244466 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_BOARD="esp32-wrover-kit"
 CONFIG_ARCH_BOARD_ESP32_WROVERKIT=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