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

tannewt · web-flow · commit fd134df55281 · 2019-03-27T18:20:47.000-07:00
Turn on frequencyio only on CIRCUITPY_FULL_BUILD
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
 
