diff --git a/libraries/AP_Filesystem/AP_Filesystem.h b/libraries/AP_Filesystem/AP_Filesystem.h
index ac785bf30a..652f53dcd9 100644
--- a/libraries/AP_Filesystem/AP_Filesystem.h
+++ b/libraries/AP_Filesystem/AP_Filesystem.h
@@ -51,12 +51,7 @@ struct dirent {
 #include <unistd.h>
 
 #ifndef AP_FILESYSTEM_FORMAT_ENABLED
-// only enable for SDMMC filesystems for now as other types can't query
-// block size
-#ifndef HAL_USE_SDMMC
-#define HAL_USE_SDMMC 0
-#endif
-#define AP_FILESYSTEM_FORMAT_ENABLED HAL_USE_SDMMC
+#define AP_FILESYSTEM_FORMAT_ENABLED 1
 #endif
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_SITL
@@ -69,10 +64,6 @@ struct dirent {
 
 #include "AP_Filesystem_backend.h"
 
-#ifndef AP_FILESYSTEM_FORMAT_ENABLED
-#define AP_FILESYSTEM_FORMAT_ENABLED 0
-#endif
-
 class AP_Filesystem {
 private:
     struct DirHandle {