From a9384c71c50a7bc4aaae1f88ddee5ebacc56ba81 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 Feb 2025 23:19:31 +1100
Subject: [PATCH] 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>
---
 extmod/extmod.mk      | 4 +---
 ports/mimxrt/Makefile | 1 +
 ports/stm32/Makefile  | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index d2fe2acbad..859f610c90 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 8106ab4f3f..5c54295028 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 8ac9a8af03..c938dcbda7 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