diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
index 87e36a11ea..971059f570 100644
--- a/src/main/target/common_post.h
+++ b/src/main/target/common_post.h
@@ -234,6 +234,9 @@
 #endif
 
 #ifdef USE_FLASH
+#define USE_FLASH_TOOLS
+#define USE_FLASHFS
+#endif
 
 #if (defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25Q128FV)) && !defined(USE_FLASH_M25P16)
 #define USE_FLASH_M25P16
@@ -249,12 +252,8 @@
 
 #if defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25Q128FV)
 #define USE_FLASH_CHIP
-#define USE_FLASH_TOOLS
-#define USE_FLASHFS
 #endif
 
-#endif // USE_FLASH
-
 #ifndef USE_FLASH_CHIP
 #undef USE_FLASH_TOOLS
 #undef USE_FLASHFS