diff --git a/boards/xtensa/esp32/common/Kconfig b/boards/xtensa/esp32/common/Kconfig
index 0aa9157704f..4942f3c387b 100644
--- a/boards/xtensa/esp32/common/Kconfig
+++ b/boards/xtensa/esp32/common/Kconfig
@@ -31,7 +31,6 @@ choice ESP32_SPIFLASH_FS
 	prompt "File system to mount on SPI Flash MTD"
 	default ESP32_SPIFLASH_SMARTFS
 	depends on ESP32_SPIFLASH_AUTO_BRINGUP
-	optional
 	---help---
 		Mount the SPI Flash MTD with the selected File System format on board
 		bring-up.
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig
index abc75760db5..1f0d7ec3298 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig
@@ -20,7 +20,6 @@ CONFIG_ARCH_CHIP_ESP32WROVER=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_XTENSA=y
-CONFIG_BCH=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
 CONFIG_BTSAK=y
 CONFIG_BUILTIN=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
index c0a6589bfce..88f2bc041e6 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
@@ -21,7 +21,6 @@ CONFIG_ARCH_XTENSA=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
 CONFIG_BUILTIN=y
 CONFIG_ESP32_SPIFLASH=y
-CONFIG_ESP32_SPIFLASH_SMARTFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
diff --git a/boards/xtensa/esp32s2/common/Kconfig b/boards/xtensa/esp32s2/common/Kconfig
index 67d35dd4157..2e7b5fb856a 100644
--- a/boards/xtensa/esp32s2/common/Kconfig
+++ b/boards/xtensa/esp32s2/common/Kconfig
@@ -15,7 +15,7 @@ config ESP32S2_MERGE_BINS
 config ESP32S2_SPIFLASH_AUTO_BRINGUP
 	bool "Automatic mount of SPI Flash MTD"
 	default y
-	depends on ESP32S2_SPIFLASH
+	depends on ESPRESSIF_SPIFLASH
 	---help---
 		Auto bring-up the SPI Flash MTD on board bring-up.
 		If not selected, the MTD will be registered as a device node on /dev.
@@ -24,7 +24,6 @@ choice ESP32S2_SPIFLASH_FS
 	prompt "File system to mount on SPI Flash MTD"
 	default ESP32S2_SPIFLASH_SMARTFS
 	depends on ESP32S2_SPIFLASH_AUTO_BRINGUP
-	optional
 	---help---
 		Mount the SPI Flash MTD with the selected File System format on board
 		bring-up.
diff --git a/boards/xtensa/esp32s3/common/Kconfig b/boards/xtensa/esp32s3/common/Kconfig
index 03687716f41..1e7a4841c08 100644
--- a/boards/xtensa/esp32s3/common/Kconfig
+++ b/boards/xtensa/esp32s3/common/Kconfig
@@ -61,7 +61,6 @@ choice ESP32S3_SPIFLASH_FS
 	prompt "File system to mount on SPI Flash MTD"
 	default ESP32S3_SPIFLASH_SMARTFS
 	depends on ESP32S3_SPIFLASH_AUTO_BRINGUP
-	optional
 	---help---
 		Mount the SPI Flash MTD with the selected File System format on board
 		bring-up.
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/spiflash/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/spiflash/defconfig
index 070f890e095..09e083d6cc2 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/spiflash/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/spiflash/defconfig
@@ -23,7 +23,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ESP32S3_SPIFLASH=y
-CONFIG_ESP32S3_SPIFLASH_SMARTFS=y
 CONFIG_ESP32S3_UART0=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y