diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index 7f6844a14..90763ac85 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -780,7 +780,7 @@ obj_program = []
 obj_program.extend(env.Object(source=SOURCE_MOD))
 obj_program.extend(env.Object(source=SOURCE_MOD_CRYPTO, CCFLAGS='$CCFLAGS -ftrivial-auto-var-init=zero'))
 if FEATURE_FLAGS["SECP256K1_ZKP"]:
-    obj_program.extend(env.Object(source=SOURCE_MOD_SECP256K1_ZKP, CCFLAGS='$CCFLAGS -Wno-unused-function -Wno-maybe-uninitialized'))
+    obj_program.extend(env.Object(source=SOURCE_MOD_SECP256K1_ZKP, CCFLAGS='$CCFLAGS -Wno-unused-function'))
     source_files.extend(SOURCE_MOD_SECP256K1_ZKP)
 obj_program.extend(env.Object(source=SOURCE_FIRMWARE))
 obj_program.extend(env.Object(source=SOURCE_MICROPYTHON))
diff --git a/core/SConscript.unix b/core/SConscript.unix
index 288ddcbba..d51ab2836 100644
--- a/core/SConscript.unix
+++ b/core/SConscript.unix
@@ -825,7 +825,7 @@ source_files = SOURCE_MOD + SOURCE_MOD_CRYPTO + SOURCE_MICROPYTHON + SOURCE_UNIX
 obj_program.extend(env.Object(source=SOURCE_MOD))
 obj_program.extend(env.Object(source=SOURCE_MOD_CRYPTO, CCFLAGS='$CCFLAGS -ftrivial-auto-var-init=zero'))
 if FEATURE_FLAGS["SECP256K1_ZKP"]:
-    obj_program.extend(env.Object(source=SOURCE_MOD_SECP256K1_ZKP, CCFLAGS='$CCFLAGS -Wno-unused-function -Wno-maybe-uninitialized'))
+    obj_program.extend(env.Object(source=SOURCE_MOD_SECP256K1_ZKP, CCFLAGS='$CCFLAGS -Wno-unused-function'))
     source_files.extend(SOURCE_MOD_SECP256K1_ZKP)
 obj_program.extend(env.Object(source=SOURCE_MICROPYTHON))
 obj_program.extend(env.Object(source=SOURCE_UNIX))
diff --git a/vendor/secp256k1-zkp b/vendor/secp256k1-zkp
index 346a053d4..f8c1b0e0e 160000
--- a/vendor/secp256k1-zkp
+++ b/vendor/secp256k1-zkp
@@ -1 +1 @@
-Subproject commit 346a053d4c442e08191f075c3932d03140579d47
+Subproject commit f8c1b0e0e665d81be9074d9702d97ef209cca32d