Skip to content

Commit 241d7e2

Browse files
committed
change many ifndefs to ?=
1 parent f307851 commit 241d7e2

File tree

2 files changed

+61
-185
lines changed

2 files changed

+61
-185
lines changed

ports/nrf/mpconfigport.mk

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,21 @@ USB_SERIAL_NUMBER_LENGTH = 16
1414
# All nRF ports have longints.
1515
LONGINT_IMPL = MPZ
1616

17-
# Audio via PWM
18-
ifndef CIRCUITPY_AUDIOCORE
19-
CIRCUITPY_AUDIOCORE = 1
20-
endif
17+
# The ?='s allow overriding in mpconfigboard.mk.
2118

19+
# Audio via PWM
2220
CIRCUITPY_AUDIOIO = 0
21+
CIRCUITPY_AUDIOBUSIO ?= 1
22+
CIRCUITPY_AUDIOCORE ?= 1
23+
CIRCUITPY_AUDIOMIXER ?= 1
24+
CIRCUITPY_AUDIOPWMIO ?= 1
2325

24-
25-
# The ifndef's allow overriding in mpconfigboard.mk.
26-
27-
ifndef CIRCUITPY_BLEIO
28-
CIRCUITPY_BLEIO = 1
29-
endif
30-
31-
ifndef CIRCUITPY_AUDIOMIXER
32-
CIRCUITPY_AUDIOMIXER = 1
33-
endif
34-
35-
ifndef CIRCUITPY_AUDIOPWMIO
36-
CIRCUITPY_AUDIOPWMIO = 1
37-
endif
38-
39-
ifndef CIRCUITPY_AUDIOBUSIO
40-
CIRCUITPY_AUDIOBUSIO = 1
41-
endif
26+
CIRCUITPY_BLEIO ?= 1
4227

4328
# No I2CSlave implementation
4429
CIRCUITPY_I2CSLAVE = 0
4530

46-
# enable RTC
47-
ifndef CIRCUITPY_RTC
48-
CIRCUITPY_RTC = 1
49-
endif
31+
CIRCUITPY_RTC ?= 1
5032

5133
# frequencyio not yet implemented
5234
CIRCUITPY_FREQUENCYIO = 0
@@ -72,8 +54,6 @@ NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
7254
# Defined here because system_nrf52840.c doesn't #include any of our own include files.
7355
CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS
7456

75-
CIRCUITPY_ULAB = 1
76-
7757
else
7858
ifeq ($(MCU_CHIP),nrf52833)
7959
MCU_SERIES = m4

0 commit comments

Comments
 (0)