Skip to content

Commit c286fc4

Browse files
dhalbertdhalbert
authored
Merge pull request #9878 from eightycc/bleio-build-fix
Allow Selection of _bleio by Board, Fixup CIRCUITPY_BLEIO Flags
2 parents ea91e38 + ed3ccfd commit c286fc4

File tree

32 files changed

+121
-208
lines changed

32 files changed

+121
-208
lines changed

‎docs/shared_bindings_matrix.py

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666

6767
ADDITIONAL_MODULES = {
6868
"_asyncio": "MICROPY_PY_ASYNCIO",
69+
"_bleio (native)": "CIRCUITPY_BLEIO_NATIVE",
70+
"_bleio (HCI co-processor)": "CIRCUITPY_BLEIO_HCI",
6971
"_eve": "CIRCUITPY__EVE",
7072
"adafruit_bus_device": "CIRCUITPY_BUSDEVICE",
7173
"adafruit_pixelbuf": "CIRCUITPY_PIXELBUF",

‎ports/analog/Makefile

-13
Original file line numberDiff line numberDiff line change
@@ -228,19 +228,6 @@ endif
228228
# QSTR sources are provided for the initial build step, which generates
229229
# Python constants to represent C data which gets passed into the GC.
230230

231-
SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
232-
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
233-
$(addprefix common-hal/, $(SRC_COMMON_HAL))
234-
235-
SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
236-
$(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
237-
$(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
238-
239-
# There are duplicates between SRC_COMMON_HAL_EXPANDED and SRC_SHARED_MODULE_EXPANDED,
240-
# because a few modules have files both in common-hal/ and shared-module/.
241-
# Doing a $(sort ...) removes duplicates as part of sorting.
242-
SRC_COMMON_HAL_SHARED_MODULE_EXPANDED = $(sort $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED))
243-
244231
# OBJ includes
245232
OBJ += $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
246233
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))

‎ports/atmel-samd/Makefile

+1-14
Original file line numberDiff line numberDiff line change
@@ -308,19 +308,6 @@ ifeq ($(CIRCUITPY_AUDIOBUSIO),1)
308308
SRC_C += peripherals/samd/i2s.c peripherals/samd/$(PERIPHERALS_CHIP_FAMILY)/i2s.c
309309
endif
310310

311-
SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
312-
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
313-
$(addprefix common-hal/, $(SRC_COMMON_HAL))
314-
315-
SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
316-
$(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
317-
$(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
318-
319-
# There may be duplicates between SRC_COMMON_HAL_EXPANDED and SRC_SHARED_MODULE_EXPANDED,
320-
# because a few modules have files both in common-hal/ and shared-module/.
321-
# Doing a $(sort ...) removes duplicates as part of sorting.
322-
SRC_COMMON_HAL_SHARED_MODULE_EXPANDED = $(sort $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED))
323-
324311
SRC_S = supervisor/$(CHIP_FAMILY)_cpu.s
325312

326313
OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
@@ -343,7 +330,7 @@ OBJ_EXTRA_ORDER_DEPS += $(HEADER_BUILD)/candata.h
343330
$(HEADER_BUILD)/candata.h: tools/mkcandata.py | $(HEADER_BUILD)
344331
$(Q)$(PYTHON) $< > $@
345332

346-
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) $(SRC_CIRCUITPY_COMMON)
333+
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED) $(SRC_CIRCUITPY_COMMON)
347334
# Sources that only hold QSTRs after pre-processing.
348335
SRC_QSTR_PREPROCESSOR += peripherals/samd/$(PERIPHERALS_CHIP_FAMILY)/clocks.c
349336

‎ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ CIRCUITPY_BITBANG_APA102 = 0
4141
CIRCUITPY_BITBANGIO = 0
4242
CIRCUITPY_BITMAPFILTER = 0
4343
CIRCUITPY_BITMAPTOOLS = 0
44-
CIRCUITPY_BLEIO = 0
44+
CIRCUITPY_BLEIO_HCI = 0
45+
CIRCUITPY_BLEIO_NATIVE = 0
4546
CIRCUITPY_BUSDEVICE = 0
4647
CIRCUITPY_FRAMEBUFFERIO = 0
4748
CIRCUITPY_FREQUENCYIO = 0

‎ports/atmel-samd/boards/pycubed/mpconfigboard.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ CIRCUITPY_FRAMEBUFFERIO = 0
2727
CIRCUITPY_KEYPAD = 0
2828
CIRCUITPY_RGBMATRIX = 0
2929
CIRCUITPY_PS2IO = 0
30-
CIRCUITPY_BLEIO_HCI=0
31-
CIRCUITPY_BLEIO=0
30+
CIRCUITPY_BLEIO_HCI = 0
31+
CIRCUITPY_BLEIO_NATIVE = 0
3232

3333
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
3434
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register

‎ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ CIRCUITPY_FRAMEBUFFERIO = 0
2727
CIRCUITPY_KEYPAD = 0
2828
CIRCUITPY_RGBMATRIX = 0
2929
CIRCUITPY_PS2IO = 0
30-
CIRCUITPY_BLEIO_HCI=0
31-
CIRCUITPY_BLEIO=0
30+
CIRCUITPY_BLEIO_HCI = 0
31+
CIRCUITPY_BLEIO_NATIVE = 0
3232

3333
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
3434
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register

‎ports/atmel-samd/boards/pycubed_mram_v05/mpconfigboard.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ CIRCUITPY_FRAMEBUFFERIO = 0
2727
CIRCUITPY_KEYPAD = 0
2828
CIRCUITPY_RGBMATRIX = 0
2929
CIRCUITPY_PS2IO = 0
30-
CIRCUITPY_BLEIO_HCI=0
31-
CIRCUITPY_BLEIO=0
30+
CIRCUITPY_BLEIO_HCI = 0
31+
CIRCUITPY_BLEIO_NATIVE = 0
3232

3333
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
3434
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register

‎ports/atmel-samd/boards/pycubed_v05/mpconfigboard.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ CIRCUITPY_FRAMEBUFFERIO = 0
2828
CIRCUITPY_KEYPAD = 0
2929
CIRCUITPY_RGBMATRIX = 0
3030
CIRCUITPY_PS2IO = 0
31-
CIRCUITPY_BLEIO_HCI=0
32-
CIRCUITPY_BLEIO=0
31+
CIRCUITPY_BLEIO_HCI = 0
32+
CIRCUITPY_BLEIO_NATIVE = 0
3333

3434
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
3535
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register

‎ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ CIRCUITPY_BITMAPTOOLS = 0
2121
CIRCUITPY_FRAMEBUFFERIO = 0
2222
CIRCUITPY_FREQUENCYIO = 0
2323
CIRCUITPY_AUDIOBUSIO = 0
24-
CIRCUITPY_BLEIO = 0
24+
CIRCUITPY_BLEIO_HCI = 0
25+
CIRCUITPY_BLEIO_NATIVE = 0
2526
CIRCUITPY_DISPLAYIO = 0
2627
CIRCUITPY_KEYPAD = 0
2728
CIRCUITPY_I2CTARGET = 0

‎ports/broadcom/Makefile

+1-14
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,6 @@ SRC_C += bindings/videocore/__init__.c \
5959

6060
SRC_S = peripherals/broadcom/boot$(SUFFIX).s
6161

62-
SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
63-
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
64-
$(addprefix common-hal/, $(SRC_COMMON_HAL))
65-
66-
SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
67-
$(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
68-
$(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
69-
70-
# There may be duplicates between SRC_COMMON_HAL_EXPANDED and SRC_SHARED_MODULE_EXPANDED,
71-
# because a few modules have files both in common-hal/ and shared-modules/.
72-
# Doing a $(sort ...) removes duplicates as part of sorting.
73-
SRC_COMMON_HAL_SHARED_MODULE_EXPANDED = $(sort $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED))
74-
7562
OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
7663
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))
7764
ifeq ($(INTERNAL_LIBM),1)
@@ -112,7 +99,7 @@ CFLAGS += $(INC) -Wall -Werror -std=gnu11 $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $
11299

113100
$(BUILD)/lib/tlsf/tlsf.o: CFLAGS += -Wno-cast-align
114101

115-
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) $(SRC_CIRCUITPY_COMMON)
102+
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED) $(SRC_CIRCUITPY_COMMON)
116103

117104
LDFLAGS += $(CFLAGS) -T peripherals/broadcom/link$(SUFFIX).ld -Wl,--gc-sections -Wl,-Map=$@.map # -Wl,--cref
118105

‎ports/cxd56/Makefile

+2-11
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,6 @@ LDFLAGS = \
110110

111111
CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_CXD56 -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_TUD_CDC_RX_BUFSIZE=1024 -DCFG_TUD_MIDI_TX_BUFSIZE=512 -DCFG_TUD_CDC_TX_BUFSIZE=1024 -DCFG_TUD_MSC_BUFSIZE=512 $(CFLAGS_MOD)
112112

113-
SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
114-
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
115-
$(addprefix common-hal/, $(SRC_COMMON_HAL))
116-
117-
SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
118-
$(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
119-
$(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
120-
121113
SRC_S = supervisor/cpu.s
122114

123115
SRC_C += \
@@ -129,16 +121,15 @@ SRC_C += \
129121

130122
OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
131123
OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
132-
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o))
133-
OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED_MODULE_EXPANDED:.c=.o))
124+
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))
134125
ifeq ($(INTERNAL_LIBM),1)
135126
OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
136127
endif
137128
OBJ += $(addprefix $(BUILD)/, $(SRC_CIRCUITPY_COMMON:.c=.o))
138129
OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
139130

140131
# List of sources for qstr extraction
141-
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) $(SRC_CIRCUITPY_COMMON)
132+
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED) $(SRC_CIRCUITPY_COMMON)
142133
# Sources that only hold QSTRs after pre-processing.
143134
SRC_QSTR_PREPROCESSOR +=
144135

‎ports/espressif/Makefile

+5-16
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ ifneq ($(CIRCUITPY_AUDIOBUSIO),0)
406406
CHIP_COMPONENTS += esp_driver_i2s
407407
endif
408408

409-
ifneq ($(CIRCUITPY_BLEIO),0)
409+
ifneq ($(CIRCUITPY_BLEIO_NATIVE),0)
410410
SRC_C += common-hal/_bleio/ble_events.c
411411
endif
412412

@@ -471,24 +471,13 @@ ifneq ($(CIRCUITPY_FREQUENCYIO),0)
471471
CHIP_COMPONENTS += esp_driver_pcnt
472472
endif
473473

474-
SRC_COMMON_HAL_EXPANDED = \
475-
$(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
476-
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
477-
$(addprefix common-hal/, $(SRC_COMMON_HAL))
478-
479-
SRC_SHARED_MODULE_EXPANDED = \
480-
$(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
481-
$(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
482-
$(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
483-
484474
ifneq ($(FROZEN_MPY_DIR),)
485475
FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py')
486476
FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
487477
endif
488478

489479
OBJ += $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
490-
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o))
491-
OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED_MODULE_EXPANDED:.c=.o))
480+
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))
492481
ifeq ($(INTERNAL_LIBM),1)
493482
OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
494483
endif
@@ -501,7 +490,7 @@ $(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os
501490
$(BUILD)/lib/protomatter/src/core.o: CFLAGS += -DESP32
502491

503492
# List of sources for qstr extraction
504-
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) $(SRC_CIRCUITPY_COMMON)
493+
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED) $(SRC_CIRCUITPY_COMMON)
505494

506495
# IDF build commands
507496
IDF_PATH = $(realpath ./esp-idf)
@@ -547,7 +536,7 @@ else
547536
endif
548537

549538
SDKCONFIGS := esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SIZE_SDKCONFIG);$(FLASH_MODE_SDKCONFIG);$(FLASH_SPEED_SDKCONFIG);$(PSRAM_SDKCONFIG);$(PSRAM_SIZE_SDKCONFIG);$(PSRAM_MODE_SDKCONFIG);$(PSRAM_SPEED_SDKCONFIG);$(TARGET_SDKCONFIG);boards/$(BOARD)/sdkconfig
550-
ifneq ($(CIRCUITPY_BLEIO),0)
539+
ifneq ($(CIRCUITPY_BLEIO_NATIVE),0)
551540
SDKCONFIGS := esp-idf-config/sdkconfig-ble.defaults;$(SDKCONFIGS)
552541
endif
553542
# create the config headers
@@ -607,7 +596,7 @@ ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) $(CHIP_COMPONENTS) app_update bootl
607596
ifneq ($(CIRCUITPY_WIFI),0)
608597
ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant esp_phy
609598
endif
610-
ifneq ($(CIRCUITPY_BLEIO),0)
599+
ifneq ($(CIRCUITPY_BLEIO_NATIVE),0)
611600
BLE_IMPL_esp32 := esp32
612601
BLE_IMPL_esp32s3 := esp32c3
613602
BLE_IMPL_esp32c2 := libble

‎ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_BLEIO = 0
10+
CIRCUITPY_BLEIO_NATIVE = 0
1111
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/adafruit_mini_sparkle_motion/mpconfigboard.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_BLEIO = 0
10+
CIRCUITPY_BLEIO_NATIVE = 0
1111
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/adafruit_sparkle_motion/mpconfigboard.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_BLEIO = 0
10+
CIRCUITPY_BLEIO_NATIVE = 0
1111
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 8MB
99

10-
CIRCUITPY_BLEIO = 0
10+
CIRCUITPY_BLEIO_NATIVE = 0
1111
CIRCUITPY_ESPCAMERA = 0
1212

1313
# Include these Python libraries in firmware

‎ports/espressif/mpconfigport.mk

+8-8
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ else ifeq ($(IDF_TARGET),esp32p4)
211211

212212
# No wifi
213213
# TODO: Support ESP32-C6 coprocessor on some boards.
214-
CIRCUITPY_BLEIO = 0
214+
CIRCUITPY_BLEIO_NATIVE = 0
215215
CIRCUITPY_WIFI = 0
216216
CIRCUITPY_SSL = 0
217217

@@ -248,7 +248,7 @@ else ifeq ($(IDF_TARGET),esp32s2)
248248
CIRCUITPY_ALARM_TOUCH = 1
249249
CIRCUITPY_AUDIOIO = 1
250250
# No BLE in hw
251-
CIRCUITPY_BLEIO = 0
251+
CIRCUITPY_BLEIO_NATIVE = 0
252252

253253
# No SDMMC
254254
CIRCUITPY_SDIOIO = 0
@@ -263,7 +263,7 @@ CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
263263

264264
# No room for _bleio on boards with 4MB flash
265265
ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),4MB)
266-
CIRCUITPY_BLEIO ?= 0
266+
CIRCUITPY_BLEIO_NATIVE ?= 0
267267
endif
268268

269269
endif
@@ -287,7 +287,7 @@ else
287287
CIRCUITPY_ALARM = 0
288288
endif
289289
CIRCUITPY_DUALBANK = 1
290-
CIRCUITPY_BLEIO ?= 0
290+
CIRCUITPY_BLEIO_NATIVE ?= 0
291291
CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 0
292292
else
293293
CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 1
@@ -298,7 +298,7 @@ ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),2MB)
298298
CIRCUITPY_BITMAPFILTER ?= 0
299299
CIRCUITPY_DUALBANK = 0
300300
CIRCUITPY_AUDIOMP3 = 0
301-
CIRCUITPY_BLEIO ?= 0
301+
CIRCUITPY_BLEIO_NATIVE ?= 0
302302
endif
303303

304304
# No room for _eve on boards with 4MB flash
@@ -307,16 +307,16 @@ CIRCUITPY__EVE = 0
307307
endif
308308

309309
# default BLEIO after flash-size based defaults
310-
CIRCUITPY_BLEIO ?= 1
310+
CIRCUITPY_BLEIO_NATIVE ?= 1
311311

312312
# Modules dependent on other modules
313313
CIRCUITPY_ESPNOW ?= $(CIRCUITPY_WIFI)
314314
CIRCUITPY_GIFIO ?= $(CIRCUITPY_DISPLAYIO)
315315
CIRCUITPY_JPEGIO ?= $(CIRCUITPY_DISPLAYIO)
316316
CIRCUITPY_QRIO ?= $(CIRCUITPY_ESPCAMERA)
317317

318-
CIRCUITPY_BLE_FILE_SERVICE ?= $(CIRCUITPY_BLEIO)
319-
CIRCUITPY_SERIAL_BLE ?= $(CIRCUITPY_BLEIO)
318+
CIRCUITPY_BLE_FILE_SERVICE ?= $(CIRCUITPY_BLEIO_NATIVE)
319+
CIRCUITPY_SERIAL_BLE ?= $(CIRCUITPY_BLEIO_NATIVE)
320320

321321
# Features dependent on other features
322322
ifneq ($(CIRCUITPY_USB_DEVICE),0)

‎ports/espressif/supervisor/port.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#include "peripherals/touch.h"
4848
#endif
4949

50-
#if CIRCUITPY_BLEIO
50+
#if CIRCUITPY_BLEIO_NATIVE
5151
#include "shared-bindings/_bleio/__init__.h"
5252
#endif
5353

‎ports/espressif/tools/update_sdkconfig.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def update(debug, board, update_all): # noqa: C901: too complex
191191
psram_freq = value
192192
elif key == "UF2_BOOTLOADER":
193193
uf2_bootloader = not (value == "0")
194-
elif key == "CIRCUITPY_BLEIO":
194+
elif key == "CIRCUITPY_BLEIO_NATIVE":
195195
ble_enabled = not (value == "0")
196196

197197
os.environ["IDF_TARGET"] = target

‎ports/litex/Makefile

+2-11
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,6 @@ endif
8080
SRC_S = \
8181
crt0-vexriscv.S
8282

83-
SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
84-
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
85-
$(addprefix common-hal/, $(SRC_COMMON_HAL))
86-
87-
SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
88-
$(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
89-
$(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
90-
9183
$(BUILD)/lib/tlsf/tlsf.o: CFLAGS += -Wno-cast-align
9284

9385
ifneq ($(FROZEN_MPY_DIR),)
@@ -96,8 +88,7 @@ FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
9688
endif
9789

9890
OBJ += $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
99-
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o))
100-
OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED_MODULE_EXPANDED:.c=.o))
91+
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))
10192
ifeq ($(INTERNAL_LIBM),1)
10293
OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
10394
endif
@@ -109,7 +100,7 @@ $(BUILD)/$(FATFS_DIR)/ff.o: COPT += -Os
109100
$(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os
110101

111102
# List of sources for qstr extraction
112-
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) $(SRC_CIRCUITPY_COMMON)
103+
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED) $(SRC_CIRCUITPY_COMMON)
113104
# Sources that only hold QSTRs after pre-processing.
114105
SRC_QSTR_PREPROCESSOR +=
115106

0 commit comments

Comments
 (0)