diff --git a/core/site_scons/site_tools/micropython/__init__.py b/core/site_scons/site_tools/micropython/__init__.py
index c87033c340..73d429e83b 100644
--- a/core/site_scons/site_tools/micropython/__init__.py
+++ b/core/site_scons/site_tools/micropython/__init__.py
@@ -91,7 +91,7 @@ def generate(env):
     )
 
     env["BUILDERS"]["FrozenCFile"] = SCons.Builder.Builder(
-        action="$MPY_TOOL -f -q $qstr_header $SOURCES > $TARGET",
+        action="$MPY_TOOL -f -q $qstr_header $SOURCES --skip-freeze all_modules.py > $TARGET",
     )
 
 
diff --git a/vendor/micropython b/vendor/micropython
index ecfabf9d7a..6bdefd1472 160000
--- a/vendor/micropython
+++ b/vendor/micropython
@@ -1 +1 @@
-Subproject commit ecfabf9d7aa0c20c48fed29fb39ad029748ff77c
+Subproject commit 6bdefd147256d6a72827ac6225fc5e36bd92a801