diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index 4ae03bff52..2e5d69dabf 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -236,6 +236,7 @@ SRC_SDK := \
 
 SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
 $(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare -Wno-unused-variable -Wno-strict-overflow -Ilib/cyw43-driver
+$(BUILD)/sdk/src/rp2_common/pico_standard_link/crt0.o: CFLAGS += -Wno-undef
 
 SRC_C += \
 	boards/$(BOARD)/board.c \
diff --git a/ports/raspberrypi/lib/cyw43-driver b/ports/raspberrypi/lib/cyw43-driver
index e52dd14a15..8ef38a6d32 160000
--- a/ports/raspberrypi/lib/cyw43-driver
+++ b/ports/raspberrypi/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit e52dd14a15e6a53e6263840704470246aa77c5ce
+Subproject commit 8ef38a6d32c54f850bff8f189bdca19ded33792a
diff --git a/ports/raspberrypi/sdk b/ports/raspberrypi/sdk
index 2ccab115de..6a7db34ff6 160000
--- a/ports/raspberrypi/sdk
+++ b/ports/raspberrypi/sdk
@@ -1 +1 @@
-Subproject commit 2ccab115de0d42d31d6611cca19ef0cd0d2ccaa7
+Subproject commit 6a7db34ff63345a7badec79ebea3aaef1712f374