diff --git a/ports/cc3200/boards/WIPY/board.json b/ports/cc3200/boards/WIPY/board.json
index 4a5a81f99ff2c..f615953af7b80 100644
--- a/ports/cc3200/boards/WIPY/board.json
+++ b/ports/cc3200/boards/WIPY/board.json
@@ -10,7 +10,6 @@
         "WiFi",
         "microSD"
     ],
-    "id": "wipy",
     "images": [
         "wipy.jpg"
     ],
diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 4e29e96109457..94047a0482d28 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.12)
 
 # Set the board if it's not already set.
 if(NOT MICROPY_BOARD)
-    set(MICROPY_BOARD GENERIC)
+    set(MICROPY_BOARD ESP32_GENERIC)
 endif()
 
 # Set the board directory and check that it exists.
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 239618c6f73ae..bf275ffe661a5 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -8,17 +8,25 @@ ifdef BOARD_DIR
 # the path as the board name.
 BOARD ?= $(notdir $(BOARD_DIR:/=))
 else
-# If not given on the command line, then default to GENERIC.
-BOARD ?= GENERIC
+# If not given on the command line, then default to ESP32_GENERIC.
+BOARD ?= ESP32_GENERIC
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
 ifeq ($(wildcard $(BOARD_DIR)/.),)
+ifeq ($(findstring boards/GENERIC,$(BOARD_DIR)),boards/GENERIC)
+$(warning The GENERIC* boards have been renamed to ESP32_GENERIC*)
+endif
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
-# If the build directory is not given, make it reflect the board name.
+# If the build directory is not given, make it reflect the board name (and
+# optionally the board variant).
+ifneq ($(BOARD_VARIANT),)
+BUILD ?= build-$(BOARD)-$(BOARD_VARIANT)
+else
 BUILD ?= build-$(BOARD)
+endif
 
 # Device serial settings.
 PORT ?= /dev/ttyUSB0
diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 2d5b05b9266ac..169de4073bf71 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -93,7 +93,7 @@ $ make submodules
 $ make
 ```
 
-This will produce a combined `firmware.bin` image in the `build-GENERIC/`
+This will produce a combined `firmware.bin` image in the `build-ESP32_GENERIC/`
 subdirectory (this firmware image is made up of: bootloader.bin, partitions.bin
 and micropython.bin).
 
@@ -123,12 +123,12 @@ To flash the MicroPython firmware to your ESP32 use:
 $ make deploy
 ```
 
-The default ESP32 board build by the above commands is the `GENERIC` one, which
-should work on most ESP32 modules.  You can specify a different board by passing
-`BOARD=<board>` to the make commands, for example:
+The default ESP32 board build by the above commands is the `ESP32_GENERIC`
+one, which should work on most ESP32 modules.  You can specify a different
+board by passing `BOARD=<board>` to the make commands, for example:
 
 ```bash
-$ make BOARD=GENERIC_SPIRAM
+$ make BOARD=ESP32_GENERIC_S3
 ```
 
 Note: the above "make" commands are thin wrappers for the underlying `idf.py`
@@ -137,10 +137,25 @@ for example:
 
 ```bash
 $ idf.py build
-$ idf.py -D MICROPY_BOARD=GENERIC_SPIRAM build
+$ idf.py -D MICROPY_BOARD=ESP32_GENERIC build
 $ idf.py flash
 ```
 
+Some boards also support "variants", which are allow for small variations of
+an otherwise similar board. For example different flash sizes or features. For
+example to build the `OTA` variant of `ESP32_GENERIC`.
+
+```bash
+$ make BOARD=ESP32_GENERIC BOARD_VARIANT=OTA
+```
+
+or to enable octal-SPIRAM support for the `ESP32_GENERIC_S3` board:
+
+```bash
+$ make BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM_OCT
+```
+
+
 Getting a Python prompt on the device
 -------------------------------------
 
@@ -202,10 +217,10 @@ antenna = machine.Pin(16, machine.Pin.OUT, value=0)
 Defining a custom ESP32 board
 -----------------------------
 
-The default ESP-IDF configuration settings are provided by the `GENERIC`
-board definition in the directory `boards/GENERIC`. For a custom configuration
+The default ESP-IDF configuration settings are provided by the `ESP32_GENERIC`
+board definition in the directory `boards/ESP32_GENERIC`. For a custom configuration
 you can define your own board directory.  Start a new board configuration by
-copying an existing one (like `GENERIC`) and modifying it to suit your board.
+copying an existing one (like `ESP32_GENERIC`) and modifying it to suit your board.
 
 MicroPython specific configuration values are defined in the board-specific
 `mpconfigboard.h` file, which is included by `mpconfigport.h`.  Additional
diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/ESP32_GENERIC/board.json
similarity index 64%
rename from ports/esp32/boards/GENERIC/board.json
rename to ports/esp32/boards/ESP32_GENERIC/board.json
index d08fcfec157ab..0db38c25d3640 100644
--- a/ports/esp32/boards/GENERIC/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC/board.json
@@ -8,7 +8,6 @@
         "External Flash",
         "WiFi"
     ],
-    "id": "esp32",
     "images": [
         "esp32_devkitc.jpg"
     ],
@@ -17,11 +16,11 @@
     "thumbnail": "",
     "url": "https://www.espressif.com/en/products/modules",
     "variants": {
-        "idf3": "Compiled with IDF 3.x",
-        "d2wd": "ESP32 D2WD",
-        "spiram": "Support for SPIRAM / WROVER",
-        "unicore": "ESP32 Unicore",
-        "ota": "Support for OTA"
+        "IDF3": "Compiled with IDF 3.x",
+        "D2WD": "ESP32 D2WD",
+        "SPIRAM": "Support for SPIRAM / WROVER",
+        "UNICORE": "ESP32 Unicore",
+        "OTA": "Support for OTA"
     },
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/GENERIC/board.md b/ports/esp32/boards/ESP32_GENERIC/board.md
similarity index 100%
rename from ports/esp32/boards/GENERIC/board.md
rename to ports/esp32/boards/ESP32_GENERIC/board.md
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
similarity index 71%
rename from ports/esp32/boards/GENERIC/mpconfigboard.cmake
rename to ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
index 29096c27689c2..74cb591c0711a 100644
--- a/ports/esp32/boards/GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
@@ -3,10 +3,10 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
 )
 
-if(MICROPY_BOARD_VARIANT STREQUAL "d2wd")
+if(MICROPY_BOARD_VARIANT STREQUAL "D2WD")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
-        boards/GENERIC/sdkconfig.d2wd
+        boards/ESP32_GENERIC/sdkconfig.d2wd
     )
 
     list(APPEND MICROPY_DEF_BOARD
@@ -14,10 +14,10 @@ if(MICROPY_BOARD_VARIANT STREQUAL "d2wd")
     )
 endif()
 
-if(MICROPY_BOARD_VARIANT STREQUAL "ota")
+if(MICROPY_BOARD_VARIANT STREQUAL "OTA")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
-        boards/GENERIC/sdkconfig.ota
+        boards/ESP32_GENERIC/sdkconfig.ota
     )
 
     list(APPEND MICROPY_DEF_BOARD
@@ -25,7 +25,7 @@ if(MICROPY_BOARD_VARIANT STREQUAL "ota")
     )
 endif()
 
-if(MICROPY_BOARD_VARIANT STREQUAL "spiram")
+if(MICROPY_BOARD_VARIANT STREQUAL "SPIRAM")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
         boards/sdkconfig.spiram
@@ -36,10 +36,10 @@ if(MICROPY_BOARD_VARIANT STREQUAL "spiram")
     )
 endif()
 
-if(MICROPY_BOARD_VARIANT STREQUAL "unicore")
+if(MICROPY_BOARD_VARIANT STREQUAL "UNICORE")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
-        boards/GENERIC/sdkconfig.unicore
+        boards/ESP32_GENERIC/sdkconfig.unicore
     )
 
     list(APPEND MICROPY_DEF_BOARD
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.h
similarity index 100%
rename from ports/esp32/boards/GENERIC/mpconfigboard.h
rename to ports/esp32/boards/ESP32_GENERIC/mpconfigboard.h
diff --git a/ports/esp32/boards/GENERIC/sdkconfig.d2wd b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
similarity index 100%
rename from ports/esp32/boards/GENERIC/sdkconfig.d2wd
rename to ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
diff --git a/ports/esp32/boards/GENERIC/sdkconfig.ota b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota
similarity index 100%
rename from ports/esp32/boards/GENERIC/sdkconfig.ota
rename to ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota
diff --git a/ports/esp32/boards/GENERIC/sdkconfig.unicore b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.unicore
similarity index 100%
rename from ports/esp32/boards/GENERIC/sdkconfig.unicore
rename to ports/esp32/boards/ESP32_GENERIC/sdkconfig.unicore
diff --git a/ports/esp32/boards/GENERIC_C3/board.json b/ports/esp32/boards/ESP32_GENERIC_C3/board.json
similarity index 94%
rename from ports/esp32/boards/GENERIC_C3/board.json
rename to ports/esp32/boards/ESP32_GENERIC_C3/board.json
index c993c87603e9a..4a81d227a0224 100644
--- a/ports/esp32/boards/GENERIC_C3/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/board.json
@@ -8,7 +8,6 @@
         "External Flash",
         "WiFi"
     ],
-    "id": "esp32c3",
     "images": [
         "esp32c3_devkitmini.jpg"
     ],
diff --git a/ports/esp32/boards/GENERIC_C3/board.md b/ports/esp32/boards/ESP32_GENERIC_C3/board.md
similarity index 100%
rename from ports/esp32/boards/GENERIC_C3/board.md
rename to ports/esp32/boards/ESP32_GENERIC_C3/board.md
diff --git a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
similarity index 69%
rename from ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
rename to ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
index c8f78c161d22a..429366afac979 100644
--- a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
@@ -3,5 +3,5 @@ set(IDF_TARGET esp32c3)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
-    boards/GENERIC_C3/sdkconfig.c3usb
+    boards/ESP32_GENERIC_C3/sdkconfig.c3usb
 )
diff --git a/ports/esp32/boards/GENERIC_C3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
similarity index 71%
rename from ports/esp32/boards/GENERIC_C3/mpconfigboard.h
rename to ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
index d403e70e46d48..42e77ecb1a6d8 100644
--- a/ports/esp32/boards/GENERIC_C3/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
@@ -6,3 +6,6 @@
 #define MICROPY_HW_ENABLE_SDCARD            (0)
 #define MICROPY_PY_MACHINE_DAC              (0)
 #define MICROPY_PY_MACHINE_I2S              (0)
+
+// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
+#define MICROPY_HW_ENABLE_UART_REPL         (1)
diff --git a/ports/esp32/boards/GENERIC_C3/sdkconfig.c3usb b/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
similarity index 100%
rename from ports/esp32/boards/GENERIC_C3/sdkconfig.c3usb
rename to ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/ESP32_GENERIC_S2/board.json
similarity index 100%
rename from ports/esp32/boards/GENERIC_S2/board.json
rename to ports/esp32/boards/ESP32_GENERIC_S2/board.json
diff --git a/ports/esp32/boards/GENERIC_S2/board.md b/ports/esp32/boards/ESP32_GENERIC_S2/board.md
similarity index 100%
rename from ports/esp32/boards/GENERIC_S2/board.md
rename to ports/esp32/boards/ESP32_GENERIC_S2/board.md
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
similarity index 100%
rename from ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
rename to ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.h
similarity index 100%
rename from ports/esp32/boards/GENERIC_S2/mpconfigboard.h
rename to ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.h
diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/ESP32_GENERIC_S3/board.json
similarity index 89%
rename from ports/esp32/boards/GENERIC_S3/board.json
rename to ports/esp32/boards/ESP32_GENERIC_S3/board.json
index be2170c12fd71..671936c922ce0 100644
--- a/ports/esp32/boards/GENERIC_S3/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/board.json
@@ -18,6 +18,6 @@
     "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif",
     "variants": {
-        "spiram-oct": "Support for Octal-SPIRAM"
+        "SPIRAM_OCT": "Support for Octal-SPIRAM"
     }
 }
diff --git a/ports/esp32/boards/GENERIC_S3/board.md b/ports/esp32/boards/ESP32_GENERIC_S3/board.md
similarity index 100%
rename from ports/esp32/boards/GENERIC_S3/board.md
rename to ports/esp32/boards/ESP32_GENERIC_S3/board.md
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
similarity index 81%
rename from ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
rename to ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
index bd163f9f33dc8..36b4fe56240de 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
@@ -5,10 +5,10 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.spiram_sx
-    boards/GENERIC_S3/sdkconfig.board
+    boards/ESP32_GENERIC_S3/sdkconfig.board
 )
 
-if(MICROPY_BOARD_VARIANT STREQUAL "spiram-oct")
+if(MICROPY_BOARD_VARIANT STREQUAL "SPIRAM_OCT")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
         boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.h
similarity index 100%
rename from ports/esp32/boards/GENERIC_S3/mpconfigboard.h
rename to ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.h
diff --git a/ports/esp32/boards/GENERIC_S3/sdkconfig.board b/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board
similarity index 100%
rename from ports/esp32/boards/GENERIC_S3/sdkconfig.board
rename to ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board
diff --git a/ports/esp32/boards/SIL_WESP32/board.json b/ports/esp32/boards/SIL_WESP32/board.json
index 5c77b4887ad18..50dd2cc660d48 100644
--- a/ports/esp32/boards/SIL_WESP32/board.json
+++ b/ports/esp32/boards/SIL_WESP32/board.json
@@ -10,7 +10,6 @@
         "PoE",
         "WiFi"
     ],
-    "id": "wesp32",
     "images": [
         "wesp32-iso.jpg",
         "wesp32-top.jpg"
diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
index 4b6ea88558941..4de9a7d4f71c2 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -16,7 +16,6 @@
     "features_non_filterable": [
         "Second LDO"
     ],
-    "id": "featherS2",
     "images": [
         "unexpectedmaker_feathers2.jpg"
     ],
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
index 51bb02b97b230..dfa1f46dc365e 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -16,7 +16,6 @@
     "features_non_filterable": [
         "5x5 RGB LED Matrix"
     ],
-    "id": "featherS2neo",
     "images": [
         "FeatherS2_Neo_White_Product2.jpg"
     ],
diff --git a/ports/esp32/boards/UM_FEATHERS3/board.json b/ports/esp32/boards/UM_FEATHERS3/board.json
index 0ad1ff73becb0..235d52a12d4fd 100644
--- a/ports/esp32/boards/UM_FEATHERS3/board.json
+++ b/ports/esp32/boards/UM_FEATHERS3/board.json
@@ -15,7 +15,6 @@
         "WiFi"
     ],
     "features_non_filterable": [],
-    "id": "feathers3",
     "images": [
         "unexpectedmaker_feathers3.jpg"
     ],
diff --git a/ports/esp32/boards/UM_PROS3/board.json b/ports/esp32/boards/UM_PROS3/board.json
index 3e83a813f4b24..8efc4e5ab55a7 100644
--- a/ports/esp32/boards/UM_PROS3/board.json
+++ b/ports/esp32/boards/UM_PROS3/board.json
@@ -15,7 +15,6 @@
         "WiFi"
     ],
     "features_non_filterable": [],
-    "id": "pros3",
     "images": [
         "unexpectedmaker_pros3.jpg"
     ],
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
index f6ba9ddb0edb6..bf0b3d2c8c621 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.json
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -15,7 +15,6 @@
     "features_non_filterable": [
         "TinyPICO Compatible"
     ],
-    "id": "tinypico",
     "images": [
         "tinypico-v2-both.jpg"
     ],
@@ -24,7 +23,7 @@
     "thumbnail": "",
     "url": "https://www.tinypico.com/",
     "variants": {
-        "idf3": "Compiled with IDF 3.x"
+        "IDF3": "Compiled with IDF 3.x"
     },
     "vendor": "Unexpected Maker"
 }
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
index b6c94ba9e89d8..1b4c934dfaedb 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -15,7 +15,6 @@
     "features_non_filterable": [
         "TinyPICO Compatible"
     ],
-    "id": "tinys2",
     "images": [
         "TinyS2+Product+Shot.jpg"
     ],
diff --git a/ports/esp32/boards/UM_TINYS3/board.json b/ports/esp32/boards/UM_TINYS3/board.json
index 3b7bb13345394..27ae46a249a81 100644
--- a/ports/esp32/boards/UM_TINYS3/board.json
+++ b/ports/esp32/boards/UM_TINYS3/board.json
@@ -15,7 +15,6 @@
     "features_non_filterable": [
         "TinyPICO Compatible"
     ],
-    "id": "tinys3",
     "images": [
         "unexpectedmaker_tinys3.jpg"
     ],
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 1cdcafa031bc6..e4c907c57a6c5 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -4,17 +4,25 @@ ifdef BOARD_DIR
 # the path as the board name.
 BOARD ?= $(notdir $(BOARD_DIR:/=))
 else
-# If not given on the command line, then default to GENERIC.
-BOARD ?= GENERIC
+# If not given on the command line, then default to ESP8266_GENERIC.
+BOARD ?= ESP8266_GENERIC
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
 ifeq ($(wildcard $(BOARD_DIR)/.),)
+ifeq ($(findstring boards/GENERIC,$(BOARD_DIR)),boards/GENERIC)
+$(warning The GENERIC* boards have been renamed to ESP8266_GENERIC)
+endif
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
-# If the build directory is not given, make it reflect the board name.
+# If the build directory is not given, make it reflect the board name (and
+# optionally the board variant).
+ifneq ($(BOARD_VARIANT),)
+BUILD ?= build-$(BOARD)-$(BOARD_VARIANT)
+else
 BUILD ?= build-$(BOARD)
+endif
 
 include ../../py/mkenv.mk
 
@@ -40,7 +48,7 @@ include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES += lib/axtls lib/berkeley-db-1.xx
 
-FWBIN = $(BUILD)/firmware-combined.bin
+FWBIN = $(BUILD)/firmware.bin
 PORT ?= /dev/ttyACM0
 BAUD ?= 115200
 FLASH_MODE ?= qio
@@ -202,7 +210,7 @@ FROZEN_EXTRA_DEPS = $(CONFVARS_FILE)
 
 .PHONY: deploy
 
-deploy: $(BUILD)/firmware-combined.bin
+deploy: $(FWBIN)
 	$(ECHO) "Writing $< to the board"
 	$(Q)esptool.py --port $(PORT) --baud $(BAUD) write_flash --verify --flash_size=$(FLASH_SIZE) --flash_mode=$(FLASH_MODE) 0 $<
 
@@ -213,20 +221,26 @@ erase:
 reset:
 	echo -e "\r\nimport machine; machine.reset()\r\n" >$(PORT)
 
+ifeq ($(BOARD_VARIANT),OTA)
+$(FWBIN): $(BUILD)/firmware.elf
+	$(ECHO) "Create $@"
+	$(Q)esptool.py elf2image $^
+	$(Q)$(PYTHON) makeimg.py $(BUILD)/firmware.elf-0x00000.bin $(BUILD)/firmware.elf-0x[0-5][1-f]000.bin $(BUILD)/firmware-ota.bin
+
+	$(Q)cat $(YAOTA8266)/yaota8266.bin $(BUILD)/firmware-ota.bin > $@
+	$(Q)$(PYTHON) $(YAOTA8266)/ota-client/ota_client.py sign $@
+else
 $(FWBIN): $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
 	$(Q)esptool.py elf2image $^
 	$(Q)$(PYTHON) makeimg.py $(BUILD)/firmware.elf-0x00000.bin $(BUILD)/firmware.elf-0x[0-5][1-f]000.bin $@
+endif
 
 $(BUILD)/firmware.elf: $(OBJ)
 	$(ECHO) "LINK $@"
 	$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 	$(Q)$(SIZE) $@
 
-ota:
-	rm -f $(BUILD)/firmware.elf $(BUILD)/firmware.elf*.bin
-	$(MAKE) LD_FILES=boards/esp8266_ota.ld FWBIN=$(BUILD)/firmware-ota.bin
-
 include $(TOP)/py/mkrules.mk
 
 clean-modules:
diff --git a/ports/esp8266/README.md b/ports/esp8266/README.md
index 1e0cae213937b..561c7714032ac 100644
--- a/ports/esp8266/README.md
+++ b/ports/esp8266/README.md
@@ -23,6 +23,9 @@ Supported features include:
 
 Documentation is available at http://docs.micropython.org/en/latest/esp8266/quickref.html.
 
+The default build requires a 2MiB flash chip, but see below for support for
+1MiB and 512kiB options.
+
 Build instructions
 ------------------
 
@@ -67,10 +70,10 @@ Then to compile the ESP8266 firmware:
 
 ```
 $ cd ports/esp8266
-$ docker run --rm -v $HOME:$HOME -u $UID -w $PWD larsks/esp-open-sdk make -j BOARD=GENERIC
+$ docker run --rm -v $HOME:$HOME -u $UID -w $PWD larsks/esp-open-sdk make -j BOARD=ESP8266_GENERIC
 ```
 
-This will produce binary images in the `build-GENERIC/` subdirectory.
+This will produce binary images in the `build-ESP8266_GENERIC/` subdirectory.
 Substitute the board for whichever board you're using.
 
 __Building with a local toolchain__
@@ -106,10 +109,10 @@ Then to compile the ESP8266 firmware:
 
 ```
 $ cd ports/esp8266
-$ make -j BOARD=GENERIC
+$ make -j BOARD=ESP8266_GENERIC
 ```
 
-This will produce binary images in the `build-GENERIC/` subdirectory.
+This will produce binary images in the `build-ESP8266_GENERIC/` subdirectory.
 Substitute the board for whichever board you're using.
 
 
@@ -149,25 +152,29 @@ $ make PORT=/dev/ttyUSB0 FLASH_MODE=qio FLASH_SIZE=32m deploy
 (note that flash size is in megabits)
 
 If you want to flash manually using `esptool.py` directly, the image produced is
-`build-GENERIC/firmware-combined.bin`, to be flashed at 0x00000.
+`build-ESP8266_GENERIC/firmware.bin`, to be flashed at 0x00000.
 
-The default board definition is the directory `boards/GENERIC`.
+The default board definition is the directory `boards/ESP8266_GENERIC`.
 For a custom configuration you can define your own board in the directory `boards/`.
 
-The `BOARD` variable can be set on the make command line, for example:
-```bash
-$ make BOARD=GENERIC_512K
-```
+__Reduced FlashROM variants__
 
-__512KB FlashROM version__
+The normal build described above requires modules with at least 2MiB of
+FlashROM onboard. There's a special configuration for 512kiB modules, which can
+be built with the `FLASH_512K` variant. This configuration is highly limited,
+lacks filesystem support, WebREPL, and has many other features disabled. It's
+mostly suitable for advanced users who are interested to fine-tune options to
+achieve a required setup. If you are an end user, please consider using a
+module with at least 2MiB of FlashROM.
 
-The normal build described above requires modules with at least 1MB of FlashROM
-onboard. There's a special configuration for 512KB modules, which can be
-built with `make BOARD=GENERIC_512K`. This configuration is highly limited, lacks
-filesystem support, WebREPL, and has many other features disabled. It's mostly
-suitable for advanced users who are interested to fine-tune options to achieve a
-required setup. If you are an end user, please consider using a module with at
-least 1MB of FlashROM.
+A variant is also provided for 1MiB modules which just lacks the included
+micropython-lib packages.
+
+The variant can be set on the make command line, for example:
+```bash
+$ make BOARD=ESP8266_GENERIC BOARD_VARIANT=FLASH_512K
+$ make BOARD=ESP8266_GENERIC BOARD_VARIANT=FLASH_1M
+```
 
 First start
 -----------
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/_boot.py b/ports/esp8266/boards/ESP8266_GENERIC/_boot.py
new file mode 100644
index 0000000000000..16da8bc4c3750
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/_boot.py
@@ -0,0 +1,6 @@
+# Minimal _boot.py for the 512kiB variant. Does not set up a block device or
+# filesystem. Other variants use esp8266/modules/_boot.py.
+
+import gc
+
+gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4)
diff --git a/ports/esp8266/boards/GENERIC/board.json b/ports/esp8266/boards/ESP8266_GENERIC/board.json
similarity index 70%
rename from ports/esp8266/boards/GENERIC/board.json
rename to ports/esp8266/boards/ESP8266_GENERIC/board.json
index ebdd95493b6d1..1fca10c5f0b71 100644
--- a/ports/esp8266/boards/GENERIC/board.json
+++ b/ports/esp8266/boards/ESP8266_GENERIC/board.json
@@ -7,14 +7,15 @@
         "External Flash",
         "WiFi"
     ],
-    "id": "esp8266",
     "images": [],
     "mcu": "esp8266",
-    "product": "ESP8266 with 2MiB+ flash",
+    "product": "ESP8266",
     "thumbnail": "",
     "url": "https://www.espressif.com/en/products/modules",
     "variants": {
-        "ota": "OTA compatible"
+        "OTA": "OTA compatible",
+        "FLASH_1M": "1MiB flash",
+        "FLASH_512K": "512kiB flash"
     },
     "vendor": "Espressif"
 }
diff --git a/ports/esp8266/boards/GENERIC/board.md b/ports/esp8266/boards/ESP8266_GENERIC/board.md
similarity index 58%
rename from ports/esp8266/boards/GENERIC/board.md
rename to ports/esp8266/boards/ESP8266_GENERIC/board.md
index fa0cf410d66fa..96fbab617a8f6 100644
--- a/ports/esp8266/boards/GENERIC/board.md
+++ b/ports/esp8266/boards/ESP8266_GENERIC/board.md
@@ -1,6 +1,13 @@
-The following are daily builds of the ESP8266 firmware for boards with at
-least 2MiB of flash.  They have the latest features and bug fixes, WebREPL is
-not automatically started, and debugging is enabled by default.
+The following are daily builds of the ESP8266 firmware. This will work on
+boards with at least 2MiB of flash.  They have the latest features and bug
+fixes, WebREPL is not automatically started, and debugging is enabled by
+default.
+
+For boards with 1MiB or 512kiB of flash, two variants are provided with reduced
+functionality. The 1MiB variant removes asyncio and FAT-filesystem support as
+well as some modules from micropython-lib. The 512kiB variant further removes
+all filesystem support, as well as framebuffer support, some Python language
+features, and has less detailed error messages.
 
 Note: v1.12-334 and newer (including v1.13) require an ESP8266 module with
 2MiB of flash or more, and use littlefs as the filesystem by default.  When
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/ESP8266_GENERIC/manifest_2MiB.py
similarity index 100%
rename from ports/esp8266/boards/GENERIC/manifest.py
rename to ports/esp8266/boards/ESP8266_GENERIC/manifest_2MiB.py
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/ESP8266_GENERIC/manifest_512kiB.py
similarity index 100%
rename from ports/esp8266/boards/GENERIC_512K/manifest.py
rename to ports/esp8266/boards/ESP8266_GENERIC/manifest_512kiB.py
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
new file mode 100644
index 0000000000000..3a9c40e79503c
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
@@ -0,0 +1,52 @@
+#if defined(MICROPY_ESP8266_2M)
+
+#define MICROPY_HW_BOARD_NAME "ESP module"
+#define MICROPY_HW_MCU_NAME "ESP8266"
+
+#define MICROPY_PERSISTENT_CODE_LOAD    (1)
+#define MICROPY_EMIT_XTENSA             (1)
+#define MICROPY_EMIT_INLINE_XTENSA      (1)
+
+#define MICROPY_DEBUG_PRINTERS          (1)
+#define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_NORMAL)
+
+#define MICROPY_READER_VFS              (MICROPY_VFS)
+#define MICROPY_VFS                     (1)
+
+#define MICROPY_PY_CRYPTOLIB            (1)
+
+#elif defined(MICROPY_ESP8266_1M)
+
+#define MICROPY_HW_BOARD_NAME "ESP module (1M)"
+#define MICROPY_HW_MCU_NAME "ESP8266"
+
+#define MICROPY_PERSISTENT_CODE_LOAD    (1)
+#define MICROPY_EMIT_XTENSA             (1)
+#define MICROPY_EMIT_INLINE_XTENSA      (1)
+
+#define MICROPY_DEBUG_PRINTERS          (1)
+#define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_NORMAL)
+
+#define MICROPY_READER_VFS              (MICROPY_VFS)
+#define MICROPY_VFS                     (1)
+
+
+#define MICROPY_PY_CRYPTOLIB            (1)
+
+#elif defined(MICROPY_ESP8266_512K)
+
+#define MICROPY_HW_BOARD_NAME "ESP module (512K)"
+#define MICROPY_HW_MCU_NAME "ESP8266"
+
+#define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_TERSE)
+
+#define MICROPY_PY_FSTRINGS             (0)
+#define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
+#define MICROPY_PY_ALL_SPECIAL_METHODS  (0)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
+#define MICROPY_PY_SYS_STDIO_BUFFER     (0)
+#define MICROPY_PY_ASYNCIO              (0)
+#define MICROPY_PY_RE_SUB               (0)
+#define MICROPY_PY_FRAMEBUF             (0)
+
+#endif
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
new file mode 100644
index 0000000000000..2eb78d7e85e5c
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
@@ -0,0 +1,50 @@
+ifeq ($(BOARD_VARIANT),)
+LD_FILES = boards/esp8266_2MiB.ld
+
+MICROPY_ESPNOW ?= 1
+MICROPY_PY_BTREE ?= 1
+MICROPY_VFS_FAT ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Add asyncio and extra micropython-lib packages (in addition to the port manifest).
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest_2MiB.py
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_2M
+endif
+
+ifeq ($(BOARD_VARIANT),FLASH_1M)
+LD_FILES = boards/esp8266_1MiB.ld
+
+MICROPY_ESPNOW ?= 1
+MICROPY_PY_BTREE ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Note: Implicitly uses the port manifest.
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_1M
+endif
+
+ifeq ($(BOARD_VARIANT),OTA)
+LD_FILES = boards/esp8266_ota.ld
+
+MICROPY_ESPNOW ?= 1
+MICROPY_PY_BTREE ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Note: Implicitly uses the port manifest.
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_1M
+endif
+
+ifeq ($(BOARD_VARIANT),FLASH_512K)
+LD_FILES = boards/esp8266_512kiB.ld
+
+# Note: Use the minimal manifest.py.
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest_512kiB.py
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_512K
+endif
diff --git a/ports/esp8266/boards/GENERIC/mpconfigboard.h b/ports/esp8266/boards/GENERIC/mpconfigboard.h
deleted file mode 100644
index 52c93f83a3684..0000000000000
--- a/ports/esp8266/boards/GENERIC/mpconfigboard.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "ESP module"
-#define MICROPY_HW_MCU_NAME "ESP8266"
-
-#define MICROPY_PERSISTENT_CODE_LOAD    (1)
-#define MICROPY_EMIT_XTENSA             (1)
-#define MICROPY_EMIT_INLINE_XTENSA      (1)
-
-#define MICROPY_DEBUG_PRINTERS          (1)
-#define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_NORMAL)
-
-#define MICROPY_READER_VFS              (MICROPY_VFS)
-#define MICROPY_VFS                     (1)
-
-#define MICROPY_PY_CRYPTOLIB            (1)
diff --git a/ports/esp8266/boards/GENERIC/mpconfigboard.mk b/ports/esp8266/boards/GENERIC/mpconfigboard.mk
deleted file mode 100644
index 8d7babdc84483..0000000000000
--- a/ports/esp8266/boards/GENERIC/mpconfigboard.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LD_FILES = boards/esp8266_2m.ld
-
-MICROPY_ESPNOW ?= 1
-MICROPY_PY_BTREE ?= 1
-MICROPY_VFS_FAT ?= 1
-MICROPY_VFS_LFS2 ?= 1
-
-FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/esp8266/boards/GENERIC_1M/board.json b/ports/esp8266/boards/GENERIC_1M/board.json
deleted file mode 100644
index 5446f291284b6..0000000000000
--- a/ports/esp8266/boards/GENERIC_1M/board.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "deploy": [
-        "../deploy.md"
-    ],
-    "docs": "",
-    "features": [
-        "External Flash",
-        "WiFi"
-    ],
-    "id": "esp8266-1m",
-    "images": [],
-    "mcu": "esp8266",
-    "product": "ESP8266 with 1MiB flash",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
-}
diff --git a/ports/esp8266/boards/GENERIC_1M/board.md b/ports/esp8266/boards/GENERIC_1M/board.md
deleted file mode 100644
index 17cc6e3a6bdf0..0000000000000
--- a/ports/esp8266/boards/GENERIC_1M/board.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The following are daily builds of the ESP8266 firmware tailored for modules with
-only 1MiB of flash.  This firmware uses littlefs as the filesystem.
-When upgrading from older firmware that uses a FAT filesystem please backup your files
-first, and either erase all flash before upgrading, or after upgrading execute
-`os.VfsLfs2.mkfs(bdev)`.
diff --git a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
deleted file mode 100644
index 41752e692b315..0000000000000
--- a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "ESP module (1M)"
-#define MICROPY_HW_MCU_NAME "ESP8266"
-
-#define MICROPY_PERSISTENT_CODE_LOAD    (1)
-#define MICROPY_EMIT_XTENSA             (1)
-#define MICROPY_EMIT_INLINE_XTENSA      (1)
-
-#define MICROPY_DEBUG_PRINTERS          (1)
-#define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_NORMAL)
-
-#define MICROPY_READER_VFS              (MICROPY_VFS)
-#define MICROPY_VFS                     (1)
-
-#define MICROPY_PY_FSTRINGS             (0)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
-#define MICROPY_PY_ASYNCIO              (0)
-#define MICROPY_PY_CRYPTOLIB            (1)
diff --git a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.mk b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.mk
deleted file mode 100644
index adc31702e0de7..0000000000000
--- a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LD_FILES = boards/esp8266_1m.ld
-
-MICROPY_ESPNOW ?= 1
-MICROPY_PY_BTREE ?= 1
-MICROPY_VFS_LFS2 ?= 1
diff --git a/ports/esp8266/boards/GENERIC_512K/_boot.py b/ports/esp8266/boards/GENERIC_512K/_boot.py
deleted file mode 100644
index 1a55cfd36c55e..0000000000000
--- a/ports/esp8266/boards/GENERIC_512K/_boot.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import gc
-
-gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4)
diff --git a/ports/esp8266/boards/GENERIC_512K/board.json b/ports/esp8266/boards/GENERIC_512K/board.json
deleted file mode 100644
index 1feac4a05cbaa..0000000000000
--- a/ports/esp8266/boards/GENERIC_512K/board.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "deploy": [
-        "../deploy.md"
-    ],
-    "docs": "",
-    "features": [
-        "External Flash",
-        "WiFi"
-    ],
-    "id": "esp8266-512k",
-    "images": [],
-    "mcu": "esp8266",
-    "product": "ESP8266 with 512kiB flash",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
-}
diff --git a/ports/esp8266/boards/GENERIC_512K/board.md b/ports/esp8266/boards/GENERIC_512K/board.md
deleted file mode 100644
index 1f6e2c7907385..0000000000000
--- a/ports/esp8266/boards/GENERIC_512K/board.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The following are daily builds of the ESP8266 firmware tailored for modules with
-only 512kiB of flash.  Certain features are disabled to get the firmware down
-to this size.
diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
deleted file mode 100644
index c29e23d5ad114..0000000000000
--- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "ESP module (512K)"
-#define MICROPY_HW_MCU_NAME "ESP8266"
-
-#define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_TERSE)
-
-#define MICROPY_PY_FSTRINGS             (0)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
-#define MICROPY_PY_ALL_SPECIAL_METHODS  (0)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
-#define MICROPY_PY_SYS_STDIO_BUFFER     (0)
-#define MICROPY_PY_ASYNCIO              (0)
-#define MICROPY_PY_RE_SUB               (0)
-#define MICROPY_PY_FRAMEBUF             (0)
diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
deleted file mode 100644
index 120351909bc0c..0000000000000
--- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LD_FILES = boards/esp8266_512k.ld
-
-FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/esp8266/boards/esp8266_1m.ld b/ports/esp8266/boards/esp8266_1MiB.ld
similarity index 100%
rename from ports/esp8266/boards/esp8266_1m.ld
rename to ports/esp8266/boards/esp8266_1MiB.ld
diff --git a/ports/esp8266/boards/esp8266_2m.ld b/ports/esp8266/boards/esp8266_2MiB.ld
similarity index 100%
rename from ports/esp8266/boards/esp8266_2m.ld
rename to ports/esp8266/boards/esp8266_2MiB.ld
diff --git a/ports/esp8266/boards/esp8266_512k.ld b/ports/esp8266/boards/esp8266_512kiB.ld
similarity index 100%
rename from ports/esp8266/boards/esp8266_512k.ld
rename to ports/esp8266/boards/esp8266_512kiB.ld
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 3a4b0ef23d500..5e9e31ad0140b 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -4,8 +4,8 @@ ifdef BOARD_DIR
 # the path as the board name.
 BOARD ?= $(notdir $(BOARD_DIR:/=))
 else
-# If not given on the command line, then default to pca10040.
-BOARD ?= pca10040
+# If not given on the command line, then default to PCA10040.
+BOARD ?= PCA10040
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index fde04e61f101c..889ead5d4d7ba 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -41,7 +41,7 @@ This is a port of MicroPython to the Nordic Semiconductor nRF series of chips.
   * [PCA10056](http://www.nordicsemi.com/eng/Products/nRF52840-Preview-DK)
   * [PCA10059](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle)
   * [Particle Xenon](https://docs.particle.io/xenon/)
-  * [nRF52840 MDK USB Dongle](boards/nrf52840-mdk-usb-dongle/README.md)
+  * [nRF52840 MDK USB Dongle](boards/NRF52840_MDK_USB_DONGLE/README.md)
 * nRF9160
   * [PCA10090](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF9160-DK)
   * [Actinius Icarus](https://www.actinius.com/icarus)
@@ -63,8 +63,8 @@ By default, the PCA10040 (nrf52832) is used as compile target. To build and flas
 Alternatively the target board could be defined:
 
     make submodules
-    make BOARD=pca10040
-    make BOARD=pca10040 deploy
+    make BOARD=PCA10040
+    make BOARD=PCA10040 deploy
 
 ## Compile without LTO enabled
 
@@ -73,7 +73,7 @@ targets in the nrf-port. The `-flto` linker flag can be toggled easily by using
 the argument LTO when building. The example below shows how to disable LTO for
 the compilation:
 
-    make BOARD=pca10040 LTO=0
+    make BOARD=PCA10040 LTO=0
 
 **Note**: There have been several issues with use of LTO in conjunction with
 GNU ARM Embedded Toolchain 7.2.1/4Q17. It's recommended to use a toolchain after
@@ -88,11 +88,11 @@ First prepare the bluetooth folder by downloading Bluetooth LE stacks and header
 
 If the Bluetooth stacks has been downloaded, compile the target with the following command:
 
-    make BOARD=pca10040 SD=s132
+    make BOARD=PCA10040 SD=s132
 
 The **make sd** will trigger a flash of the bluetooth stack before that application is flashed. Note that **make sd** will perform a full erase of the chip, which could cause 3rd party bootloaders to also be wiped.
 
-    make BOARD=pca10040 SD=s132 sd
+    make BOARD=PCA10040 SD=s132 sd
 
 Note: further tuning of features to include in bluetooth or even setting up the device to use REPL over Bluetooth can be configured in the `bluetooth_conf.h`.
 
@@ -104,7 +104,7 @@ it in the specific target board's `mpconfigboard.mk`.
 
 For example:
 
-    make BOARD=pca10040 FROZEN_MANIFEST=path/to/manifest.py
+    make BOARD=PCA10040 FROZEN_MANIFEST=path/to/manifest.py
 
 In case of using the target board's makefile, add a line similar to this:
 
@@ -117,7 +117,7 @@ As the `oofatfs` module is not having header guards that can exclude the impleme
 
 For example:
 
-     make BOARD=pca10040 MICROPY_VFS_FAT=1
+     make BOARD=PCA10040 MICROPY_VFS_FAT=1
 
 ## Enable MICROPY_VFS_LFS1 or MICROPY_VFS_LFS2
 
@@ -127,7 +127,7 @@ or `MICROPY_VFS_LFS2` can be set. This will be in addition of setting
 
 For example:
 
-    make BOARD=pca10056 MICROPY_VFS_LFS2=1
+    make BOARD=PCA10056 MICROPY_VFS_LFS2=1
 
 ## Set file system size
 
@@ -141,7 +141,7 @@ linker script syntax as it is passed directly.
 For example, if we want to override the default file system size set by the
 linker scripts to use 256K:
 
-    make BOARD=pca10056 MICROPY_VFS_LFS2=1 FS_SIZE=256K
+    make BOARD=PCA10056 MICROPY_VFS_LFS2=1 FS_SIZE=256K
 
 Also note that changing this size between builds might cause loss of files
 present from a previous firmware as it will format the file system due to a new
@@ -151,25 +151,25 @@ location.
 
 Target Board (BOARD) | Bluetooth Stack (SD)    | Bluetooth Support      | Bootloader     | Default Flash Util
 ---------------------|-------------------------|------------------------|----------------|-------------------
-microbit             | s110                    | Peripheral             |                | [PyOCD](#pyocdopenocd-targets)
-pca10000             | s110                    | Peripheral             |                | [Segger](#segger-targets)
-pca10001             | s110                    | Peripheral             |                | [Segger](#segger-targets)
-pca10028             | s110                    | Peripheral             |                | [Segger](#segger-targets)
-pca10031             | s110                    | Peripheral             |                | [Segger](#segger-targets)
-wt51822_s4at         | s110                    | Peripheral             |                | Manual, see [datasheet](https://4tronix.co.uk/picobot2/WT51822-S4AT.pdf) for pinout
-pca10040             | s132                    | Peripheral and Central |                | [Segger](#segger-targets)
-feather52            | s132                    | Peripheral and Central |                | Manual, SWDIO and SWCLK solder points on the bottom side of the board
-arduino_primo        | s132                    | Peripheral and Central |                | [PyOCD](#pyocdopenocd-targets)
-ibk_blyst_nano       | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
-idk_blyst_nano       | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
-blueio_tag_evim      | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
-evk_nina_b1          | s132                    | Peripheral and Central |                | [Segger](#segger-targets)
-pca10056             | s140                    | Peripheral and Central |                | [Segger](#segger-targets)
-pca10059             | s140                    | Peripheral and Central | OpenBootloader | [nrfutil](#nrfutil-targets)
-particle_xenon       | s140                    | Peripheral and Central |                | [Black Magic Probe](#black-magic-probe-targets)
-nrf52840-mdk-usb-dongle | s140                 | Peripheral and Central | OpenBootloader | [nrfutil](#nrfutil-targets)
-pca10090             | None (bsdlib.a)         | None (LTE/GNSS)        |                | [Segger](#segger-targets)
-actinius_icarus      | None (bsdlib.a)         | None (LTE/GNSS)        |                | [Segger](#segger-targets)
+MICROBIT             | s110                    | Peripheral             |                | [PyOCD](#pyocdopenocd-targets)
+PCA10000             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+PCA10001             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+PCA10028             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+PCA10031             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+WT51822_S4AT         | s110                    | Peripheral             |                | Manual, see [datasheet](https://4tronix.co.uk/picobot2/WT51822-S4AT.pdf) for pinout
+PCA10040             | s132                    | Peripheral and Central |                | [Segger](#segger-targets)
+FEATHER52            | s132                    | Peripheral and Central |                | Manual, SWDIO and SWCLK solder points on the bottom side of the board
+ARDUINO_PRIMO        | s132                    | Peripheral and Central |                | [PyOCD](#pyocdopenocd-targets)
+IBK_BLYST_NANO       | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
+IDK_BLYST_NANO       | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
+BLUEIO_TAG_EVIM      | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
+EVK_NINA_B1          | s132                    | Peripheral and Central |                | [Segger](#segger-targets)
+PCA10056             | s140                    | Peripheral and Central |                | [Segger](#segger-targets)
+PCA10059             | s140                    | Peripheral and Central | OpenBootloader | [nrfutil](#nrfutil-targets)
+PARTICLE_XENON       | s140                    | Peripheral and Central |                | [Black Magic Probe](#black-magic-probe-targets)
+NRF52840_MDK_USB_DONGLE | s140                 | Peripheral and Central | OpenBootloader | [nrfutil](#nrfutil-targets)
+PCA10090             | None (bsdlib.a)         | None (LTE/GNSS)        |                | [Segger](#segger-targets)
+ACTINIUS_ICARUS      | None (bsdlib.a)         | None (LTE/GNSS)        |                | [Segger](#segger-targets)
 
 ## IDAP-M/IDAP-Link Targets
 
@@ -218,7 +218,7 @@ to trim of the MBR in case SoftDevice flashing is requested.
 `nrfutil` as flashing backend also requires a serial port parameter to be defined
 in addition to the `deploy` target of make. For example:
 
-    make BOARD=nrf52840-mdk-usb-dongle NRFUTIL_PORT=/dev/ttyACM0 deploy
+    make BOARD=NRF52840_MDK_USB_DONGLE NRFUTIL_PORT=/dev/ttyACM0 deploy
 
 If the target device is connected to `/dev/ttyACM0` serial port, the
 `NRFUTIL_PORT` parameter to make can be elided as it is the default serial
@@ -228,7 +228,7 @@ When enabling Bluetooth LE, as with the other flash utils, the SoftDevice
 needs to be flashed in the first firmware update. This can be done by issuing
 the `sd` target instead of `deploy`. For example:
 
-    make BOARD=nrf52840-mdk-usb-dongle SD=s140 NRFUTIL_PORT=/dev/ttyACM0 sd
+    make BOARD=NRF52840_MDK_USB_DONGLE SD=s140 NRFUTIL_PORT=/dev/ttyACM0 sd
 
 ## Bluetooth LE REPL
 
diff --git a/ports/nrf/boards/actinius_icarus/board.json b/ports/nrf/boards/ACTINIUS_ICARUS/board.json
similarity index 100%
rename from ports/nrf/boards/actinius_icarus/board.json
rename to ports/nrf/boards/ACTINIUS_ICARUS/board.json
diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.h b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/actinius_icarus/mpconfigboard.h
rename to ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.mk b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/actinius_icarus/mpconfigboard.mk
rename to ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk
diff --git a/ports/nrf/boards/actinius_icarus/pins.csv b/ports/nrf/boards/ACTINIUS_ICARUS/pins.csv
similarity index 100%
rename from ports/nrf/boards/actinius_icarus/pins.csv
rename to ports/nrf/boards/ACTINIUS_ICARUS/pins.csv
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/board.c b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.c
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/board.c
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.c
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/board.json b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/board.json
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/deploy.md
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/deploy.md
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/manifest.py
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/manifest.py
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/modules/imu.py b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/modules/imu.py
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/modules/imu.py
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/modules/imu.py
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.mk
similarity index 77%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.mk
index cb2ff5c6b81cd..148a9f1017943 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.mk
@@ -4,7 +4,7 @@ MCU_SUB_VARIANT = nrf52840
 SOFTDEV_VERSION = 6.1.1
 SD=s140
 
-LD_FILES += boards/arduino_nano_33_ble_sense/nano_bootloader.ld boards/nrf52840_1M_256k.ld
+LD_FILES += boards/ARDUINO_NANO_33_BLE_SENSE/nano_bootloader.ld boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA
 
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/nano_bootloader.ld b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/nano_bootloader.ld
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/nano_bootloader.ld
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/nano_bootloader.ld
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/pins.csv b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/pins.csv
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
diff --git a/ports/nrf/boards/arduino_primo/board.json b/ports/nrf/boards/ARDUINO_PRIMO/board.json
similarity index 100%
rename from ports/nrf/boards/arduino_primo/board.json
rename to ports/nrf/boards/ARDUINO_PRIMO/board.json
diff --git a/ports/nrf/boards/arduino_primo/mpconfigboard.h b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/arduino_primo/mpconfigboard.h
rename to ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
diff --git a/ports/nrf/boards/arduino_primo/mpconfigboard.mk b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/arduino_primo/mpconfigboard.mk
rename to ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.mk
diff --git a/ports/nrf/boards/arduino_primo/pins.csv b/ports/nrf/boards/ARDUINO_PRIMO/pins.csv
similarity index 100%
rename from ports/nrf/boards/arduino_primo/pins.csv
rename to ports/nrf/boards/ARDUINO_PRIMO/pins.csv
diff --git a/ports/nrf/boards/blueio_tag_evim/board.json b/ports/nrf/boards/BLUEIO_TAG_EVIM/board.json
similarity index 100%
rename from ports/nrf/boards/blueio_tag_evim/board.json
rename to ports/nrf/boards/BLUEIO_TAG_EVIM/board.json
diff --git a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.h b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/blueio_tag_evim/mpconfigboard.h
rename to ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
diff --git a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk
rename to ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.mk
diff --git a/ports/nrf/boards/blueio_tag_evim/pins.csv b/ports/nrf/boards/BLUEIO_TAG_EVIM/pins.csv
similarity index 100%
rename from ports/nrf/boards/blueio_tag_evim/pins.csv
rename to ports/nrf/boards/BLUEIO_TAG_EVIM/pins.csv
diff --git a/ports/nrf/boards/dvk_bl652/board.json b/ports/nrf/boards/DVK_BL652/board.json
similarity index 100%
rename from ports/nrf/boards/dvk_bl652/board.json
rename to ports/nrf/boards/DVK_BL652/board.json
diff --git a/ports/nrf/boards/dvk_bl652/mpconfigboard.h b/ports/nrf/boards/DVK_BL652/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/dvk_bl652/mpconfigboard.h
rename to ports/nrf/boards/DVK_BL652/mpconfigboard.h
diff --git a/ports/nrf/boards/dvk_bl652/mpconfigboard.mk b/ports/nrf/boards/DVK_BL652/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/dvk_bl652/mpconfigboard.mk
rename to ports/nrf/boards/DVK_BL652/mpconfigboard.mk
diff --git a/ports/nrf/boards/dvk_bl652/pins.csv b/ports/nrf/boards/DVK_BL652/pins.csv
similarity index 100%
rename from ports/nrf/boards/dvk_bl652/pins.csv
rename to ports/nrf/boards/DVK_BL652/pins.csv
diff --git a/ports/nrf/boards/evk_nina_b1/board.json b/ports/nrf/boards/EVK_NINA_B1/board.json
similarity index 100%
rename from ports/nrf/boards/evk_nina_b1/board.json
rename to ports/nrf/boards/EVK_NINA_B1/board.json
diff --git a/ports/nrf/boards/evk_nina_b1/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/evk_nina_b1/mpconfigboard.h
rename to ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
diff --git a/ports/nrf/boards/evk_nina_b1/mpconfigboard.mk b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/evk_nina_b1/mpconfigboard.mk
rename to ports/nrf/boards/EVK_NINA_B1/mpconfigboard.mk
diff --git a/ports/nrf/boards/evk_nina_b1/pins.csv b/ports/nrf/boards/EVK_NINA_B1/pins.csv
similarity index 100%
rename from ports/nrf/boards/evk_nina_b1/pins.csv
rename to ports/nrf/boards/EVK_NINA_B1/pins.csv
diff --git a/ports/nrf/boards/evk_nina_b3/board.json b/ports/nrf/boards/EVK_NINA_B3/board.json
similarity index 100%
rename from ports/nrf/boards/evk_nina_b3/board.json
rename to ports/nrf/boards/EVK_NINA_B3/board.json
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/evk_nina_b3/mpconfigboard.h
rename to ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
rename to ports/nrf/boards/EVK_NINA_B3/mpconfigboard.mk
diff --git a/ports/nrf/boards/evk_nina_b3/pins.csv b/ports/nrf/boards/EVK_NINA_B3/pins.csv
similarity index 100%
rename from ports/nrf/boards/evk_nina_b3/pins.csv
rename to ports/nrf/boards/EVK_NINA_B3/pins.csv
diff --git a/ports/nrf/boards/feather52/board.json b/ports/nrf/boards/FEATHER52/board.json
similarity index 100%
rename from ports/nrf/boards/feather52/board.json
rename to ports/nrf/boards/FEATHER52/board.json
diff --git a/ports/nrf/boards/feather52/mpconfigboard.h b/ports/nrf/boards/FEATHER52/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/feather52/mpconfigboard.h
rename to ports/nrf/boards/FEATHER52/mpconfigboard.h
diff --git a/ports/nrf/boards/feather52/mpconfigboard.mk b/ports/nrf/boards/FEATHER52/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/feather52/mpconfigboard.mk
rename to ports/nrf/boards/FEATHER52/mpconfigboard.mk
diff --git a/ports/nrf/boards/feather52/pins.csv b/ports/nrf/boards/FEATHER52/pins.csv
similarity index 100%
rename from ports/nrf/boards/feather52/pins.csv
rename to ports/nrf/boards/FEATHER52/pins.csv
diff --git a/ports/nrf/boards/ibk_blyst_nano/board.json b/ports/nrf/boards/IBK_BLYST_NANO/board.json
similarity index 100%
rename from ports/nrf/boards/ibk_blyst_nano/board.json
rename to ports/nrf/boards/IBK_BLYST_NANO/board.json
diff --git a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h
rename to ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
diff --git a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk
rename to ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.mk
diff --git a/ports/nrf/boards/ibk_blyst_nano/pins.csv b/ports/nrf/boards/IBK_BLYST_NANO/pins.csv
similarity index 100%
rename from ports/nrf/boards/ibk_blyst_nano/pins.csv
rename to ports/nrf/boards/IBK_BLYST_NANO/pins.csv
diff --git a/ports/nrf/boards/idk_blyst_nano/board.json b/ports/nrf/boards/IDK_BLYST_NANO/board.json
similarity index 100%
rename from ports/nrf/boards/idk_blyst_nano/board.json
rename to ports/nrf/boards/IDK_BLYST_NANO/board.json
diff --git a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.h b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/idk_blyst_nano/mpconfigboard.h
rename to ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
diff --git a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk
rename to ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.mk
diff --git a/ports/nrf/boards/idk_blyst_nano/pins.csv b/ports/nrf/boards/IDK_BLYST_NANO/pins.csv
similarity index 100%
rename from ports/nrf/boards/idk_blyst_nano/pins.csv
rename to ports/nrf/boards/IDK_BLYST_NANO/pins.csv
diff --git a/ports/nrf/boards/microbit/board.json b/ports/nrf/boards/MICROBIT/board.json
similarity index 100%
rename from ports/nrf/boards/microbit/board.json
rename to ports/nrf/boards/MICROBIT/board.json
diff --git a/ports/nrf/boards/microbit/custom_nrf51822_s110_microbit.ld b/ports/nrf/boards/MICROBIT/custom_nrf51822_s110_microbit.ld
similarity index 100%
rename from ports/nrf/boards/microbit/custom_nrf51822_s110_microbit.ld
rename to ports/nrf/boards/MICROBIT/custom_nrf51822_s110_microbit.ld
diff --git a/ports/nrf/boards/microbit/modules/AUTHORS b/ports/nrf/boards/MICROBIT/modules/AUTHORS
similarity index 100%
rename from ports/nrf/boards/microbit/modules/AUTHORS
rename to ports/nrf/boards/MICROBIT/modules/AUTHORS
diff --git a/ports/nrf/boards/microbit/modules/LICENSE b/ports/nrf/boards/MICROBIT/modules/LICENSE
similarity index 100%
rename from ports/nrf/boards/microbit/modules/LICENSE
rename to ports/nrf/boards/MICROBIT/modules/LICENSE
diff --git a/ports/nrf/boards/microbit/modules/boardmodules.h b/ports/nrf/boards/MICROBIT/modules/boardmodules.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/boardmodules.h
rename to ports/nrf/boards/MICROBIT/modules/boardmodules.h
diff --git a/ports/nrf/boards/microbit/modules/boardmodules.mk b/ports/nrf/boards/MICROBIT/modules/boardmodules.mk
similarity index 91%
rename from ports/nrf/boards/microbit/modules/boardmodules.mk
rename to ports/nrf/boards/MICROBIT/modules/boardmodules.mk
index eb8f108615604..84a606c448dbb 100644
--- a/ports/nrf/boards/microbit/modules/boardmodules.mk
+++ b/ports/nrf/boards/MICROBIT/modules/boardmodules.mk
@@ -1,4 +1,4 @@
-BOARD_MICROBIT_DIR = boards/microbit/modules
+BOARD_MICROBIT_DIR = boards/MICROBIT/modules
 
 INC += -I./$(BOARD_MICROBIT_DIR)
 CFLAGS += -DBOARD_SPECIFIC_MODULES
diff --git a/ports/nrf/boards/microbit/modules/iters.c b/ports/nrf/boards/MICROBIT/modules/iters.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/iters.c
rename to ports/nrf/boards/MICROBIT/modules/iters.c
diff --git a/ports/nrf/boards/microbit/modules/iters.h b/ports/nrf/boards/MICROBIT/modules/iters.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/iters.h
rename to ports/nrf/boards/MICROBIT/modules/iters.h
diff --git a/ports/nrf/boards/microbit/modules/microbitconstimage.c b/ports/nrf/boards/MICROBIT/modules/microbitconstimage.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitconstimage.c
rename to ports/nrf/boards/MICROBIT/modules/microbitconstimage.c
diff --git a/ports/nrf/boards/microbit/modules/microbitconstimage.h b/ports/nrf/boards/MICROBIT/modules/microbitconstimage.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitconstimage.h
rename to ports/nrf/boards/MICROBIT/modules/microbitconstimage.h
diff --git a/ports/nrf/boards/microbit/modules/microbitconstimagetuples.c b/ports/nrf/boards/MICROBIT/modules/microbitconstimagetuples.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitconstimagetuples.c
rename to ports/nrf/boards/MICROBIT/modules/microbitconstimagetuples.c
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/MICROBIT/modules/microbitdisplay.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitdisplay.c
rename to ports/nrf/boards/MICROBIT/modules/microbitdisplay.c
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.h b/ports/nrf/boards/MICROBIT/modules/microbitdisplay.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitdisplay.h
rename to ports/nrf/boards/MICROBIT/modules/microbitdisplay.h
diff --git a/ports/nrf/boards/microbit/modules/microbitfont.h b/ports/nrf/boards/MICROBIT/modules/microbitfont.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitfont.h
rename to ports/nrf/boards/MICROBIT/modules/microbitfont.h
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/MICROBIT/modules/microbitimage.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitimage.c
rename to ports/nrf/boards/MICROBIT/modules/microbitimage.c
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.h b/ports/nrf/boards/MICROBIT/modules/microbitimage.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitimage.h
rename to ports/nrf/boards/MICROBIT/modules/microbitimage.h
diff --git a/ports/nrf/boards/microbit/modules/modmicrobit.c b/ports/nrf/boards/MICROBIT/modules/modmicrobit.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/modmicrobit.c
rename to ports/nrf/boards/MICROBIT/modules/modmicrobit.c
diff --git a/ports/nrf/boards/microbit/modules/modmicrobit.h b/ports/nrf/boards/MICROBIT/modules/modmicrobit.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/modmicrobit.h
rename to ports/nrf/boards/MICROBIT/modules/modmicrobit.h
diff --git a/ports/nrf/boards/microbit/mpconfigboard.h b/ports/nrf/boards/MICROBIT/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/microbit/mpconfigboard.h
rename to ports/nrf/boards/MICROBIT/mpconfigboard.h
diff --git a/ports/nrf/boards/microbit/mpconfigboard.mk b/ports/nrf/boards/MICROBIT/mpconfigboard.mk
similarity index 79%
rename from ports/nrf/boards/microbit/mpconfigboard.mk
rename to ports/nrf/boards/MICROBIT/mpconfigboard.mk
index 6fdd2bc500085..6c7e1b46b93c3 100644
--- a/ports/nrf/boards/microbit/mpconfigboard.mk
+++ b/ports/nrf/boards/MICROBIT/mpconfigboard.mk
@@ -4,7 +4,7 @@ MCU_SUB_VARIANT = nrf51822
 SOFTDEV_VERSION = 8.0.0
 
 ifneq ($(SD),)
-LD_FILES += boards/microbit/custom_nrf51822_s110_microbit.ld
+LD_FILES += boards/MICROBIT/custom_nrf51822_s110_microbit.ld
 FROZEN_MANIFEST ?=
 else
 MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/microbit/pins.csv b/ports/nrf/boards/MICROBIT/pins.csv
similarity index 100%
rename from ports/nrf/boards/microbit/pins.csv
rename to ports/nrf/boards/MICROBIT/pins.csv
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md
similarity index 100%
rename from ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md
rename to ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json
similarity index 100%
rename from ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
rename to ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
rename to ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
rename to ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.mk
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/pins.csv b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/pins.csv
similarity index 100%
rename from ports/nrf/boards/nrf52840-mdk-usb-dongle/pins.csv
rename to ports/nrf/boards/NRF52840_MDK_USB_DONGLE/pins.csv
diff --git a/ports/nrf/boards/particle_xenon/board.json b/ports/nrf/boards/PARTICLE_XENON/board.json
similarity index 100%
rename from ports/nrf/boards/particle_xenon/board.json
rename to ports/nrf/boards/PARTICLE_XENON/board.json
diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.h b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/particle_xenon/mpconfigboard.h
rename to ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.mk b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/particle_xenon/mpconfigboard.mk
rename to ports/nrf/boards/PARTICLE_XENON/mpconfigboard.mk
diff --git a/ports/nrf/boards/particle_xenon/pins.csv b/ports/nrf/boards/PARTICLE_XENON/pins.csv
similarity index 100%
rename from ports/nrf/boards/particle_xenon/pins.csv
rename to ports/nrf/boards/PARTICLE_XENON/pins.csv
diff --git a/ports/nrf/boards/pca10000/board.json b/ports/nrf/boards/PCA10000/board.json
similarity index 100%
rename from ports/nrf/boards/pca10000/board.json
rename to ports/nrf/boards/PCA10000/board.json
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.h b/ports/nrf/boards/PCA10000/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10000/mpconfigboard.h
rename to ports/nrf/boards/PCA10000/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.mk b/ports/nrf/boards/PCA10000/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10000/mpconfigboard.mk
rename to ports/nrf/boards/PCA10000/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10000/pins.csv b/ports/nrf/boards/PCA10000/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10000/pins.csv
rename to ports/nrf/boards/PCA10000/pins.csv
diff --git a/ports/nrf/boards/pca10001/board.json b/ports/nrf/boards/PCA10001/board.json
similarity index 100%
rename from ports/nrf/boards/pca10001/board.json
rename to ports/nrf/boards/PCA10001/board.json
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.h b/ports/nrf/boards/PCA10001/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10001/mpconfigboard.h
rename to ports/nrf/boards/PCA10001/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.mk b/ports/nrf/boards/PCA10001/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10001/mpconfigboard.mk
rename to ports/nrf/boards/PCA10001/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10001/pins.csv b/ports/nrf/boards/PCA10001/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10001/pins.csv
rename to ports/nrf/boards/PCA10001/pins.csv
diff --git a/ports/nrf/boards/pca10028/board.json b/ports/nrf/boards/PCA10028/board.json
similarity index 100%
rename from ports/nrf/boards/pca10028/board.json
rename to ports/nrf/boards/PCA10028/board.json
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.h b/ports/nrf/boards/PCA10028/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10028/mpconfigboard.h
rename to ports/nrf/boards/PCA10028/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.mk b/ports/nrf/boards/PCA10028/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10028/mpconfigboard.mk
rename to ports/nrf/boards/PCA10028/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10028/pins.csv b/ports/nrf/boards/PCA10028/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10028/pins.csv
rename to ports/nrf/boards/PCA10028/pins.csv
diff --git a/ports/nrf/boards/pca10031/board.json b/ports/nrf/boards/PCA10031/board.json
similarity index 100%
rename from ports/nrf/boards/pca10031/board.json
rename to ports/nrf/boards/PCA10031/board.json
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.h b/ports/nrf/boards/PCA10031/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10031/mpconfigboard.h
rename to ports/nrf/boards/PCA10031/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.mk b/ports/nrf/boards/PCA10031/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10031/mpconfigboard.mk
rename to ports/nrf/boards/PCA10031/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10031/pins.csv b/ports/nrf/boards/PCA10031/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10031/pins.csv
rename to ports/nrf/boards/PCA10031/pins.csv
diff --git a/ports/nrf/boards/pca10040/board.json b/ports/nrf/boards/PCA10040/board.json
similarity index 100%
rename from ports/nrf/boards/pca10040/board.json
rename to ports/nrf/boards/PCA10040/board.json
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.h b/ports/nrf/boards/PCA10040/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10040/mpconfigboard.h
rename to ports/nrf/boards/PCA10040/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.mk b/ports/nrf/boards/PCA10040/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10040/mpconfigboard.mk
rename to ports/nrf/boards/PCA10040/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10040/pins.csv b/ports/nrf/boards/PCA10040/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10040/pins.csv
rename to ports/nrf/boards/PCA10040/pins.csv
diff --git a/ports/nrf/boards/pca10056/board.json b/ports/nrf/boards/PCA10056/board.json
similarity index 100%
rename from ports/nrf/boards/pca10056/board.json
rename to ports/nrf/boards/PCA10056/board.json
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.h b/ports/nrf/boards/PCA10056/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10056/mpconfigboard.h
rename to ports/nrf/boards/PCA10056/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/PCA10056/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10056/mpconfigboard.mk
rename to ports/nrf/boards/PCA10056/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10056/pins.csv b/ports/nrf/boards/PCA10056/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10056/pins.csv
rename to ports/nrf/boards/PCA10056/pins.csv
diff --git a/ports/nrf/boards/pca10059/board.json b/ports/nrf/boards/PCA10059/board.json
similarity index 100%
rename from ports/nrf/boards/pca10059/board.json
rename to ports/nrf/boards/PCA10059/board.json
diff --git a/ports/nrf/boards/pca10059/modules/boardmodules.h b/ports/nrf/boards/PCA10059/modules/boardmodules.h
similarity index 100%
rename from ports/nrf/boards/pca10059/modules/boardmodules.h
rename to ports/nrf/boards/PCA10059/modules/boardmodules.h
diff --git a/ports/nrf/boards/pca10059/modules/boardmodules.mk b/ports/nrf/boards/PCA10059/modules/boardmodules.mk
similarity index 85%
rename from ports/nrf/boards/pca10059/modules/boardmodules.mk
rename to ports/nrf/boards/PCA10059/modules/boardmodules.mk
index 413790fbea7d5..d1457cde7cb38 100644
--- a/ports/nrf/boards/pca10059/modules/boardmodules.mk
+++ b/ports/nrf/boards/PCA10059/modules/boardmodules.mk
@@ -1,4 +1,4 @@
-BOARD_PCA10059_DIR = boards/pca10059/modules
+BOARD_PCA10059_DIR = boards/PCA10059/modules
 
 INC += -I./$(BOARD_PCA10059_DIR)
 CFLAGS += -DBOARD_SPECIFIC_MODULES
diff --git a/ports/nrf/boards/pca10059/modules/recover_uicr_regout0.c b/ports/nrf/boards/PCA10059/modules/recover_uicr_regout0.c
similarity index 100%
rename from ports/nrf/boards/pca10059/modules/recover_uicr_regout0.c
rename to ports/nrf/boards/PCA10059/modules/recover_uicr_regout0.c
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.h b/ports/nrf/boards/PCA10059/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10059/mpconfigboard.h
rename to ports/nrf/boards/PCA10059/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nrf/boards/PCA10059/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10059/mpconfigboard.mk
rename to ports/nrf/boards/PCA10059/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10059/pins.csv b/ports/nrf/boards/PCA10059/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10059/pins.csv
rename to ports/nrf/boards/PCA10059/pins.csv
diff --git a/ports/nrf/boards/pca10090/board.json b/ports/nrf/boards/PCA10090/board.json
similarity index 100%
rename from ports/nrf/boards/pca10090/board.json
rename to ports/nrf/boards/PCA10090/board.json
diff --git a/ports/nrf/boards/pca10090/mpconfigboard.h b/ports/nrf/boards/PCA10090/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10090/mpconfigboard.h
rename to ports/nrf/boards/PCA10090/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10090/mpconfigboard.mk b/ports/nrf/boards/PCA10090/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10090/mpconfigboard.mk
rename to ports/nrf/boards/PCA10090/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10090/pins.csv b/ports/nrf/boards/PCA10090/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10090/pins.csv
rename to ports/nrf/boards/PCA10090/pins.csv
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/XIAO_bootloader.ld b/ports/nrf/boards/SEEED_XIAO_NRF52/XIAO_bootloader.ld
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/XIAO_bootloader.ld
rename to ports/nrf/boards/SEEED_XIAO_NRF52/XIAO_bootloader.ld
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/board.c b/ports/nrf/boards/SEEED_XIAO_NRF52/board.c
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/board.c
rename to ports/nrf/boards/SEEED_XIAO_NRF52/board.c
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/board.json b/ports/nrf/boards/SEEED_XIAO_NRF52/board.json
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/board.json
rename to ports/nrf/boards/SEEED_XIAO_NRF52/board.json
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/deploy.md b/ports/nrf/boards/SEEED_XIAO_NRF52/deploy.md
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/deploy.md
rename to ports/nrf/boards/SEEED_XIAO_NRF52/deploy.md
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h
rename to ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.mk
similarity index 82%
rename from ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk
rename to ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.mk
index c2fc219187e39..1f495a9c64a67 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = nrf52
 MCU_SUB_VARIANT = nrf52840
 SOFTDEV_VERSION = 7.3.0
 SD=s140
-LD_FILES += boards/seeed_xiao_nrf52/XIAO_bootloader.ld boards/nrf52840_1M_256k.ld
+LD_FILES += boards/SEEED_XIAO_NRF52/XIAO_bootloader.ld boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA
 
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/pins.csv b/ports/nrf/boards/SEEED_XIAO_NRF52/pins.csv
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/pins.csv
rename to ports/nrf/boards/SEEED_XIAO_NRF52/pins.csv
diff --git a/ports/nrf/boards/wt51822_s4at/board.json b/ports/nrf/boards/WT51822_S4AT/board.json
similarity index 100%
rename from ports/nrf/boards/wt51822_s4at/board.json
rename to ports/nrf/boards/WT51822_S4AT/board.json
diff --git a/ports/nrf/boards/wt51822_s4at/mpconfigboard.h b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/wt51822_s4at/mpconfigboard.h
rename to ports/nrf/boards/WT51822_S4AT/mpconfigboard.h
diff --git a/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
rename to ports/nrf/boards/WT51822_S4AT/mpconfigboard.mk
diff --git a/ports/nrf/boards/wt51822_s4at/pins.csv b/ports/nrf/boards/WT51822_S4AT/pins.csv
similarity index 100%
rename from ports/nrf/boards/wt51822_s4at/pins.csv
rename to ports/nrf/boards/WT51822_S4AT/pins.csv
diff --git a/ports/renesas-ra/boards/EK_RA4M1/board.json b/ports/renesas-ra/boards/EK_RA4M1/board.json
index d21fe0c121220..4d8dcd5e6d349 100644
--- a/ports/renesas-ra/boards/EK_RA4M1/board.json
+++ b/ports/renesas-ra/boards/EK_RA4M1/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "EK-RA4M1",
     "images": [
         "ek_ra4m1_board.jpg"
     ],
diff --git a/ports/renesas-ra/boards/EK_RA4W1/board.json b/ports/renesas-ra/boards/EK_RA4W1/board.json
index 878d97a8acdbf..edc4fcbfe0f1f 100644
--- a/ports/renesas-ra/boards/EK_RA4W1/board.json
+++ b/ports/renesas-ra/boards/EK_RA4W1/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "EK-RA4W1",
     "images": [
         "ek_ra4w1_board.jpg"
     ],
diff --git a/ports/renesas-ra/boards/EK_RA6M1/board.json b/ports/renesas-ra/boards/EK_RA6M1/board.json
index d678fa387e089..3bdb08b92fb55 100644
--- a/ports/renesas-ra/boards/EK_RA6M1/board.json
+++ b/ports/renesas-ra/boards/EK_RA6M1/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "EK-RA6M1",
     "images": [
         "ek_ra6m1_board.jpg"
     ],
diff --git a/ports/renesas-ra/boards/EK_RA6M2/board.json b/ports/renesas-ra/boards/EK_RA6M2/board.json
index 3d6b95aacb8a3..5760b197366b1 100644
--- a/ports/renesas-ra/boards/EK_RA6M2/board.json
+++ b/ports/renesas-ra/boards/EK_RA6M2/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "EK-RA6M2",
     "images": [
         "ek_ra6m2_board.jpg",
         "ek_ra6m2_j1_pins.jpg",
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
index 8cb64f660103e..be1dd977c33fb 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "RA4M1-CLICKER",
     "images": [
         "ra4m1_clicker_board.jpg",
         "ra4m1_clicker_pins.jpg"
diff --git a/ports/renesas-ra/boards/VK_RA6M5/board.json b/ports/renesas-ra/boards/VK_RA6M5/board.json
index b2ff6b0e401e5..48371138b19f6 100644
--- a/ports/renesas-ra/boards/VK_RA6M5/board.json
+++ b/ports/renesas-ra/boards/VK_RA6M5/board.json
@@ -6,7 +6,6 @@
     "features": [
         "DAC"
     ],
-    "id": "VK-RA6M5",
     "images": [
         "VK-RA6M5.jpg"
     ],
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 4334a0aba9b93..7718697b438f8 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -26,7 +26,7 @@ set(MICROPY_PORT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 # Set the board if it's not already set.
 if(NOT MICROPY_BOARD)
-    set(MICROPY_BOARD PICO)
+    set(MICROPY_BOARD RPI_PICO)
 endif()
 
 # Set the board directory and check that it exists.
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index ccfc1ac7d6c7a..8399b9e98afba 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -8,16 +8,25 @@ ifdef BOARD_DIR
 # the path as the board name.
 BOARD ?= $(notdir $(BOARD_DIR:/=))
 else
-# If not given on the command line, then default to PICO.
-BOARD ?= PICO
+# If not given on the command line, then default to RPI_PICO.
+BOARD ?= RPI_PICO
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
 ifeq ($(wildcard $(BOARD_DIR)/.),)
+ifeq ($(findstring boards/PICO,$(BOARD_DIR)),boards/PICO)
+$(warning The PICO* boards have been renamed to RPI_PICO*)
+endif
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
- 
+
+# If the build directory is not given, make it reflect the board name (and
+# optionally the board variant).
+ifneq ($(BOARD_VARIANT),)
+BUILD ?= build-$(BOARD)-$(BOARD_VARIANT)
+else
 BUILD ?= build-$(BOARD)
+endif
 
 $(VERBOSE)MAKESILENT = -s
 
diff --git a/ports/rp2/boards/PICO/board.json b/ports/rp2/boards/RPI_PICO/board.json
similarity index 94%
rename from ports/rp2/boards/PICO/board.json
rename to ports/rp2/boards/RPI_PICO/board.json
index 8c0a12ae76c4d..07938978f3655 100644
--- a/ports/rp2/boards/PICO/board.json
+++ b/ports/rp2/boards/RPI_PICO/board.json
@@ -8,7 +8,6 @@
         "External Flash",
         "USB"
     ],
-    "id": "rp2-pico",
     "images": [
         "rp2-pico.jpg"
     ],
diff --git a/ports/rp2/boards/PICO/mpconfigboard.cmake b/ports/rp2/boards/RPI_PICO/mpconfigboard.cmake
similarity index 60%
rename from ports/rp2/boards/PICO/mpconfigboard.cmake
rename to ports/rp2/boards/RPI_PICO/mpconfigboard.cmake
index 3a40ca2871c6b..13269e81e52e5 100644
--- a/ports/rp2/boards/PICO/mpconfigboard.cmake
+++ b/ports/rp2/boards/RPI_PICO/mpconfigboard.cmake
@@ -1 +1,2 @@
 # cmake file for Raspberry Pi Pico
+set(PICO_BOARD "pico")
diff --git a/ports/rp2/boards/PICO/mpconfigboard.h b/ports/rp2/boards/RPI_PICO/mpconfigboard.h
similarity index 100%
rename from ports/rp2/boards/PICO/mpconfigboard.h
rename to ports/rp2/boards/RPI_PICO/mpconfigboard.h
diff --git a/ports/rp2/boards/PICO/pins.csv b/ports/rp2/boards/RPI_PICO/pins.csv
similarity index 100%
rename from ports/rp2/boards/PICO/pins.csv
rename to ports/rp2/boards/RPI_PICO/pins.csv
diff --git a/ports/rp2/boards/PICO_W/board.json b/ports/rp2/boards/RPI_PICO_W/board.json
similarity index 94%
rename from ports/rp2/boards/PICO_W/board.json
rename to ports/rp2/boards/RPI_PICO_W/board.json
index 7ee7ef505e4d1..6ea326c6cdaf4 100644
--- a/ports/rp2/boards/PICO_W/board.json
+++ b/ports/rp2/boards/RPI_PICO_W/board.json
@@ -10,7 +10,6 @@
         "USB",
         "WiFi"
     ],
-    "id": "rp2-pico-w",
     "images": [
         "rp2-pico-w.jpg"
     ],
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/RPI_PICO_W/manifest.py
similarity index 100%
rename from ports/rp2/boards/PICO_W/manifest.py
rename to ports/rp2/boards/RPI_PICO_W/manifest.py
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.cmake b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
similarity index 93%
rename from ports/rp2/boards/PICO_W/mpconfigboard.cmake
rename to ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
index e6db8dda6a2cb..5610c313e6527 100644
--- a/ports/rp2/boards/PICO_W/mpconfigboard.cmake
+++ b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
@@ -1,5 +1,7 @@
 # cmake file for Raspberry Pi Pico W
 
+set(PICO_BOARD "pico_w")
+
 # The C malloc is needed by cyw43-driver Bluetooth
 set(MICROPY_C_HEAP_SIZE 4096)
 
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.h b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.h
similarity index 100%
rename from ports/rp2/boards/PICO_W/mpconfigboard.h
rename to ports/rp2/boards/RPI_PICO_W/mpconfigboard.h
diff --git a/ports/rp2/boards/PICO_W/pins.csv b/ports/rp2/boards/RPI_PICO_W/pins.csv
similarity index 100%
rename from ports/rp2/boards/PICO_W/pins.csv
rename to ports/rp2/boards/RPI_PICO_W/pins.csv
diff --git a/ports/rp2/boards/WEACTSTUDIO/README.md b/ports/rp2/boards/WEACTSTUDIO/README.md
index ae0acfd2c7b0f..1d553509002c7 100644
--- a/ports/rp2/boards/WEACTSTUDIO/README.md
+++ b/ports/rp2/boards/WEACTSTUDIO/README.md
@@ -9,18 +9,15 @@ repository containing information on the board.
 
 ## Build notes
 
-Builds can be configured with the `BOARD_VARIANT` parameter. Valid variants
-can be displayed with the `query-variant` target. An example:
+By default the firmware supports boards with 16MiB flash. This can be
+configured using the `BOARD_VARIANT` parameter. The valid options are
+`FLASH_2M`, 'FLASH_4M', and 'FLASH_8M'.
 
 ```bash
 > cd ports/rp2
-> make BOARD=WEACTSTUDIO query-variants
-VARIANTS: flash_2mb flash_4mb flash_8mb flash_16mb
-> make BOARD=WEACTSTUDIO BOARD_VARIANT=flash_8mb submodules all  # Build the 8 MiB variant
+> make BOARD=WEACTSTUDIO BOARD_VARIANT=FLASH_8M submodules all  # Build the 8 MiB variant
 ```
 
-`flash_16mb` is the default if `BOARD_VARIANT` is not supplied.
-
 ## Board-specific modules
 
 The `board` module contains definitions for the onboard LED and user button.
diff --git a/ports/rp2/boards/WEACTSTUDIO/board.json b/ports/rp2/boards/WEACTSTUDIO/board.json
index 3a3f2f741f8ad..223bbdc07b34a 100644
--- a/ports/rp2/boards/WEACTSTUDIO/board.json
+++ b/ports/rp2/boards/WEACTSTUDIO/board.json
@@ -15,9 +15,9 @@
     "product": "WeAct Studio RP2040",
     "url": "https://github.com/WeActTC/WeActStudio.RP2040CoreBoard",
     "variants": {
-        "flash_2mb": "2 MiB Flash",
-        "flash_4mb": "4 MiB Flash",
-        "flash_8mb": "8 MiB Flash"
+        "FLASH_2MB": "2 MiB Flash",
+        "FLASH_4MB": "4 MiB Flash",
+        "FLASH_8MB": "8 MiB Flash"
     },
     "vendor": "WeAct"
 }
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
index 28a30f4580dbc..848b50f604db6 100644
--- a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
+++ b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
@@ -8,17 +8,17 @@ list(APPEND PICO_BOARD_HEADER_DIRS ${MICROPY_BOARD_DIR})
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
 
 # Select the 16MB variant as the default
-set(PICO_BOARD "weactstudio_16mb")
+set(PICO_BOARD "weactstudio_16MiB")
 
 # Provide different variants for the downloads page
-if(MICROPY_BOARD_VARIANT STREQUAL "flash_2mb")
-    set(PICO_BOARD "weactstudio_2mb")
+if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_2M")
+    set(PICO_BOARD "weactstudio_2MiB")
 endif()
 
-if(MICROPY_BOARD_VARIANT STREQUAL "flash_4mb")
-    set(PICO_BOARD "weactstudio_4mb")
+if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_4M")
+    set(PICO_BOARD "weactstudio_4MiB")
 endif()
 
-if(MICROPY_BOARD_VARIANT STREQUAL "flash_8mb")
-    set(PICO_BOARD "weactstudio_8mb")
+if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_8M")
+    set(PICO_BOARD "weactstudio_8MiB")
 endif()
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_16mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_16MiB.h
similarity index 100%
rename from ports/rp2/boards/WEACTSTUDIO/weactstudio_16mb.h
rename to ports/rp2/boards/WEACTSTUDIO/weactstudio_16MiB.h
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_2mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_2MiB.h
similarity index 100%
rename from ports/rp2/boards/WEACTSTUDIO/weactstudio_2mb.h
rename to ports/rp2/boards/WEACTSTUDIO/weactstudio_2MiB.h
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_4mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_4MiB.h
similarity index 100%
rename from ports/rp2/boards/WEACTSTUDIO/weactstudio_4mb.h
rename to ports/rp2/boards/WEACTSTUDIO/weactstudio_4MiB.h
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_8mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_8MiB.h
similarity index 100%
rename from ports/rp2/boards/WEACTSTUDIO/weactstudio_8mb.h
rename to ports/rp2/boards/WEACTSTUDIO/weactstudio_8MiB.h
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 7051398970fb5..475d8f1004f08 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -13,8 +13,13 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
-# If the build directory is not given, make it reflect the board name.
+# If the build directory is not given, make it reflect the board name (and
+# optionally the board variant).
+ifneq ($(BOARD_VARIANT),)
+BUILD ?= build-$(BOARD)-$(BOARD_VARIANT)
+else
 BUILD ?= build-$(BOARD)
+endif
 
 include ../../py/mkenv.mk
 -include mpconfigport.mk
diff --git a/ports/stm32/boards/MIKROE_QUAIL/board.json b/ports/stm32/boards/MIKROE_QUAIL/board.json
index 15d8b5fc134b5..689bdb10524c1 100644
--- a/ports/stm32/boards/MIKROE_QUAIL/board.json
+++ b/ports/stm32/boards/MIKROE_QUAIL/board.json
@@ -6,7 +6,6 @@
     "features": [
         "mikroBUS"
     ],
-    "id": "MIKROE-QUAIL",
     "images": [
         "quail_top.jpg"
     ],
diff --git a/ports/stm32/boards/PYBD_SF2/board.json b/ports/stm32/boards/PYBD_SF2/board.json
index 534a048ff0058..06a83e4d89e9f 100644
--- a/ports/stm32/boards/PYBD_SF2/board.json
+++ b/ports/stm32/boards/PYBD_SF2/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "PYBD-SF2",
     "images": [
         "PYBD_SF2_W4F2.jpg",
         "PYBD_SF2_W4F2_top.jpg",
diff --git a/ports/stm32/boards/PYBD_SF3/board.json b/ports/stm32/boards/PYBD_SF3/board.json
index 3e4731b3d2cba..e89f268cff718 100644
--- a/ports/stm32/boards/PYBD_SF3/board.json
+++ b/ports/stm32/boards/PYBD_SF3/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "PYBD-SF3",
     "images": [
         "PYBD_SF3_W4F2.jpg",
         "PYBD_SF3_W4F2_top.jpg",
diff --git a/ports/stm32/boards/PYBD_SF6/board.json b/ports/stm32/boards/PYBD_SF6/board.json
index 3a39763d5b33b..b6d85d6fd7fdc 100644
--- a/ports/stm32/boards/PYBD_SF6/board.json
+++ b/ports/stm32/boards/PYBD_SF6/board.json
@@ -7,7 +7,6 @@
         "BLE",
         "WiFi"
     ],
-    "id": "PYBD-SF6",
     "images": [
         "PYBD_SF6_W4F2.jpg",
         "PYBD_SF6_W4F2_top.jpg",
diff --git a/ports/stm32/boards/PYBLITEV10/board.json b/ports/stm32/boards/PYBLITEV10/board.json
index ce98ba7de7396..0d2338d3db698 100644
--- a/ports/stm32/boards/PYBLITEV10/board.json
+++ b/ports/stm32/boards/PYBLITEV10/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "pyblitev10",
     "images": [
         "PYBLITEv1_0.jpg",
         "PYBLITEv1_0-B.jpg",
@@ -15,10 +14,10 @@
     "thumbnail": "",
     "url": "https://store.micropython.org/product/PYBLITEv1.0",
     "variants": {
-        "dp": "Double-precision float",
-        "dp-thread": "Double precision float + Threads",
-        "network": "Wiznet 5200 Driver",
-        "thread": "Threading"
+        "DP": "Double-precision float",
+        "DP_THREAD": "Double precision float + Threads",
+        "NETWORK": "Wiznet 5200 Driver",
+        "THREAD": "Threading"
     },
     "vendor": "George Robotics"
 }
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
index afee27e94fbe3..1fe609cbb5849 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -6,20 +6,20 @@ TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
 
 # Provide different variants for the downloads page.
-ifeq ($(BOARD_VARIANT),dp)
+ifeq ($(BOARD_VARIANT),DP)
 MICROPY_FLOAT_IMPL=double
 endif
 
-ifeq ($(BOARD_VARIANT),thread)
+ifeq ($(BOARD_VARIANT),THREAD)
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),dp-thread)
+ifeq ($(BOARD_VARIANT),DP_THREAD)
 MICROPY_FLOAT_IMPL=double
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),network)
+ifeq ($(BOARD_VARIANT),NETWORK)
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
 
diff --git a/ports/stm32/boards/PYBV10/board.json b/ports/stm32/boards/PYBV10/board.json
index 2907b8fc45734..0c5fea2eb8cb6 100644
--- a/ports/stm32/boards/PYBV10/board.json
+++ b/ports/stm32/boards/PYBV10/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "pybv10",
     "images": [
         "PYBv1_0-C.jpg"
     ],
@@ -13,10 +12,10 @@
     "thumbnail": "",
     "url": "",
     "variants": {
-        "dp": "Double-precision float",
-        "dp-thread": "Double precision float + Threads",
-        "network": "Wiznet 5200 Driver",
-        "thread": "Threading"
+        "DP": "Double-precision float",
+        "DP_THREAD": "Double precision float + Threads",
+        "NETWORK": "Wiznet 5200 Driver",
+        "THREAD": "Threading"
     },
     "vendor": "George Robotics"
 }
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index d26ebd5ae91fe..1a4d6763193ae 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -16,20 +16,20 @@ endif
 MICROPY_VFS_LFS2 = 1
 
 # Provide different variants for the downloads page.
-ifeq ($(BOARD_VARIANT),dp)
+ifeq ($(BOARD_VARIANT),DP)
 MICROPY_FLOAT_IMPL=double
 endif
 
-ifeq ($(BOARD_VARIANT),thread)
+ifeq ($(BOARD_VARIANT),THREAD)
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),dp-thread)
+ifeq ($(BOARD_VARIANT),DP_THREAD)
 MICROPY_FLOAT_IMPL=double
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),network)
+ifeq ($(BOARD_VARIANT),NETWORK)
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
 
diff --git a/ports/stm32/boards/PYBV11/board.json b/ports/stm32/boards/PYBV11/board.json
index fe59a7b16d77e..5d7abbaa8330c 100644
--- a/ports/stm32/boards/PYBV11/board.json
+++ b/ports/stm32/boards/PYBV11/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "pybv11",
     "images": [
         "PYBv1_1.jpg",
         "PYBv1_1-C.jpg",
@@ -15,10 +14,10 @@
     "thumbnail": "",
     "url": "https://store.micropython.org/product/PYBv1.1",
     "variants": {
-        "dp": "Double-precision float",
-        "dp-thread": "Double precision float + Threads",
-        "network": "Wiznet 5200 Driver",
-        "thread": "Threading"
+        "DP": "Double-precision float",
+        "DP_THREAD": "Double precision float + Threads",
+        "NETWORK": "Wiznet 5200 Driver",
+        "THREAD": "Threading"
     },
     "vendor": "George Robotics"
 }
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index df2d70cda1041..6dcb2fd1b4cd0 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -16,20 +16,20 @@ endif
 MICROPY_VFS_LFS2 = 1
 
 # Provide different variants for the downloads page.
-ifeq ($(BOARD_VARIANT),dp)
+ifeq ($(BOARD_VARIANT),DP)
 MICROPY_FLOAT_IMPL=double
 endif
 
-ifeq ($(BOARD_VARIANT),thread)
+ifeq ($(BOARD_VARIANT),THREAD)
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),dp-thread)
+ifeq ($(BOARD_VARIANT),DP_THREAD)
 MICROPY_FLOAT_IMPL=double
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),network)
+ifeq ($(BOARD_VARIANT),NETWORK)
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
 
diff --git a/pyproject.toml b/pyproject.toml
index a05abf887ecf0..e3d70385c3f52 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,4 +48,4 @@ max-complexity = 40
 
 # manifest.py files are evaluated with some global names pre-defined
 "**/manifest.py" = ["F821"]
-"ports/**/boards/manifest*.py" = ["F821"]
+"ports/**/boards/**/manifest_*.py" = ["F821"]
diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 999a42c0ed220..12ac230dfb12c 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -62,7 +62,7 @@ FW_TAG="-$FW_DATE-unstable-$FW_GIT"
 cd ports/cc3200
 ${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp8266
-${AUTODIR}/build-esp8266-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+build_esp8266_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp32
 (source ${IDF_PATH_V50}/export.sh && build_esp32_boards ${FW_TAG} ${LOCAL_FIRMWARE})
 cd ../mimxrt
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index f75ccba3981c9..6f3f9380962af 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -55,10 +55,10 @@ function build_board {
     $MICROPY_AUTOBUILD_MAKE BOARD=$board BUILD=$build_dir && copy_artefacts $dest_dir $descr $fw_tag $build_dir $@
     rm -rf $build_dir
 
-    # Query variants from board.json and build them. Ignore the special "idf3"
+    # Query variants from board.json and build them. Ignore the special "IDF3"
     # variant for ESP32 boards (this allows the downloads page to still have
     # the idf3 files for older releases that used to be explicitly built).
-    for variant in `cat $board_json | python3 -c "import json,sys; print(' '.join(v for v in json.load(sys.stdin).get('variants', {}).keys() if v != 'idf3'))"`; do
+    for variant in `cat $board_json | python3 -c "import json,sys; print(' '.join(v for v in json.load(sys.stdin).get('variants', {}).keys() if v != 'IDF3'))"`; do
         local variant_build_dir=$build_dir-$variant
         echo "building variant $descr $board $variant"
         $MICROPY_AUTOBUILD_MAKE BOARD=$board BOARD_VARIANT=$variant BUILD=$variant_build_dir && copy_artefacts $dest_dir $descr-$variant $fw_tag $variant_build_dir $@
@@ -92,6 +92,10 @@ function build_esp32_boards {
     build_boards modesp32.c $1 $2 bin elf map uf2 app-bin
 }
 
+function build_esp8266_boards {
+    build_boards modesp.c $1 $2 bin elf map
+}
+
 function build_mimxrt_boards {
     build_boards modmimxrt.c $1 $2 bin hex
 }
diff --git a/tools/autobuild/build-esp8266-latest.sh b/tools/autobuild/build-esp8266-latest.sh
deleted file mode 100755
index 1972e85fcd922..0000000000000
--- a/tools/autobuild/build-esp8266-latest.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-PYTHON3=python3
-yaota8266=$HOME/yaota8266
-
-# for debugging
-#exec &> /tmp/esp-log-$$.txt
-
-# function for building firmware
-function do_build() {
-    descr=$1
-    board=$2
-    shift
-    shift
-    echo "building $descr $board"
-    build_dir=/tmp/esp8266-build-$board
-    $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
-    mv $build_dir/firmware-combined.bin $dest_dir/$descr$fw_tag.bin
-    mv $build_dir/firmware.elf $dest_dir/$descr$fw_tag.elf
-    mv $build_dir/firmware.map $dest_dir/$descr$fw_tag.map
-    rm -rf $build_dir
-}
-
-function do_build_ota() {
-    descr=$1
-    board=$2
-    shift
-    shift
-    echo "building $descr $board"
-    build_dir=/tmp/esp8266-build-$board
-    $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
-    cat $yaota8266/yaota8266.bin $build_dir/firmware-ota.bin > $dest_dir/$descr$fw_tag.bin
-    pushd $yaota8266/ota-client
-    $PYTHON3 ota_client.py sign $build_dir/firmware-ota.bin
-    popd
-    mv $build_dir/firmware-ota.bin.ota $dest_dir/$descr$fw_tag.ota
-    mv $build_dir/firmware.elf $dest_dir/$descr$fw_tag.elf
-    mv $build_dir/firmware.map $dest_dir/$descr$fw_tag.map
-    rm -rf $build_dir
-}
-
-# check/get parameters
-if [ $# != 2 ]; then
-    echo "usage: $0 <fw-tag> <dest-dir>"
-    exit 1
-fi
-
-fw_tag=$1
-dest_dir=$2
-
-# check we are in the correct directory
-if [ ! -r boards/esp8266_common.ld ]; then
-    echo "must be in esp8266 directory"
-    exit 1
-fi
-
-# build the versions
-do_build esp8266 GENERIC
-do_build esp8266-512k GENERIC_512K
-do_build esp8266-1m GENERIC_1M
-do_build_ota esp8266-ota GENERIC_1M ota
diff --git a/tools/ci.sh b/tools/ci.sh
index 98e78dc78a6f5..33dc58d6b8e1f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -129,9 +129,9 @@ function ci_esp32_build {
     make ${MAKEOPTS} -C ports/esp32 \
         USER_C_MODULES=../../../examples/usercmodule/micropython.cmake \
         FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest_test.py
-    make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3
-    make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2
-    make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S3
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C3
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S2
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S3
 
     # Test building native .mpy with xtensawin architecture.
     ci_native_mpy_modules_build xtensawin
@@ -155,9 +155,9 @@ function ci_esp8266_path {
 function ci_esp8266_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/esp8266 submodules
-    make ${MAKEOPTS} -C ports/esp8266
-    make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_512K
-    make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_1M
+    make ${MAKEOPTS} -C ports/esp8266 BOARD=ESP8266_GENERIC
+    make ${MAKEOPTS} -C ports/esp8266 BOARD=ESP8266_GENERIC BOARD_VARIANT=FLASH_512K
+    make ${MAKEOPTS} -C ports/esp8266 BOARD=ESP8266_GENERIC BOARD_VARIANT=FLASH_1M
 }
 
 ########################################################################################
@@ -204,10 +204,10 @@ function ci_nrf_build {
     ports/nrf/drivers/bluetooth/download_ble_stack.sh s140_nrf52_6_1_1
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/nrf submodules
-    make ${MAKEOPTS} -C ports/nrf BOARD=pca10040
-    make ${MAKEOPTS} -C ports/nrf BOARD=microbit
-    make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s140
-    make ${MAKEOPTS} -C ports/nrf BOARD=pca10090
+    make ${MAKEOPTS} -C ports/nrf BOARD=PCA10040
+    make ${MAKEOPTS} -C ports/nrf BOARD=MICROBIT
+    make ${MAKEOPTS} -C ports/nrf BOARD=PCA10056 SD=s140
+    make ${MAKEOPTS} -C ports/nrf BOARD=PCA10090
 }
 
 ########################################################################################
@@ -272,8 +272,8 @@ function ci_rp2_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/rp2 submodules
     make ${MAKEOPTS} -C ports/rp2
-    make ${MAKEOPTS} -C ports/rp2 BOARD=PICO_W submodules
-    make ${MAKEOPTS} -C ports/rp2 BOARD=PICO_W USER_C_MODULES=../../examples/usercmodule/micropython.cmake
+    make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO_W submodules
+    make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO_W USER_C_MODULES=../../examples/usercmodule/micropython.cmake
     make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO submodules
     make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO