merge 2.x changes into master; touch up Makefile CFLAGS logic

1 files changed, 4 insertions, 1 deletions

diff --git a/main.c b/main.c
index dd9b1bd6e..ba1e0e401 100644
--- a/main.c
+++ b/main.c
@@ -219,7 +219,10 @@ int __attribute__((used)) main(void) {
     mp_stack_fill_with_sentinel();
 #endif
 
-    filesystem_init();
+    // Create a new filesystem only if we're not in a safe mode.
+    // A power brownout here could make it appear as if there's
+    // no SPI flash filesystem, and we might erase the existing one.
+    filesystem_init(safe_mode == NO_SAFE_MODE);
 
     // Reset everything and prep MicroPython to run boot.py.
     reset_port();