Merge branch 'adafruit:8.2.x' into 8.2.x

Author: tirtharajsinha

.gitmodules

@@ -144,9 +144,6 @@
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
 	branch = release/v4.4-circuitpython
-[submodule "ports/espressif/certificates/nina-fw"]
-	path = lib/certificates/nina-fw
-	url = https://github.com/adafruit/nina-fw.git
 [submodule "frozen/Adafruit_CircuitPython_ST7789"]
 	path = frozen/Adafruit_CircuitPython_ST7789
 	url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789
@@ -341,3 +338,6 @@
 [submodule "frozen/Adafruit_CircuitPython_Wave"]
 	path = frozen/Adafruit_CircuitPython_Wave
 	url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
+[submodule "lib/certificates"]
+	path = lib/certificates
+	url = https://github.com/adafruit/certificates

lib/certificates

@@ -10,9 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
-# No I2S on SAMD51G
-CIRCUITPY_AUDIOBUSIO = 0
-
 CIRCUITPY_FULL_BUILD = 0
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOCORE = 0

lib/certificates/README.md

@@ -1,5 +1,5 @@
 #define MICROPY_HW_BOARD_NAME "CP32-M4"
-#define MICROPY_HW_MCU_NAME "samd51j20"
+#define MICROPY_HW_MCU_NAME "samd51j20A"
 
 #define MICROPY_HW_APA102_MOSI   (&pin_PA12)
 #define MICROPY_HW_APA102_SCK    (&pin_PA13)

lib/certificates/nina-fw

@@ -9,6 +9,3 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q128JVxM"
 LONGINT_IMPL = MPZ
-
-# No I2S on SAMD51G.
-CIRCUITPY_AUDIOBUSIO = 0

lib/protomatter

@@ -10,7 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
-# No I2S on SAMD51G
-CIRCUITPY_AUDIOBUSIO = 0
-
 CIRCUITPY_BITBANG_APA102 = 1

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

@@ -11,9 +11,6 @@ CIRCUITPY_FULL_BUILD = 0
 
 LONGINT_IMPL = MPZ
 
-# No I2S on SAMD51G
-CIRCUITPY_AUDIOBUSIO = 0
-
 CIRCUITPY_BITBANG_APA102 = 1
 # Override optimization to keep binary small
 OPTIMIZATION_FLAGS = -Os