Merge pull request #1720 from dhalbert/frequencyio-full-builds

Turn on frequencyio only on CIRCUITPY_FULL_BUILD

21 files changed, 7 insertions, 37 deletions

diff --git a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
index b1b127ced..bafb8a96c 100644
--- a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
index 0e6fb612e..b6df8d6e2 100644
--- a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
index 26f771b50..af953e8c2 100644
--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk b/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
index 3059eb704..bb567ddd4 100644
--- a/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
index 0b9995583..26e3b7d4d 100644
--- a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
index a469dcf1d..102cb656f 100644
--- a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
index 03a89f5f5..301e7419f 100644
--- a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
@@ -11,5 +11,3 @@ LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
index 16696297d..ce3f8668c 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
index 39fdc591d..282977338 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk b/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
index d44f2feb9..9f4a9fe83 100644
--- a/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk b/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
index 3547235dd..a620f2919 100644
--- a/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
index 5104b601b..4ed26e6b2 100644
--- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
@@ -12,5 +12,3 @@ LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
index 92f8cff52..983e48e21 100644
--- a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
@@ -20,4 +20,3 @@ CIRCUITPY_RTC = 0
 CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_SMALL_BUILD = 1
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
index 58af499e8..017510be8 100644
--- a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
@@ -17,7 +17,6 @@ CIRCUITPY_RTC = 0
 CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_SMALL_BUILD = 1
-CIRCUITPY_FREQUENCYIO = 0
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk
index ec627b523..c0238ce80 100644
--- a/ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
index 8d2f35a69..462e3e2ca 100644
--- a/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
index b3448cf49..1c6f6db05 100644
--- a/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
index 5975ad1ba..c9c196da7 100644
--- a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
@@ -11,5 +11,3 @@ LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/boards/uchip/mpconfigboard.mk b/ports/atmel-samd/boards/uchip/mpconfigboard.mk
index 53b8c2771..bd05152a2 100644
--- a/ports/atmel-samd/boards/uchip/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/uchip/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
 
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
-
-CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index bb5e222f0..66ee92e6b 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -14,6 +14,12 @@ ifeq ($(LONGINT_IMPL),LONGLONG)
 MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
 endif
 
+# Put samd21-only choices here.
+ifeq ($(CHIP_FAMILY),samd21)
+# frequencyio not yet verified as working on SAMD21.
+CIRCUITPY_FRQUENCYIO = 0
+endif
+
 # Put samd51-only choices here.
 ifeq ($(CHIP_FAMILY),samd51)
 CIRCUITPY_SAMD = 1
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 0df6fff06..8ea72f0bf 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -93,7 +93,7 @@ endif
 CFLAGS += -DCIRCUITPY_DISPLAYIO=$(CIRCUITPY_DISPLAYIO)
 
 ifndef CIRCUITPY_FREQUENCYIO
-CIRCUITPY_FREQUENCYIO = 1
+CIRCUITPY_FREQUENCYIO = $(CIRCUITPY_FULL_BUILD)
 endif
 CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO)