samd/WLAN: Add/update WLAN definitions for more boards.

robert-hh · robert-hh · commit ddc7ef3121cb · 2023-10-06T08:35:52.000+02:00
Including:

ADAFRUIT_FEATHER_M4_EXPRESS
ADAFRUIT_ITSYBITSY_M4_EXPRESS
SPARKFUN_SAMD51_THING_PLUS
ADAFRUIT_METRO_M4_EXPRESS

Always build the Metro M4 board with WLAN, drop the variant for this
board.

Pin definitions are added as well for:

ADAFRUIT_FEATHER_M0_EXPRESS
ADAFRUIT_ITSYBITSY_M0_EXPRESS

which can support basic WLAN.

Signed-off-by: robert-hh &lt;robert@hammelrath.com&gt;
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
@@ -5,3 +5,14 @@
 
 #define MICROPY_HW_SPIFLASH (1)
 #define MICROPY_HW_SPIFLASH_ID (2)
+
+#define MICROPY_HW_WIFI_SPI_ID     (4)
+#define MICROPY_HW_WIFI_SPI_BAUDRATE (8000000)
+
+#define MICROPY_HW_WIFI_SPI_MOSI   (42)
+#define MICROPY_HW_WIFI_SPI_MISO   (12)
+#define MICROPY_HW_WIFI_SPI_SCK    (43)
+
+#define MICROPY_HW_NINA_CS         (17)
+#define MICROPY_HW_NINA_ACK        (16)
+#define MICROPY_HW_NINA_RESET      (19)
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
@@ -14,6 +14,9 @@
         "feather_m4_express.jpg"
     ],
     "mcu": "samd51",
+    "variants": {
+        "WLAN": "WiFi support using a ESP32 module with NINA firmware"
+    },
     "product": "Feather M4 Express",
     "thumbnail": "",
     "url": "https://www.adafruit.com/product/3857",
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
@@ -5,3 +5,14 @@
 #define MICROPY_HW_MCU_OSC32KULP    (1)
 
 #define MICROPY_HW_QSPIFLASH        GD25Q16C
+
+#define MICROPY_HW_WIFI_SPI_ID     (1)
+#define MICROPY_HW_WIFI_SPI_BAUDRATE (8000000)
+
+#define MICROPY_HW_WIFI_SPI_MOSI   (55)
+#define MICROPY_HW_WIFI_SPI_MISO   (54)
+#define MICROPY_HW_WIFI_SPI_SCK    (17)
+
+#define MICROPY_HW_NINA_ACK        (21)
+#define MICROPY_HW_NINA_CS         (23)
+#define MICROPY_HW_NINA_RESET      (22)
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
@@ -5,3 +5,14 @@
 
 #define MICROPY_HW_SPIFLASH         (1)
 #define MICROPY_HW_SPIFLASH_ID      (5)
+
+#define MICROPY_HW_WIFI_SPI_ID     (4)
+#define MICROPY_HW_WIFI_SPI_BAUDRATE (8000000)
+
+#define MICROPY_HW_WIFI_SPI_MOSI   (42)
+#define MICROPY_HW_WIFI_SPI_MISO   (12)
+#define MICROPY_HW_WIFI_SPI_SCK    (43)
+
+#define MICROPY_HW_NINA_CS         (17)
+#define MICROPY_HW_NINA_ACK        (16)
+#define MICROPY_HW_NINA_RESET      (19)
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
@@ -13,7 +13,7 @@
     ],
     "mcu": "samd51",
     "variants": {
-        "wlan": "WiFi support using a ESP32 module with NINA firmware"
+        "WLAN": "WiFi support using a ESP32 module with NINA firmware"
     },
     "product": "ItsyBitsy M4 Express",
     "thumbnail": "",
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
@@ -4,3 +4,15 @@
 #define MICROPY_HW_DFLL_USB_SYNC    (1)
 
 #define MICROPY_HW_QSPIFLASH        GD25Q16C
+#define MICROPY_HW_DFLL_USB_SYNC   (1)
+
+#define MICROPY_HW_WIFI_SPI_ID     (1)
+#define MICROPY_HW_WIFI_SPI_BAUDRATE (8000000)
+
+#define MICROPY_HW_WIFI_SPI_MOSI   (0)
+#define MICROPY_HW_WIFI_SPI_MISO   (55)
+#define MICROPY_HW_WIFI_SPI_SCK    (1)
+
+#define MICROPY_HW_NINA_CS         (22)
+#define MICROPY_HW_NINA_ACK        (21)
+#define MICROPY_HW_NINA_RESET      (23)
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
@@ -15,9 +15,6 @@
         "metro_m4_express_airlift.jpg"
     ],
     "mcu": "samd51",
-    "variants": {
-        "wlan": "WLAN without SSL support"
-    },
     "product": "Metro M4 Express Airlift",
     "thumbnail": "",
     "url": "https://www.adafruit.com/product/4000",
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk
@@ -4,7 +4,9 @@ LD_FILES = boards/samd51x19a.ld sections.ld
 TEXT0 = 0x4000
 
 # MicroPython settings
-MICROPY_PY_NETWORK ?= 1
-MICROPY_PY_NETWORK_NINAW10 ?= 1
+MICROPY_PY_NETWORK = 1
+MICROPY_PY_NETWORK_NINAW10 = 1
+MICROPY_PY_SSL = 1
+MICROPY_SSL_MBEDTLS = 1
 
-MICROPY_HW_CODESIZE ?= 496K
+MICROPY_HW_CODESIZE = 496K
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
@@ -13,6 +13,9 @@
         "sparkfun_samd51_thing_plus.jpg"
     ],
     "mcu": "samd51",
+    "variants": {
+        "WLAN": "WiFi support using a ESP32 module with NINA firmware"
+    },
     "product": "Sparkfun SAMD51 Thing Plus",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/14713",
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
@@ -13,3 +13,14 @@
 // the board's external flash.
 #define MICROPY_HW_SPIFLASH         (1)
 #define MICROPY_HW_SPIFLASH_ID      (0)
+
+#define MICROPY_HW_WIFI_SPI_ID     (4)
+#define MICROPY_HW_WIFI_SPI_BAUDRATE (8000000)
+
+#define MICROPY_HW_WIFI_SPI_MOSI   (44)
+#define MICROPY_HW_WIFI_SPI_MISO   (43)
+#define MICROPY_HW_WIFI_SPI_SCK    (45)
+
+#define MICROPY_HW_NINA_ACK        (16)
+#define MICROPY_HW_NINA_CS         (17)
+#define MICROPY_HW_NINA_RESET      (19)
