diff --git a/ports/zephyr/modules/_boot.py b/ports/zephyr/modules/_boot.py
index d0ba21d3f0..ab3ed9c634 100644
--- a/ports/zephyr/modules/_boot.py
+++ b/ports/zephyr/modules/_boot.py
@@ -11,12 +11,39 @@ FlashArea = getattr(zephyr, "FlashArea", None)
 # DiskAccess depends on CONFIG_DISK_ACCESS
 DiskAccess = getattr(zephyr, "DiskAccess", None)
 
+# zephyr.FileSystem depends on CONFIG_FILE_SYSTEM and CONFIG_FLASH_MAP
+FileSystem = getattr(zephyr, "FileSystem", None)
+
 _FLASH = const("/flash")
 _FLASH_LIB = const("/flash/lib")
 _STORAGE_KEY = const("storage")
 _FLASH_EXISTS = False
 
 
+def mount_filesystem_flash():
+    """Create a filesystem if needed on the FS partition "/flash"
+    and mount it on /flash.
+    Return True if successful, False otherwise.
+    """
+    if _FLASH in FileSystem.fstab():
+        fs = FileSystem(_FLASH)
+        retval = True
+        try:
+            vfs.mount(fs, _FLASH)
+        except OSError:
+            if getattr(fs, "mkfs", None):
+                try:
+                    fs.mkfs()
+                    vfs.mount(fs, _FLASH)
+                except OSError:
+                    print("Error formatting flash partition")
+                    retval = False
+            else:
+                retval = False
+        return retval
+    return False
+
+
 def create_flash_partition():
     """Create an LFS2 filesystem on the partition labeled storage
     and mount it on /flash.
@@ -54,7 +81,10 @@ def mount_all_disks():
     return retval
 
 
-if FlashArea and create_flash_partition():
+# Prefer FileSystem over FlashArea Access
+if FileSystem and mount_filesystem_flash():
+    _FLASH_EXISTS = True
+elif FlashArea and create_flash_partition():
     _FLASH_EXISTS = True
 
 # Prefer disks to /flash
@@ -67,6 +97,6 @@ if _FLASH_EXISTS:
     sys.path.append(_FLASH_LIB)
 
 # Cleanup globals for boot.py/main.py
-del FlashArea, DiskAccess, zephyr
+del FlashArea, DiskAccess, FileSystem, zephyr
 del sys, vfs, os, const
-del create_flash_partition, mount_all_disks, _FLASH_EXISTS
+del mount_filesystem_flash, create_flash_partition, mount_all_disks, _FLASH_EXISTS