samd: Update the variant scheme.

robert-hh · robert-hh · commit 0f18337e3620 · 2023-08-15T22:00:10.000+02:00
- Remove the query_variant tag from Makefile.
- Remove the definition of BOARD_VARIANTS.

- Use uppercase for board variants.
- Append the variant name to the build directory name.

Signed-off-by: robert-hh &lt;robert@hammelrath.com&gt;
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
@@ -13,7 +13,11 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+ifneq ($(BOARD_VARIANT),)
+BUILD ?= build-$(BOARD)-$(BOARD_VARIANT)
+else
 BUILD ?= build-$(BOARD)
+endif
 
 CROSS_COMPILE ?= arm-none-eabi-
 UF2CONV ?= $(TOP)/tools/uf2conv.py
@@ -194,9 +198,6 @@ OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(TINYUSB_SRC_C:.c=.o))
 
-query-variants:
-	$(ECHO) "VARIANTS:" $(BOARD_VARIANTS)
-
 all: $(BUILD)/firmware.uf2
 
 $(BUILD)/firmware.elf: $(OBJ)
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
@@ -15,7 +15,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": "Feather M4 Express",
     "thumbnail": "",
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
@@ -6,5 +6,3 @@ TEXT0 = 0x4000
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 MICROPY_HW_CODESIZE ?= 496K
-
-BOARD_VARIANTS += "wlan"
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.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
@@ -6,5 +6,3 @@ TEXT0 = 0x4000
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 MICROPY_HW_CODESIZE ?= 496K
-
-BOARD_VARIANTS += "wlan"
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
@@ -16,7 +16,7 @@
     ],
     "mcu": "samd51",
     "variants": {
-        "wlan": "WLAN using the on-board Airlift module"
+        "WLAN": "WLAN using the on-board Airlift module"
     },
     "product": "Metro M4 Express Airlift",
     "thumbnail": "",
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
@@ -14,7 +14,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": "Sparkfun SAMD51 Thing Plus",
     "thumbnail": "",
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk
@@ -6,4 +6,3 @@ TEXT0 = 0x4000
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 MICROPY_HW_CODESIZE ?= 1008K
-BOARD_VARIANTS += "wlan"
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -7,7 +7,7 @@ MICROPY_HW_CODESIZE ?= 368K
 MICROPY_VFS_LFS2 ?= 1
 MICROPY_VFS_FAT ?= 1
 
-ifeq ($(BOARD_VARIANT),wlan)
+ifeq ($(BOARD_VARIANT),WLAN)
 MICROPY_PY_NETWORK ?= 1
 MICROPY_PY_NETWORK_NINAW10 ?= 1
 ifeq ($(MICROPY_HW_CODESIZE),496K)
