Update pico-sdk to 1.5.1#8091
Conversation
|
We have an existing line of code that sets different flags for SDK files (including -Wno-undef) but it evidently is not being applied to this file. It may be because it is a ".S" file or for another reason I'm not aware of: 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-driverThis line is acting only on ".c" files listed in SRC_SDK, it would need to act on ".S" files as well. These are listed in SRC_C_UPPER. So it might be something like diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index f23da5a51d..9a7d1b69b7 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
+$(patsubst %.S,$(BUILD)/%.o,$(SRC_C_CUPPER) $(SRC_CYW43)): CFLAGS += -Wno-undef
SRC_C += \
boards/$(BOARD)/board.c \ |
|
Do we want to wait until after 8.2 to do this? |
|
If that is the case, |
|
It now builds, but I saw some instability in wifi connection code (I once got a |
Yes, we should wait. |
| -Isdk_config \ | ||
| -I../../lib/tinyusb/src \ | ||
| -I../../supervisor/shared/usb \ | ||
| -I../bindings/cyw43/__init__.h \ |
There was a problem hiding this comment.
This line is surprising. -I arguments are usually to directories that exist, but I don't think this path exists and if it did it'd be a file rather than a directory. Can you just remove this line?
There was a problem hiding this comment.
[whoops, this and the other comment are outdated; I selected "cancel review" but didn't realize it'd still post these comments]
|
|
||
| # Remove -Wno-stringop-overflow after we can test with CI's GCC 10. Mac's looks weird. | ||
| DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-cast-align | ||
| DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-cast-align -Wno-undef |
There was a problem hiding this comment.
We prefer to keep our code free of -Wundef diagnostics by leaving the flag as-is for most files. My comment suggested how to apply the -Wno-undef compiler flag only to files within the SDK. Did you try this?
There was a problem hiding this comment.
I went ahead and fixed this as I intended. The suggestion in my earlier comment had an error that was probably not easy to spot, so it wouldn't have worked as-is.
|
Ah I see that @bill88t encountered problems when testing with an earlier build of this PR. I did no testing on hardware. So, we should probably have another round of testing before this is considered merge-worthy. |
|
Oh I forgot this existed. I will look into it tomorrow. |
|
Thanks, let us know what you find in this round of testing! |
4 participants
I am primarily looking at:
cyw43_arch_disable_sta_mode()cyw43_arch_disable_ap_mode()Just note, I have yet to test it.
I will let you know once I have tested everything.