Merge branch 'Q' of github.com:Coldcard/q1firmware into Q

This commit is contained in:
Peter D. Gray 2024-04-22 09:52:52 -04:00
commit aa452f5578
No known key found for this signature in database
GPG Key ID: A2DCD558C2BE5D7C

View File

@ -1,8 +1,8 @@
diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index 971f2f81a..b175c4dc7 100644
index 971f2f81a..0c25a11e0 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -17,7 +17,7 @@ INC += -I$(BUILD)
@@ -17,7 +17,8 @@ INC += -I$(BUILD)
INC += -I$(TOP)
# compiler settings
@ -13,16 +13,16 @@ index 971f2f81a..b175c4dc7 100644
CFLAGS = $(INC) $(CWARN) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
CFLAGS += -fdata-sections -ffunction-sections -fno-asynchronous-unwind-tables
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 6a936a242..6b4900561 100644
index 6a936a242..43e6bf02a 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -38,7 +38,7 @@ INC += -I$(TOP)
@@ -38,7 +38,8 @@ INC += -I$(TOP)
INC += -I$(BUILD)
# compiler settings
-CWARN = -Wall -Werror
+CWARN = -Wall -Werror -Wno-error=unused-but-set-variable -Wno-error=array-bounds
+CWARN += -Wno-error=unknown-warning-option
+CWARN += -Wno-error=unknown-warning-option -Wno-error=deprecated-non-prototype -Wno-error=bitwise-instead-of-logical
CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)