summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2019-11-22 16:30:10 -0500
committerDan Halbert <halbert@halwitz.org>2019-11-22 16:30:10 -0500
commit1ccb7b4c5e4706943f8ee721eb1880ecb337fecc (patch)
treea43583316c2ceb6deb341ec05cc49e8b1439bf02
parent13375d16f11d86f8c7c77e6be209d914d35b6372 (diff)
cosmetic commit, mostly to re-run
-rw-r--r--ports/atmel-samd/mpconfigport.mk2
-rw-r--r--ports/nrf/mpconfigport.mk2
2 files changed, 4 insertions, 0 deletions
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 895855006..df108664a 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -38,6 +38,8 @@ ifeq ($(CHIP_FAMILY),samd51)
# No native touchio on SAMD51.
CIRCUITPY_TOUCHIO_USE_NATIVE = 0
+# The ifndef's allow overriding in mpconfigboard.mk.
+
ifndef CIRCUITPY_NETWORK
CIRCUITPY_NETWORK = 1
MICROPY_PY_WIZNET5K = 5500
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index d070978b7..f61d9f8ea 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -17,6 +17,8 @@ endif
CIRCUITPY_AUDIOIO = 0
+# The ifndef's allow overriding in mpconfigboard.mk.
+
ifndef CIRCUITPY_AUDIOMIXER
CIRCUITPY_AUDIOMIXER = 1
endif