@@ -59,18 +59,14 @@ HAL_DIR=hal/$(MCU_SERIES)
59
59
60
60
ifeq ($(CIRCUITPY_CYW43 ) ,1)
61
61
INC_CYW43 := \
62
- -isystem sdk/ lib/cyw43-driver/firmware \
63
- -isystem sdk/ lib/cyw43-driver/src \
64
- -isystem sdk/ lib/lwip/src/include \
62
+ -isystem lib/cyw43-driver/firmware \
63
+ -isystem lib/cyw43-driver/src \
64
+ -isystem lib/lwip/src/include \
65
65
-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
66
66
-isystem sdk/src/rp2_common/pico_lwip/include/ \
67
67
68
- CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25
68
+ CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DCYW43_LOGIC_DEBUG=0
69
69
SRC_SDK_CYW43 := \
70
- lib/cyw43-driver/src/cyw43_ctrl.c \
71
- lib/cyw43-driver/src/cyw43_ll.c \
72
- lib/cyw43-driver/src/cyw43_lwip.c \
73
- lib/cyw43-driver/src/cyw43_stats.c \
74
70
src/common/pico_sync/sem.c \
75
71
src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c \
76
72
src/rp2_common/pico_cyw43_arch/cyw43_arch.c \
@@ -80,33 +76,38 @@ SRC_SDK_CYW43 := \
80
76
81
77
SRC_LWIP := \
82
78
shared/netutils/netutils.c \
83
- $(wildcard sdk/ lib/lwip/src/core/* .c) \
84
- $(wildcard sdk/ lib/lwip/src/core/ipv4/* .c) \
85
- sdk/ lib/lwip/src/netif/ethernet.c \
79
+ $(wildcard lib/lwip/src/core/* .c) \
80
+ $(wildcard lib/lwip/src/core/ipv4/* .c) \
81
+ lib/lwip/src/netif/ethernet.c \
86
82
$(wildcard lwip_src/* .c) \
87
83
88
- SRC_CYW43 := $(wildcard bindings/cyw43/* .c)
84
+ SRC_CYW43 := \
85
+ $(wildcard bindings/cyw43/* .c) \
86
+ lib/cyw43-driver/src/cyw43_stats.c \
87
+ lib/cyw43-driver/src/cyw43_ctrl.c \
88
+ lib/cyw43-driver/src/cyw43_ll.c \
89
+ lib/cyw43-driver/src/cyw43_lwip.c \
89
90
90
- PIOASM = $(BUILD ) /sdk /pioasm/pioasm
91
+ PIOASM = $(BUILD ) /pioasm /pioasm/pioasm
91
92
.PHONY : PioasmBuild
92
93
PioasmBuild : $(PIOASM )
93
94
$(PIOASM ) :
94
- $(Q ) cmake -S sdk -B $(BUILD ) /sdk
95
- $(Q ) make -C $(BUILD ) /sdk PioasmBuild
95
+ $(Q ) cmake -S pioasm -B $(BUILD ) /pioasm
96
+ $(Q )$( MAKE ) -C $(BUILD ) /pioasm PioasmBuild
96
97
97
98
$(BUILD ) /cyw43_bus_pio_spi.pio.h : sdk/src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.pio $(PIOASM )
98
99
$(Q )$(PIOASM ) -o c-sdk $< $@
99
100
$(BUILD ) /sdk/src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.o : $(BUILD ) /cyw43_bus_pio_spi.pio.h
100
101
101
102
CYW43_FIRMWARE_BIN = 43439A0-7.95.49.00.combined
102
103
103
- $(BUILD ) /cyw43_resource.o : sdk/ lib/cyw43-driver/firmware/$(CYW43_FIRMWARE_BIN )
104
+ $(BUILD ) /cyw43_resource.o : lib/cyw43-driver/firmware/$(CYW43_FIRMWARE_BIN )
104
105
$(Q )$(OBJCOPY ) -I binary -O elf32-littlearm -B arm \
105
106
--readonly-text \
106
107
--rename-section .data=.big_const,contents,alloc,load,readonly,data \
107
- --redefine-sym _binary_sdk_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_start =fw_43439A0_7_95_49_00_start \
108
- --redefine-sym _binary_sdk_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_size =fw_43439A0_7_95_49_00_size \
109
- --redefine-sym _binary_sdk_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_end =fw_43439A0_7_95_49_00_end \
108
+ --redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_start =fw_43439A0_7_95_49_00_start \
109
+ --redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_size =fw_43439A0_7_95_49_00_size \
110
+ --redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_end =fw_43439A0_7_95_49_00_end \
110
111
$< $@
111
112
OBJ_CYW43 := $(BUILD ) /cyw43_resource.o
112
113
# need to do the equivalent of this in cmake
@@ -270,7 +271,7 @@ SRC_SDK := \
270
271
$(SRC_SDK_CYW43 ) \
271
272
272
273
SRC_SDK := $(addprefix sdk/, $(SRC_SDK ) )
273
- $(patsubst % .c,$(BUILD ) /% .o,$(SRC_SDK ) ) : CFLAGS += -Wno-missing-prototypes -Wno-undef
274
+ $(patsubst % .c,$(BUILD ) /% .o,$(SRC_SDK ) $( SRC_CYW43 ) ) : CFLAGS += -Wno-missing-prototypes -Wno-undef
274
275
275
276
SRC_C += \
276
277
boards/$(BOARD ) /board.c \
0 commit comments