8000 Merge pull request #9878 from eightycc/bleio-build-fix · tannewt/circuitpython@c286fc4 · GitHub
[go: up one dir, main page]
Skip to content

Commit c286fc4

Browse files
dhalbertdhalbert
authored
Merge pull request micropython#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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 0 additions & 13 deletions
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

Lines changed: 1 addition & 14 deletions
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 ...) rem 10000 oves 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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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
Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 1 addition & 14 deletions
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

0 commit comments

Comments
 (0)
0