mimxrt: Remove duplicate code in Makefile and main.c.

robert-hh · robert-hh · commit db843d772ce1 · 2023-11-13T19:54:52.000+01:00
Which were added through combining several branches.

Signed-off-by: robert-hh &lt;robert@hammelrath.com&gt;
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
@@ -89,14 +89,6 @@ INC += -I$(TOP)/lib/tinyusb/src
 INC += -I.
 INC += -Ihal
 
-ifeq ($(MICROPY_PY_BLUETOOTH),1)
-INC += \
-    -I$(TOP)/extmod/nimble \
-    -I$(TOP)/lib/mynewt-nimble/nimble/host/include \
-    -I$(TOP)/lib/mynewt-nimble/nimble/include \
-    -I$(TOP)/lib/mynewt-nimble/porting/nimble/include
-endif
-
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
 ifeq ($(MICROPY_PY_LWIP),1)
 INC += -Ilwip_inc
@@ -247,13 +239,6 @@ SRC_C += \
 	ticks.c \
 	tusb_port.c \
 
-ifeq ($(MICROPY_PY_BLUETOOTH),1)
-SRC_C += \
-	drivers/ninaw10/nina_bt_hci.c \
-    mpbthciport.c \
-    mpnimbleport.c
-endif
-
 SHARED_SRC_C += \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
@@ -305,14 +290,6 @@ else
     SRC_HAL_C += hal/$(FLEXSPI_FLASH_TYPE)_config.c
 endif
 
-ifeq ($(MICROPY_PY_BLUETOOTH),1)
-SRC_C += mpbthciport.c
-endif # MICROPY_PY_BLUETOOTH
-
-ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
-SRC_C += mpnimbleport.c
-endif
-
 # Math library source files
 ifeq ($(MICROPY_FLOAT_IMPL),double)
     LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
@@ -55,10 +55,6 @@
 
 #include "systick.h"
 #include "extmod/modnetwork.h"
-#if MICROPY_PY_BLUETOOTH
-#include "extmod/modbluetooth.h"
-#include "mpbthciport.h"
-#endif
 
 extern uint8_t _sstack, _estack, _gc_heap_start, _gc_heap_end;
 
@@ -70,10 +66,6 @@ int main(void) {
     tusb_init();
     pendsv_init();
 
-    #if MICROPY_PY_BLUETOOTH
-    mp_bluetooth_hci_init();
-    #endif
-
     #if MICROPY_PY_LWIP
     // lwIP doesn't allow to reinitialise itself by subsequent calls to this function
     // because the system timeout list (next_timeout) is only ever reset by BSS clearing.
@@ -84,10 +76,6 @@ int main(void) {
     #endif
     #endif
 
-    #if MICROPY_PY_BLUETOOTH
-    mp_bluetooth_hci_init();
-    #endif
-
     #if MICROPY_PY_NETWORK_CYW43
     {
         cyw43_init(&cyw43_state);
