diff --git a/ports/atmel-samd/common-hal/storage/__init__.c b/ports/atmel-samd/common-hal/storage/__init__.c
index c4cb831427..3838655588 100644
--- a/ports/atmel-samd/common-hal/storage/__init__.c
+++ b/ports/atmel-samd/common-hal/storage/__init__.c
@@ -29,7 +29,9 @@
 #include "flash_api.h"
 #include "py/mperrno.h"
 #include "py/runtime.h"
+#include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/storage/__init__.h"
+#include "supervisor/filesystem.h"
 #include "usb.h"
 
 extern volatile bool mp_msc_enabled;
@@ -47,3 +49,9 @@ void common_hal_storage_remount(const char* mount_path, bool readonly) {
 
     flash_set_usb_writable(readonly);
 }
+
+void common_hal_storage_erase_filesystem(void) {
+    filesystem_init(false, true);   // Force a re-format.
+    common_hal_mcu_reset();
+    // We won't actually get here, since we're resetting.
+}
diff --git a/ports/esp8266/common-hal/storage/__init__.c b/ports/esp8266/common-hal/storage/__init__.c
index a4c3a387ac..dd732e3b7c 100644
--- a/ports/esp8266/common-hal/storage/__init__.c
+++ b/ports/esp8266/common-hal/storage/__init__.c
@@ -26,9 +26,16 @@
 
 #include <string.h>
 
+#include "lib/oofatfs/ff.h"
+#include "lib/oofatfs/diskio.h"
+#include "py/mperrno.h"
 #include "py/runtime.h"
 #include "shared-bindings/storage/__init__.h"
 
 void common_hal_storage_remount(const char* mount_path, bool readonly) {
     mp_raise_NotImplementedError("");
 }
+
+void common_hal_storage_erase_filesystem() {
+    mp_raise_NotImplementedError("Use esptool to erase flash and re-upload Python instead");
+}
diff --git a/ports/nrf/common-hal/storage/__init__.c b/ports/nrf/common-hal/storage/__init__.c
index 9d94d39690..76ff814668 100644
--- a/ports/nrf/common-hal/storage/__init__.c
+++ b/ports/nrf/common-hal/storage/__init__.c
@@ -37,3 +37,7 @@ void common_hal_storage_remount(const char* mount_path, bool readonly) {
         mp_raise_OSError(MP_EINVAL);
     }
 }
+
+void common_hal_storage_erase_filesystem() {
+    mp_raise_NotImplementedError("");
+}
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index 2195d22423..ca9281a185 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -133,15 +133,17 @@ MP_DEFINE_CONST_FUN_OBJ_1(storage_getmount_obj, storage_getmount);
 
 //| .. function:: erase_filesystem()
 //|
-//|   Erase and re-create the ``CIRCUITPY`` filesystem. Then call
-//|   `microcontroller.reset()` to restart CircuitPython and have the
+//|   Erase and re-create the ``CIRCUITPY`` filesystem.
+//|
+//|   On boards that present USB-visible ``CIRCUITPY`` drive (e.g., SAMD21 and SAMD51),
+//|   then call `microcontroller.reset()` to restart CircuitPython and have the
 //|   host computer remount CIRCUITPY.
 //|
 //|   This function can be called from the REPL when ``CIRCUITPY``
 //|   has become corrupted.
 //|
 //|   .. warning:: All the data on ``CIRCUITPY`` will be lost, and
-//|        CircuitPython will restart.
+//|        CircuitPython will restart on certain boards.
 
 mp_obj_t storage_erase_filesystem(void) {
     common_hal_storage_erase_filesystem();
diff --git a/shared-module/storage/__init__.c b/shared-module/storage/__init__.c
index f1fa74990a..dc576ccdad 100644
--- a/shared-module/storage/__init__.c
+++ b/shared-module/storage/__init__.c
@@ -127,9 +127,3 @@ void common_hal_storage_umount_path(const char* mount_path) {
 mp_obj_t common_hal_storage_getmount(const char *mount_path) {
     return storage_object_from_path(mount_path);
 }
-
-void common_hal_storage_erase_filesystem(void) {
-    filesystem_init(false, true);   // Force a re-format.
-    common_hal_mcu_reset();
-    // We won't actually get here, since we're resetting.
-}
diff --git a/supervisor/filesystem.h b/supervisor/filesystem.h
index 63da0bcab5..eb9e65c091 100644
--- a/supervisor/filesystem.h
+++ b/supervisor/filesystem.h
@@ -29,7 +29,7 @@
 
 #include <stdbool.h>
 
-void filesystem_init(bool create_allowed, bool create_force);
+void filesystem_init(bool create_allowed, bool force_create);
 void filesystem_flush(void);
 void filesystem_writable_by_python(bool writable);
 bool filesystem_present(void);