Skip to content

Commit f5b4014

Browse files
committed
Remove CYW43_LWIP=1 from the platform-build.py
The build flag CYW43_LWIP is set to zero when building the arduinopico framework. But when building the SCSI DaynaPORT emulator firmware the Python build script was setting it to 1. This meant the cyw43_state struct had a different definition between the arduinopico static library and firmware build. Causing the cy43_state.mac memory address to be different between the library and the firmware. The solution taken was to comment out the offending lines in the platform-build.py script.
1 parent 35d697d commit f5b4014

8 files changed

+5
-6
lines changed

lib/libpico.a

13.4 KB
Binary file not shown.

lib/libpicow-ipv6-btc-ble.a

3.11 KB
Binary file not shown.

lib/libpicow-ipv6-nobtc-noble.a

-8.34 KB
Binary file not shown.

lib/libpicow-noipv6-btc-ble.a

7.78 KB
Binary file not shown.

lib/libpicow-noipv6-nobtc-noble.a

-3.88 KB
Binary file not shown.

lib/platform_wrap.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@
203203
-Wl,--wrap=raw_sendto
204204
-Wl,--wrap=raw_remove
205205

206-
-Wl,--wrap=cyw43_cb_process_ethernet
207-
-Wl,--wrap=cyw43_cb_tcpip_set_link_up
208-
-Wl,--wrap=cyw43_cb_tcpip_set_link_down
209206
-Wl,--wrap=cyw43_tcpip_link_status
210207
-Wl,--wrap=cyw43_cb_tcpip_init
211208
-Wl,--wrap=cyw43_cb_tcpip_deinit

tools/libpico/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ target_compile_definitions(common INTERFACE
2828
PICO_RP2040_B2_SUPPORTED=1
2929
PICO_NO_BINARY_INFO=1
3030
PICO_CYW43_ARCH_POLL=1
31-
CYW43_LWIP=1
31+
CYW43_LWIP=0
32+
CYW43_USE_OTP_MAC=0
3233
LWIP_IPV4=1
3334
LWIP_UDP=1
3435
LWIP_IGMP=1

tools/platformio-build.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,9 @@ def configure_usb_flags(cpp_defines):
257257

258258
def configure_network_flags(cpp_defines):
259259
env.Append(CPPDEFINES=[
260-
("PICO_CYW43_ARCH_THREADSAFE_BACKGROUND", 1),
261-
("CYW43_LWIP", 1),
260+
# These need to be removed for DaynaPORT emulators
261+
# ("PICO_CYW43_ARCH_THREADSAFE_BACKGROUND", 1),
262+
# ("CYW43_LWIP", 1),
262263
("LWIP_IPV4", 1),
263264
("LWIP_IGMP", 1),
264265
("LWIP_CHECKSUM_CTRL_PER_NETIF", 1)

0 commit comments

Comments
 (0)