diff --git a/boards/xtensa/esp32/common/Kconfig b/boards/xtensa/esp32/common/Kconfig
index 4a93fca4a28..c7e26a38a1f 100644
--- a/boards/xtensa/esp32/common/Kconfig
+++ b/boards/xtensa/esp32/common/Kconfig
@@ -19,9 +19,14 @@ config ESP32_QEMU_IMAGE
 		Create a binary flash image used for QEMU.
 
 choice ESP32_SPIFLASH_FS
-	prompt "SPIFLASH File System"
+	prompt "Mount SPI Flash MTD on bring-up"
 	default ESP32_SPIFLASH_SMARTFS
 	depends on ESP32_SPIFLASH
+	optional
+	---help---
+		Mount the SPI Flash MTD with the selected File System format on board
+		bring-up.
+		If not selected, the MTD will be registered as a device node on /dev.
 
 	config ESP32_SPIFLASH_SMARTFS
 		bool "SmartFS"
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig
index 0dccdd4e00a..3e099e46b7d 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig
@@ -25,12 +25,12 @@ CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_AUTO_SLEEP=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIRELESS=y
 CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig
index 1d6a2449df3..1d60b784948 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig
@@ -34,10 +34,10 @@ CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_BLE=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig
index f22d81bfd76..33b52eb9825 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig
@@ -24,11 +24,11 @@ CONFIG_DRIVERS_IEEE80211=y
 CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIRELESS=y
 CONFIG_EXAMPLES_MQTTC=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
index c62111c5b3a..e338a82a82d 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
@@ -20,15 +20,14 @@ 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_FS_SMARTFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MM_REGIONS=3
-CONFIG_MTD_SMART=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_LOSMART=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
index fdd2e6f167b..c09974bf920 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
@@ -31,6 +31,7 @@ CONFIG_DRIVERS_IEEE80211=y
 CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIFI_STATION_SOFTAP_COEXISTENCE=y
@@ -38,7 +39,6 @@ CONFIG_ESP32_WIRELESS=y
 CONFIG_EXAMPLES_DHCPD=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
index dff24e83b0d..19a53dc5025 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
@@ -41,11 +41,11 @@ CONFIG_DRIVERS_IEEE80211=y
 CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIRELESS=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MM_REGIONS=3
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
index f690dabdf27..aa18ee6b5fd 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
@@ -31,13 +31,13 @@ CONFIG_DRIVERS_IEEE80211=y
 CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIRELESS=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_WEBSERVER=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig
index d3391b6982b..5e545d8da46 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig
@@ -25,11 +25,11 @@ CONFIG_DRIVERS_IEEE80211=y
 CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIRELESS=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig
index 327d5094f7f..ca12848cccb 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig
@@ -24,12 +24,12 @@ CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_AUTO_SLEEP=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIRELESS=y
 CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
index fad8d03a963..d045060ae2b 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
@@ -23,11 +23,11 @@ CONFIG_DRIVERS_IEEE80211=y
 CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIRELESS=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig
index 6378909c9c7..36829170205 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig
@@ -25,12 +25,12 @@ CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_AUTO_SLEEP=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIRELESS=y
 CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
index 833b25ec363..a6964e20a1e 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
@@ -24,11 +24,11 @@ CONFIG_DRIVERS_IEEE80211=y
 CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_MTD_SIZE=0x80000
 CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIRELESS=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072