diff options
| author | Daniel Pollard <daniel@learnweaver.com> | 2020-05-12 14:41:28 +1000 |
|---|---|---|
| committer | Daniel Pollard <daniel@learnweaver.com> | 2020-05-12 14:41:28 +1000 |
| commit | ee2cb703c83ff1c27675e98ce28f4cc49a33ebb9 (patch) | |
| tree | 989b08a0d3016ac63e254ae44fcb7385bf9fc020 /ports/nrf/mpconfigport.mk | |
| parent | e947e4eb580e080d37445240ec88610fc1787975 (diff) | |
| parent | 62b835ad7637c5336f210ab688289dc607bec661 (diff) | |
merged master
Diffstat (limited to 'ports/nrf/mpconfigport.mk')
| -rw-r--r-- | ports/nrf/mpconfigport.mk | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk index 7939a175b..a9ad11bd4 100644 --- a/ports/nrf/mpconfigport.mk +++ b/ports/nrf/mpconfigport.mk @@ -14,39 +14,21 @@ USB_SERIAL_NUMBER_LENGTH = 16 # All nRF ports have longints. LONGINT_IMPL = MPZ -# Audio via PWM -ifndef CIRCUITPY_AUDIOCORE -CIRCUITPY_AUDIOCORE = 1 -endif +# The ?='s allow overriding in mpconfigboard.mk. +# Audio via PWM CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOBUSIO ?= 1 +CIRCUITPY_AUDIOCORE ?= 1 +CIRCUITPY_AUDIOMIXER ?= 1 +CIRCUITPY_AUDIOPWMIO ?= 1 - -# The ifndef's allow overriding in mpconfigboard.mk. - -ifndef -CIRCUITPY_BLEIO = 1 -endif - -ifndef CIRCUITPY_AUDIOMIXER -CIRCUITPY_AUDIOMIXER = 1 -endif - -ifndef CIRCUITPY_AUDIOPWMIO -CIRCUITPY_AUDIOPWMIO = 1 -endif - -ifndef CIRCUITPY_AUDIOBUSIO -CIRCUITPY_AUDIOBUSIO = 1 -endif +CIRCUITPY_BLEIO ?= 1 # No I2CSlave implementation CIRCUITPY_I2CSLAVE = 0 -# enable RTC -ifndef CIRCUITPY_RTC -CIRCUITPY_RTC = 1 -endif +CIRCUITPY_RTC ?= 1 # frequencyio not yet implemented CIRCUITPY_FREQUENCYIO = 0 @@ -74,8 +56,6 @@ NRF_DEFINES += -DNRF52840_XXAA -DNRF52840 # Defined here because system_nrf52840.c doesn't #include any of our own include files. CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS -CIRCUITPY_ULAB = 1 - else ifeq ($(MCU_CHIP),nrf52833) MCU_SERIES = m4 |