Merge with main changes and removed from board

Author: gamblor21

ports/atmel-samd/boards/cp_sapling_m0_spiflash/mpconfigboard.mk

@@ -13,3 +13,4 @@ EXTERNAL_FLASH_DEVICES = AT25DF081A
 
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_ZLIB = 0

ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk

@@ -10,14 +10,15 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_AESIO = 0
+CIRCUITPY_ONEWIREIO = 0
+CIRCUITPY_PARALLELDISPLAY = 0
+CIRCUITPY_SDCARDIO = 0
+CIRCUITPY_SHARPDISPLAY = 0
+CIRCUITPY_TRACEBACK = 0
+CIRCUITPY_ZLIB=0
+
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-
-CIRCUITPY_SHARPDISPLAY=0
-CIRCUITPY_SDCARDIO=0
-CIRCUITPY_BLEIO_HCI=0
-CIRCUITPY_BLEIO=0
-CIRCUITPY_ZLIB=0

tests/unix/extra_coverage.py.exp

@@ -23,23 +23,27 @@ sts
 
 test
 tes
-RuntimeError: 
-RuntimeError: 
+RuntimeError:
+RuntimeError:
 # repl
 ame__
-mport 
+mport
 
-builtins        micropython     _thread         aesio
-array           binascii        bitmaptools     btree
-cexample        cmath           collections     cppexample
-displayio       errno           ffi             framebuf
-gc              gifio           hashlib         json
-math            qrio            rainbowio       re
-sys             termios         traceback       ubinascii
-uctypes         uerrno          uheapq          uio
-ujson           ulab            uos             urandom
-ure             uselect         ustruct         utime
-utimeq          uzlib           zlib
+builtins        micropython     _asyncio        _thread
+_uasyncio       aesio           array           binascii
+bitmaptools     btree           cexample        cmath
+collections     cppexample      displayio       errno
+ffi             framebuf        gc              gifio
+hashlib         json            math            qrio
+rainbowio       re              sys             termios
+traceback       ubinascii       uctypes         uerrno
+uheapq          uio             ujson           ulab
+ulab.fft        ulab.linalg     ulab.numpy      ulab.scipy
+ulab.scipy.linalg               ulab.scipy.optimize
+ulab.scipy.signal               ulab.scipy.special
+ulab.utils      uos             urandom         ure
+uselect         ustruct         utime           utimeq
+uzlib           zlib
 ime
 
 utime           utimeq
@@ -73,7 +77,7 @@ TypeError: unsupported types for __divmod__: 'str', 'str'
 2
 OverflowError: overflow converting long int to machine word
 OverflowError: overflow converting long int to machine word
-ValueError: 
+ValueError:
 Warning: test
 # format float
 ?
@@ -95,8 +99,8 @@ unlocked
 1
 2
 3
-KeyboardInterrupt: 
-KeyboardInterrupt: 
+KeyboardInterrupt:
+KeyboardInterrupt:
 10
 # ringbuf
 99 0