regularize and shrink many builds

2021-05-05 12:35:41 -04:00 · 2021-05-05 12:35:41 -04:00 · c37f021791
commit c37f021791
parent fc8e1c4c2e
82 changed files with 70 additions and 767 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -238,7 +238,6 @@ jobs:
        - "feather_mimxrt1011"
        - "feather_mimxrt1062"
        - "feather_nrf52840_express"
-        - "feather_radiofruit_zigbee"
        - "feather_stm32f405_express"
        - "fluff_m0"
        - "gemma_m0"
--- a/frozen/Adafruit_CircuitPython_SimpleMath
+++ b/frozen/Adafruit_CircuitPython_SimpleMath
@ -1 +1 @@
-Subproject commit cdf99447307473080b2f2e95e7c3667247095ac0
+Subproject commit 5f382650e62e05cc72a67dbedce13d706d699621
--- a/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
@ -11,10 +11,6 @@ EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"

 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-CIRCUITPY_USB_MIDI = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0

 CIRCUITPY_GAMEPAD = 1
 CIRCUITPY_BUSDEVICE = 1
--- a/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk
@ -8,26 +8,15 @@ CHIP_FAMILY = samd21

 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-
-CIRCUITPY_ANALOGIO = 0
-CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 0
-CIRCUITPY_SAMD = 0
-CIRCUITPY_PS2IO = 0
-CIRCUITPY_PULSEIO = 0
-CIRCUITPY_PWMIO = 0
-CIRCUITPY_AUDIOCORE = 0
-CIRCUITPY_BUSIO = 0
-CIRCUITPY_STORAGE = 1
-
-CIRCUITPY_MATH = 1
-CIRCUITPY_PIXELBUF = 1
-CIRCUITPY_USB_MIDI = 1
-CIRCUITPY_TOUCHIO = 1
 CIRCUITPY_FULL_BUILD = 0

-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
+CIRCUITPY_ANALOGIO = 0
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_BUSIO = 0
+CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PWMIO = 0
+CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_RTC = 0

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
--- a/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/mpconfigboard.mk
@ -8,26 +8,17 @@ CHIP_FAMILY = samd21

 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-
-CIRCUITPY_ANALOGIO = 0
-CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 0
-CIRCUITPY_SAMD = 0
-CIRCUITPY_PS2IO = 0
-CIRCUITPY_PULSEIO = 0
-CIRCUITPY_PWMIO = 0
-CIRCUITPY_AUDIOCORE = 0
-CIRCUITPY_BUSIO = 1
-CIRCUITPY_STORAGE = 1
-
-CIRCUITPY_MATH = 1
-CIRCUITPY_PIXELBUF = 0
-CIRCUITPY_USB_MIDI = 1
-CIRCUITPY_TOUCHIO = 1
 CIRCUITPY_FULL_BUILD = 0

-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
+CIRCUITPY_ANALOGIO = 0
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_RTC = 0
+CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PWMIO = 0
+
+CIRCUITPY_PIXELBUF = 0
+CIRCUITPY_TOUCHIO = 1

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
--- a/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.mk
@ -8,26 +8,15 @@ CHIP_FAMILY = samd21

 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
+CIRCUITPY_FULL_BUILD = 0

 CIRCUITPY_ANALOGIO = 0
-CIRCUITPY_ROTARYIO = 1
 CIRCUITPY_RTC = 0
-CIRCUITPY_SAMD = 0
-CIRCUITPY_PS2IO = 0
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_PWMIO = 0
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_BUSIO = 0
-CIRCUITPY_STORAGE = 1
-
-CIRCUITPY_MATH = 0
-CIRCUITPY_PIXELBUF = 1
-CIRCUITPY_USB_MIDI = 1
 CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
--- a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.mk
@ -9,25 +9,14 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE

-CIRCUITPY_ANALOGIO = 1
+CIRCUITPY_FULL_BUILD = 0
+
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
-CIRCUITPY_SAMD = 0
-CIRCUITPY_PS2IO = 0
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_PWMIO = 0
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_BUSIO = 0
-CIRCUITPY_STORAGE = 1
-
-CIRCUITPY_MATH = 1
-CIRCUITPY_PIXELBUF = 1
-CIRCUITPY_USB_MIDI = 1
-CIRCUITPY_TOUCHIO = 1
-CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleMath
--- a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk
@ -9,16 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "MX25L51245G","GD25S512MD"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_VECTORIO = 0
-CIRCUITPY_BUSDEVICE = 0
-
-CFLAGS_INLINE_LIMIT = 60
-SUPEROPT_GC = 0
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
--- a/ports/atmel-samd/boards/blm_badge/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/blm_badge/mpconfigboard.mk
@ -14,11 +14,8 @@ CIRCUITPY_AUDIOIO = 1
 CIRCUITPY_AUDIOBUSIO = 1
 # Pins for I2SOut are not available.
 CIRCUITPY_AUDIOBUSIO_I2SOUT = 0
-CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PWMIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
-CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_HID = 1
 CIRCUITPY_USB_MIDI = 0
-
-SUPEROPT_GC = 0
--- a/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
@ -9,7 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_ROTARYIO = 0
-
-SUPEROPT_GC = 0
--- a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
@ -9,29 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_VECTORIO = 0
-CIRCUITPY_BUSDEVICE = 0
-MICROPY_PY_ASYNC_AWAIT = 0
-
-SUPEROPT_GC = 0
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
-ifeq ($(TRANSLATION), ja)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), de_DE)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-SUPEROPT_VM = 0
-endif
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
@ -10,16 +10,13 @@ SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ

-# Make room for frozen libs.
-CIRCUITPY_BITMAPTOOLS = 0
+# Turn off displayio to make room for frozen libs.
 CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-MICROPY_PY_ASYNC_AWAIT = 0

-SUPEROPT_GC = 0
-CFLAGS_INLINE_LIMIT = 55
+# Now we actually have a lot of room. Put back some useful modules.
+CIRCUITPY_BITBANGIO = 1
+CIRCUITPY_COUNTIO = 1
+CIRCUITPY_BUSDEVICE = 1

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
@ -11,19 +11,9 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"

 # Turn off features and optimizations for Crickit build to make room for additional frozen libs.
 LONGINT_IMPL = NONE
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
+
+CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_PIXELBUF = 1
-CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
-

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
@ -9,23 +9,16 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"

-# Turn off features and optimizations for Crickit build to make room for additional frozen libs.
+# Turn off features and optimizations for displayio build to make room for additional frozen libs.
 LONGINT_IMPL = NONE
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
 CIRCUITPY_PIXELBUF = 0
-CIRCUITPY_RE = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
+CIRCUITPY_USB_MIDI = 0
+
 # So not all of displayio, sorry!
 CIRCUITPY_VECTORIO = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
+CIRCUITPY_BITMAPTOOLS = 0

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
--- a/ports/atmel-samd/boards/cp_sapling_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/cp_sapling_m0/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/cp_sapling_m0_revb/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/cp_sapling_m0_revb/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/cp_sapling_m0_spiflash/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/cp_sapling_m0_spiflash/mpconfigboard.mk
@ -13,21 +13,3 @@ EXTERNAL_FLASH_DEVICES = AT25DF081A

 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-
-SUPEROPT_GC = 0
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), de_DE)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-SUPEROPT_VM = 0
-endif
--- a/ports/atmel-samd/boards/datum_distance/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/datum_distance/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/datum_imu/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/datum_imu/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/datum_light/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/datum_light/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/datum_weather/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/datum_weather/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/dynalora_usb/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/dynalora_usb/mpconfigboard.mk
@ -10,28 +10,10 @@ SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q32C
 LONGINT_IMPL = MPZ

-CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FULL_BUILD = 0

-SUPEROPT_GC = 0
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), ja)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), de_DE)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-SUPEROPT_VM = 0
-endif
+CIRCUITPY_DISPLAYIO = 0
+CIRCUITPY_SDCARDIO = 1

 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM9x
--- a/ports/atmel-samd/boards/dynossat_edu_eps/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/dynossat_edu_eps/mpconfigboard.mk
@ -14,15 +14,6 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_FULLBUILD = 0
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_I2CPERIPHERAL = 1
-CIRCUITPY_VECTORIO = 0
 CIRCUITPY_BUSDEVICE = 0
-CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_ROTARYIO = 0
-
-CFLAGS_INLINE_LIMIT = 60
-
-SUPEROPT_GC = 0
--- a/ports/atmel-samd/boards/dynossat_edu_obc/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/dynossat_edu_obc/mpconfigboard.mk
@ -10,6 +10,3 @@ CHIP_FAMILY = samd51
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q32C"
 LONGINT_IMPL = MPZ
-
-CFLAGS_INLINE_LIMIT = 60
-SUPEROPT_GC = 0
--- a/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.mk
@ -9,7 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-CIRCUITPY_RTC = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
@ -9,15 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_VECTORIO = 0
-CIRCUITPY_BUSDEVICE = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
@ -11,14 +11,7 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ

 # Make space for frozen libs
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_GAMEPAD = 0
-CFLAGS_INLINE_LIMIT = 50
-CIRCUITPY_MSGPACK = 0

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit
--- a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
@ -13,20 +13,12 @@ CIRCUITPY_FULL_BUILD = 0
 # A number of modules are removed for RFM69 to make room for frozen libraries.
 # Many I/O functions are not available.
 CIRCUITPY_ANALOGIO = 1
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_PULSEIO = 0
-CIRCUITPY_NEOPIXEL_WRITE = 1
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
-CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_BUSDEVICE = 1
-CFLAGS_INLINE_LIMIT = 35
-
-# Make more room.
-SUPEROPT_GC = 0

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM69
--- a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
@ -14,20 +14,12 @@ CIRCUITPY_FULL_BUILD = 0
 # A number of modules are removed for RFM9x to make room for frozen libraries.
 # Many I/O functions are not available.
 CIRCUITPY_ANALOGIO = 1
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_PULSEIO = 0
-CIRCUITPY_NEOPIXEL_WRITE = 1
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
-CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_BUSDEVICE = 1

-CFLAGS_INLINE_LIMIT = 35
-# Make more room.
-SUPEROPT_GC = 0
-
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM9x
--- a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
@ -9,19 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL064L"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_BUSDEVICE = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-# supersized, not ultra-supersized
-CIRCUITPY_VECTORIO = 0
-
-CFLAGS_INLINE_LIMIT = 35
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
--- a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk
@ -10,5 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ

-CIRCUITPY_VECTORIO = 1
 CIRCUITPY_CANIO = 1
--- a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
@ -10,5 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ

-CIRCUITPY_VECTORIO = 1
 CIRCUITPY__EVE = 1
--- a/ports/atmel-samd/boards/feather_radiofruit_zigbee/board.c
+++ b/ports/atmel-samd/boards/feather_radiofruit_zigbee/board.c
@ -1,37 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "supervisor/board.h"
-
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
--- a/ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.h
+++ b/ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.h
@ -1,31 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "Adafruit Feather RadioFruit Zigbee"
-#define MICROPY_HW_MCU_NAME "samr21g18"
-
-#define MICROPY_HW_LED_STATUS   (&pin_PA27)
-#define MICROPY_HW_NEOPIXEL (&pin_PA22)
-
-#define SPI_FLASH_MOSI_PIN          &pin_PA31
-#define SPI_FLASH_MISO_PIN          &pin_PA30
-#define SPI_FLASH_SCK_PIN           &pin_PA17
-#define SPI_FLASH_CS_PIN            &pin_PA28
-
-// These are pins not to reset.
-#define MICROPY_PORT_A        (PORT_PA22)
-#define MICROPY_PORT_B        (0)
-#define MICROPY_PORT_C        (0)
-
-#define BOARD_HAS_CRYSTAL 1
-
-#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
-#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
-
-#define DEFAULT_SPI_BUS_SCK (&pin_PB23)
-#define DEFAULT_SPI_BUS_MOSI (&pin_PB22)
-#define DEFAULT_SPI_BUS_MISO (&pin_PA23)
-
-#define DEFAULT_UART_BUS_RX (&pin_PA09)
-#define DEFAULT_UART_BUS_TX (&pin_PA08)
-
-// USB is always used internally so skip the pin objects for it.
-#define IGNORE_PIN_PA24     1
-#define IGNORE_PIN_PA25     1
--- a/ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.mk
@ -1,39 +0,0 @@
-USB_VID = 0x239A
-USB_PID = 0x80D0
-USB_PRODUCT = "Feather RadioFruit Zigbee"
-USB_MANUFACTURER = "Adafruit Industries LLC"
-
-CHIP_VARIANT = SAMR21G18A
-CHIP_FAMILY = samd21
-
-SPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
-LONGINT_IMPL = MPZ
-
-# No I2S on SAMR21G
-CIRCUITPY_AUDIOBUSIO = 0
-# No DAC on SAMR21G
-CIRCUITPY_AUDIOIO = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_RTC = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-
-SUPEROPT_GC = 0
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), ja)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), de_DE)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-SUPEROPT_VM = 0
-endif
--- a/ports/atmel-samd/boards/feather_radiofruit_zigbee/pins.c
+++ b/ports/atmel-samd/boards/feather_radiofruit_zigbee/pins.c
@ -1,45 +0,0 @@
-#include "shared-bindings/board/__init__.h"
-
-STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PB02) },
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB03) },
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA04) },
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA05) },
-    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA06) },
-    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA07) },
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB23) },
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB22) },
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA23) },
-    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA09) },
-    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA09) },
-    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA08) },
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA08) },
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12) },
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13) },
-    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA14) },
-    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA15) },
-    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA16) },
-    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) },
-    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA19) },
-    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA22) },
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA22) },
-    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA27) },
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
-    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
-    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
-
-    // Internally connected within the package
-    { MP_ROM_QSTR(MP_QSTR_DIG3), MP_ROM_PTR(&pin_PA10) },
-    { MP_ROM_QSTR(MP_QSTR_DIG4), MP_ROM_PTR(&pin_PA11) },
-    { MP_ROM_QSTR(MP_QSTR_SLP_TR), MP_ROM_PTR(&pin_PA20) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ), MP_ROM_PTR(&pin_PB00) },
-    { MP_ROM_QSTR(MP_QSTR_DIG1), MP_ROM_PTR(&pin_PA16) },
-    { MP_ROM_QSTR(MP_QSTR_DIG2), MP_ROM_PTR(&pin_PA17) },
-    { MP_ROM_QSTR(MP_QSTR_RF_MOSI), MP_ROM_PTR(&pin_PB30) },
-    { MP_ROM_QSTR(MP_QSTR_SEL), MP_ROM_PTR(&pin_PB31) },
-    { MP_ROM_QSTR(MP_QSTR_CLKM), MP_ROM_PTR(&pin_PC16) },
-    { MP_ROM_QSTR(MP_QSTR_RF_SCK), MP_ROM_PTR(&pin_PC18) },
-    { MP_ROM_QSTR(MP_QSTR_RF_MISO), MP_ROM_PTR(&pin_PC19) },
-    { MP_ROM_QSTR(MP_QSTR_RESETN), MP_ROM_PTR(&pin_PB15) },
-};
-MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
--- a/ports/atmel-samd/boards/fluff_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/fluff_m0/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
@ -12,20 +12,7 @@ LONGINT_IMPL = NONE

 # To keep the build small
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_VECTORIO = 0
-
-CFLAGS_INLINE_LIMIT = 55
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
--- a/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk
@ -6,20 +6,6 @@ USB_MANUFACTURER = "Electronic Cats"
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21

-INTERNAL_FLASH_FILESYSTEM = 0
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_NEOPIXEL_WRITE = 0
-CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 0
-CIRCUITPY_USB_MIDI = 1
-CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
@ -11,33 +11,3 @@ EXTERNAL_FLASH_DEVICES = "W25Q16FW, GD25Q16C"
 LONGINT_IMPL = MPZ

 CIRCUITPY_BITBANG_APA102 = 1
-
-CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_RTC = 0
-# too itsy bitsy for all of displayio
-CIRCUITPY_VECTORIO = 0
-
-CFLAGS_INLINE_LIMIT = 60
-SUPEROPT_GC = 0
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
-ifeq ($(TRANSLATION), ja)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), de_DE)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-SUPEROPT_VM = 0
-endif
--- a/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
@ -9,9 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_RTC = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
@ -9,15 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_VECTORIO = 0
-CIRCUITPY_BUSDEVICE = 0
-MICROPY_PY_ASYNC_AWAIT = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/ndgarage_ndbit6/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ndgarage_ndbit6/mpconfigboard.mk
@ -10,6 +10,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/ndgarage_ndbit6_v2/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ndgarage_ndbit6_v2/mpconfigboard.mk
@ -10,6 +10,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/neopixel_trinkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/neopixel_trinkey_m0/mpconfigboard.mk
@ -9,25 +9,19 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE

+CIRCUITPY_FULL_BUILD = 0
+
 CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
-CIRCUITPY_SAMD = 0
-CIRCUITPY_PS2IO = 0
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_PWMIO = 0
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_BUSIO = 0
-CIRCUITPY_STORAGE = 1

-CIRCUITPY_MATH = 1
 CIRCUITPY_PIXELBUF = 1
 CIRCUITPY_USB_MIDI = 1
 CIRCUITPY_TOUCHIO = 1
-CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
--- a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
@ -11,15 +11,8 @@ LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0

 CIRCUITPY_PEW = 1
-CIRCUITPY_ANALOGIO = 1
-CIRCUITPY_MATH = 1
-CIRCUITPY_NEOPIXEL_WRITE = 1
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
-CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_MIDI = 0

-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-standalone-10.x
--- a/ports/atmel-samd/boards/picoplanet/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/picoplanet/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
@ -8,6 +8,7 @@ CHIP_FAMILY = samd21

 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
+CIRCUITPY_FULL_BUILD = 0

 # A number of modules are removed for pIRKey to make room for frozen libraries.
 # Many I/O functions are not available.
@ -15,16 +16,10 @@ LONGINT_IMPL = NONE
 CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_MATH = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
-CIRCUITPY_PULSEIO = 1
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
-CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_MIDI = 1
 CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0

 # Include these Python libraries in firmware.
 # FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
--- a/ports/atmel-samd/boards/pyruler/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pyruler/mpconfigboard.mk
@ -9,8 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_RTC = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/qtpy_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/qtpy_m0/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk
@ -6,19 +6,6 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21

-INTERNAL_FLASH_FILESYSTEM = 0
 LONGINT_IMPL = MPZ
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
-
-CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_VECTORIO = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/sam32/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sam32/mpconfigboard.mk
@ -9,8 +9,4 @@ CHIP_FAMILY = samd51
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ

-# No I2S on SAMD51
-CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_USTACK = 1
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
--- a/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk
@ -9,5 +9,3 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_VECTORIO = 1
--- a/ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/serpente/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/serpente/mpconfigboard.mk
@ -9,13 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q32C
 LONGINT_IMPL = NONE
-
-CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_BUSDEVICE = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_MSGPACK = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/shirtty/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/shirtty/mpconfigboard.mk
@ -9,8 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-CIRCUITPY_I2CPERIPHERAL = 1
-CIRCUITPY_TOUCHIO = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/silicognition-m4-shim/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/silicognition-m4-shim/mpconfigboard.mk
@ -9,5 +9,3 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_VECTORIO = 1
--- a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk
@ -9,30 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_VECTORIO = 0
-CIRCUITPY_BUSDEVICE = 0
-
-CFLAGS_INLINE_LIMIT = 60
-
-SUPEROPT_GC = 0
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), ja)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), de_DE)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-SUPEROPT_VM = 0
-endif
--- a/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.mk
@ -12,11 +12,5 @@ LONGINT_IMPL = MPZ

 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_BUSDEVICE = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_VECTORIO = 0

 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
-
-SUPEROPT_GC = 0
--- a/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/mpconfigboard.mk
@ -10,6 +10,3 @@ INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE

 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/mpconfigboard.mk
@ -11,4 +11,3 @@ EXTERNAL_FLASH_DEVICES = "W25Q32FV"
 LONGINT_IMPL = MPZ

 CIRCUITPY_FULL_BUILD = 0
-SUPEROPT_GC = 0
--- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
@ -9,30 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32FV"
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_VECTORIO = 0
-CIRCUITPY_BUSDEVICE = 0
-
-CFLAGS_INLINE_LIMIT = 60
-SUPEROPT_GC = 0
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
-ifeq ($(TRANSLATION), ja)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), de_DE)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-SUPEROPT_VM = 0
-endif
--- a/ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk
@ -9,17 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
 LONGINT_IMPL = MPZ
-
-
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_VECTORIO = 0
-CIRCUITPY_BUSDEVICE = 0
-MICROPY_PY_ASYNC_AWAIT = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk
@ -12,29 +12,3 @@ EXTERNAL_FLASH_DEVICES = AT25SF161
 LONGINT_IMPL = MPZ

 CIRCUITPY_BITBANG_APA102 = 1
-
-CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_RTC = 0
-CIRCUITPY_VECTORIO = 0
-
-CFLAGS_INLINE_LIMIT = 60
-SUPEROPT_GC = 0
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), ja)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), de_DE)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-SUPEROPT_VM = 0
-endif
--- a/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
@ -9,9 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
-
-# On this particular board, these save about 180 bytes. On other boards, they may -increase- space used.
-CFLAGS_BOARD = -fweb -frename-registers
--- a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
@ -9,19 +9,3 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = W25Q32BV
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_RTC = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-MICROPY_PY_ASYNC_AWAIT = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
-
-CFLAGS_INLINE_LIMIT = 35
-
-CFLAGS_BOARD = --param max-inline-insns-auto=15
--- a/ports/atmel-samd/boards/uchip/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/uchip/mpconfigboard.mk
@ -9,6 +9,3 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-
-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
--- a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
@ -34,5 +34,3 @@ CIRCUITPY_BUSDEVICE = 0
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/ugame10

 CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf
-
-SUPEROPT_GC = 0
--- a/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk
@ -8,11 +8,9 @@ CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21

 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-CIRCUITPY_FULL_BUILD = 0
+LONGINT_IMPL = NONE

-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
+CIRCUITPY_FULL_BUILD = 0

 # Make room for frozen libs.
 CIRCUITPY_FREQUENCYIO = 0
--- a/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
@ -8,24 +8,20 @@ CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21

 INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
+LONGINT_IMPL = NONE
+
 CIRCUITPY_FULL_BUILD = 0

-SUPEROPT_GC = 0
-SUPEROPT_VM = 0
-
 # Make room for frozen libs.
-CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_ANALOGIO=0
+CIRCUITPY_BUSDEVICE=1
 CIRCUITPY_NEOPIXEL_WRITE=0
 CIRCUITPY_PULSEIO=0
 CIRCUITPY_ROTARYIO=0
-CIRCUITPY_TOUCHIO_USE_NATIVE=0
 CIRCUITPY_TOUCHIO=0
 CIRCUITPY_USB_MIDI=0
 CIRCUITPY_RTC=0
-CIRCUITPY_COUNTIO=0
-CIRCUITPY_BUSDEVICE=1
+CIRCUITPY_SDCARDIO=1

 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@ -32,28 +32,33 @@ ifeq ($(CHIP_FAMILY),samd21)

 # The ?='s allow overriding in mpconfigboard.mk.

+# Some of these are on by default with CIRCUITPY_FULL_BUILD, but don't
+# fit in 256kB of flash
+
 CIRCUITPY_AUDIOMIXER ?= 0
 CIRCUITPY_BINASCII ?= 0
+CIRCUITPY_BITBANGIO ?= 0
+CIRCUITPY_BITMAPTOOLS ?= 0
+CIRCUITPY_BUSDEVICE ?= 0
 CIRCUITPY_AUDIOMP3 ?= 0
+CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_BUILTINS_POW3 ?= 0
 CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 1
-CIRCUITPY_FREQUENCYIO ?= 0
-CIRCUITPY_JSON ?= 0
-CIRCUITPY_SYNTHIO ?= 0
-CIRCUITPY_TOUCHIO_USE_NATIVE ?= 1
-
-# No room for HCI _bleio on SAMD21.
-CIRCUITPY_BLEIO_HCI = 0
-
-CIRCUITPY_SDCARDIO ?= 0
-
+CIRCUITPY_COUNTIO ?= 0
 # Not enough RAM for framebuffers
 CIRCUITPY_FRAMEBUFFERIO ?= 0
-
-# Not enough room in 192kB or 256kB builds for secondary CDC.
-CIRCUITPY_USB_CDC ?= 1
-
+CIRCUITPY_FREQUENCYIO ?= 0
+CIRCUITPY_I2CPERIPHERAL ?= 0
+CIRCUITPY_JSON ?= 0
+CIRCUITPY_MSGPACK ?= 0
+CIRCUITPY_RE ?= 0
+CIRCUITPY_SDCARDIO ?= 0
+CIRCUITPY_SYNTHIO ?= 0
+CIRCUITPY_TOUCHIO_USE_NATIVE ?= 1
 CIRCUITPY_ULAB = 0
+CIRCUITPY_VECTORIO = 0
+
+MICROPY_PY_ASYNC_AWAIT = 0

 ifeq ($(TRANSLATION), ja)
 RELEASE_NEEDS_CLEAN_BUILD = 1
@ -65,6 +70,14 @@ RELEASE_NEEDS_CLEAN_BUILD = 1
 CIRCUITPY_TERMINALIO = 0
 endif

+SUPEROPT_GC = 0
+SUPEROPT_VM = 0
+
+ifeq ($(CIRCUITPY_FULL_BUILD),0)
+# On the smallest boards, this saves about 180 bytes. On other boards, it may -increase- space used.
+CFLAGS_BOARD = -fweb -frename-registers
+endif
+
 endif # samd21
 ######################################################################