Merge branch 'blackbox-flash' of https://github.com/sherlockflight/cleanflight-dev into sherlockflight-blackbox-flash

src/main/main.c

@@ -46,10 +46,12 @@
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_spi.h"
 #include "drivers/inverter.h"
+#include "drivers/flash_m25p16.h"
 
 #include "rx/rx.h"
 
 #include "io/serial.h"
+#include "io/flashfs.h"
 #include "io/gps.h"
 #include "io/escservo.h"
 #include "io/rc_controls.h"
@@ -362,6 +364,14 @@ void init(void)
         telemetryInit();
 #endif
 
+#ifdef USE_FLASHFS
+    #ifdef NAZE
+        // naze32 rev5 and above have 16mbit of flash available
+        m25p16_init();
+    #endif
+    flashfsInit();
+#endif
+
 #ifdef BLACKBOX
     initBlackbox();
 #endif