summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2025-02-28 23:19:31 +1100
committerDamien George <damien@micropython.org>2025-04-08 23:52:16 +1000
commita9384c71c50a7bc4aaae1f88ddee5ebacc56ba81 (patch)
tree941f3c4e777829cff8818f679bbd6e936406c7c9
parent0ee160e7c06ddc6641257d5ebb88d006e731a3aa (diff)
extmod/extmod.mk: Switch from drivers/cyw43/cywbt to lib/cyw43-drivers.
The cyw43-driver now provides the Bluetooth initialisation code, making `drivers/cyw43/cywbt.c` obsolete. To use the new code a port must enable the `CYW43_ENABLE_BLUETOOTH_OVER_UART` option. Some ports have yet to migrate to the new code, so in the meantime they can explicitly add the old source to their source list and continue to use it without change. Signed-off-by: Damien George <damien@micropython.org>
-rw-r--r--extmod/extmod.mk4
-rw-r--r--ports/mimxrt/Makefile1
-rw-r--r--ports/stm32/Makefile1
3 files changed, 3 insertions, 3 deletions
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index d2fe2acba..859f610c9 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -454,6 +454,7 @@ CYW43_DIR = lib/cyw43-driver
GIT_SUBMODULES += $(CYW43_DIR)
CFLAGS_EXTMOD += -DMICROPY_PY_NETWORK_CYW43=1
SRC_THIRDPARTY_C += $(addprefix $(CYW43_DIR)/src/,\
+ cyw43_bthci_uart.c \
cyw43_ctrl.c \
cyw43_lwip.c \
cyw43_ll.c \
@@ -461,9 +462,6 @@ SRC_THIRDPARTY_C += $(addprefix $(CYW43_DIR)/src/,\
cyw43_spi.c \
cyw43_stats.c \
)
-ifeq ($(MICROPY_PY_BLUETOOTH),1)
-DRIVERS_SRC_C += drivers/cyw43/cywbt.c
-endif
$(BUILD)/$(CYW43_DIR)/src/cyw43_%.o: CFLAGS += -std=c11
endif # MICROPY_PY_NETWORK_CYW43
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 8106ab4f3..5c5429502 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -280,6 +280,7 @@ endif
ifeq ($(MICROPY_PY_BLUETOOTH),1)
SRC_C += mpbthciport.c
+DRIVERS_SRC_C += drivers/cyw43/cywbt.c
endif # MICROPY_PY_BLUETOOTH
ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 8ac9a8af0..c938dcbda 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -432,6 +432,7 @@ endif
ifeq ($(MICROPY_PY_BLUETOOTH),1)
SRC_C += mpbthciport.c
+DRIVERS_SRC_C += drivers/cyw43/cywbt.c
ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
SRC_C += mpnimbleport.c