Skip to content

Commit 4cce4fa

Browse files
authored
Merge pull request #10089 from Neradoc/neradoc-allow-override-bleio-espressif
Allow overriding CIRCUITPY_BLEIO on 4MB espressif boards
2 parents 6f938f8 + a618838 commit 4cce4fa

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

ports/espressif/mpconfigport.mk

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ CIRCUITPY_ANALOGBUFIO ?= 1
5555
CIRCUITPY_AUDIOBUSIO ?= 1
5656
CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
5757
CIRCUITPY_AUDIOIO ?= 0
58-
CIRCUITPY_BLEIO ?= 1
5958
CIRCUITPY_BLEIO_HCI = 0
6059
CIRCUITPY_CANIO ?= 1
6160
CIRCUITPY_COUNTIO ?= 1
@@ -264,7 +263,7 @@ CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
264263

265264
# No room for _bleio on boards with 4MB flash
266265
ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),4MB)
267-
CIRCUITPY_BLEIO = 0
266+
CIRCUITPY_BLEIO ?= 0
268267
endif
269268

270269
endif
@@ -288,7 +287,7 @@ else
288287
CIRCUITPY_ALARM = 0
289288
endif
290289
CIRCUITPY_DUALBANK = 1
291-
CIRCUITPY_BLEIO = 0
290+
CIRCUITPY_BLEIO ?= 0
292291
CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 0
293292
else
294293
CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 1
@@ -299,14 +298,17 @@ ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),2MB)
299298
CIRCUITPY_BITMAPFILTER ?= 0
300299
CIRCUITPY_DUALBANK = 0
301300
CIRCUITPY_AUDIOMP3 = 0
302-
CIRCUITPY_BLEIO = 0
301+
CIRCUITPY_BLEIO ?= 0
303302
endif
304303

305304
# No room for _eve on boards with 4MB flash
306305
ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),4MB)
307306
CIRCUITPY__EVE = 0
308307
endif
309308

309+
# default BLEIO after flash-size based defaults
310+
CIRCUITPY_BLEIO ?= 1
311+
310312
# Modules dependent on other modules
311313
CIRCUITPY_ESPNOW ?= $(CIRCUITPY_WIFI)
312314
CIRCUITPY_GIFIO ?= $(CIRCUITPY_DISPLAYIO)

0 commit comments

Comments
 (0)