diff options
| author | Dan Halbert <halbert@halwitz.org> | 2020-04-21 17:47:51 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2020-04-21 17:47:51 -0400 |
| commit | 77cd93ac2d8ebce240055caf81f1b6bdd7c9bfcc (patch) | |
| tree | 3425ef969688971abedb3095e73e2e56b2da66b5 /ports/nrf/mpconfigport.mk | |
| parent | 38ec3bc57476c6fde45cd7d722370a5408fd8e10 (diff) | |
| parent | 51dbe9109fb6a474fe7f4cf4e3766e27ba0b34b5 (diff) | |
merge from adafruit
Diffstat (limited to 'ports/nrf/mpconfigport.mk')
| -rw-r--r-- | ports/nrf/mpconfigport.mk | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk index 186867fb0..5172d7496 100644 --- a/ports/nrf/mpconfigport.mk +++ b/ports/nrf/mpconfigport.mk @@ -52,10 +52,7 @@ endif CIRCUITPY_FREQUENCYIO = 0 ifndef CIRCUITPY_PROTOMATTER -CIRCUITPY_PROTOMATTER = 1 -endif - -ifndef CIRCUITPY_FRAMEBUFFERIO +CIRCUITPY_RGBMATRIX = 1 CIRCUITPY_FRAMEBUFFERIO = 1 endif @@ -81,4 +78,19 @@ 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 +MCU_VARIANT = nrf52 +MCU_SUB_VARIANT = nrf52833 + +SD ?= s140 +SOFTDEV_VERSION ?= 6.1.0 + +BOOT_SETTING_ADDR = 0x7F000 +NRF_DEFINES += -DNRF52833_XXAA -DNRF52833 + +endif endif |