From 16609812d019422ee43a4fca2edbcd0925442ac8 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Fri, 23 Dec 2022 14:00:08 -0500 Subject: [PATCH 1/7] ports/rp2: Add Waveshare RP2040 Plus 4MB and 16MB boards. According to The Waveshare website, the RP2040 Plus is a software compatible board to the Raspberry Pi Pico that uses either a 4MB or 16MB flash chip, a USB-C connector and adds some battery recharge circuitry/connector. Since this board is supported in the pico-sdk folders, all that was needed was folders named WAVESHARE_RP2040_PLUS_4MB/_16MB in the ports/rp2/boards folder populated with updated board.json, mpconfigboard.cmake and mpconfigboard.h files. Signed-off-by: David Hunter --- .../WAVESHARE_RP2040_PLUS_16MB/README.md | 8 +++++++ .../WAVESHARE_RP2040_PLUS_16MB/board.json | 21 +++++++++++++++++++ .../mpconfigboard.cmake | 1 + .../mpconfigboard.h | 4 ++++ .../WAVESHARE_RP2040_PLUS_4MB/README.md | 8 +++++++ .../WAVESHARE_RP2040_PLUS_4MB/board.json | 21 +++++++++++++++++++ .../mpconfigboard.cmake | 1 + .../WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.h | 4 ++++ 8 files changed, 68 insertions(+) create mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/README.md create mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json create mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.cmake create mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h create mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/README.md create mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json create mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.cmake create mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.h diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/README.md b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/README.md new file mode 100644 index 0000000000..0d2d289ede --- /dev/null +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/README.md @@ -0,0 +1,8 @@ +# WeAct Studio RP2040 + +The Waveshare RP2040-Plus Board is based on the Raspberry Pi RP2040 and can be +purchased with 4/16 MiB of flash. + +These boards are available from a number of resellers +Waveshare maintain the [Wiki:RP2040-Plus](https://www.waveshare.com/wiki/RP2040-Plus) +Wiki containing information on the board. diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json new file mode 100644 index 0000000000..3441f44bac --- /dev/null +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json @@ -0,0 +1,21 @@ +{ + "deploy": [ + "../deploy.md" + ], + "docs": "", + "features": [ + "Breadboard Friendly", + "Castellated Pads", + "SPI Flash", + "USB-C" + ], + "id": "rp2-waveshare_rp2040_plus_16mb", + "images": [ + "rp2040-plus-1_5.jpg" + ], + "mcu": "rp2040", + "product": "RP2040-Plus-16mb", + "thumbnail": "", + "url": "https://www.waveshare.com/rp2040-plus.htm", + "vendor": "Waveshare" +} diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.cmake b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.cmake new file mode 100644 index 0000000000..19ddf6b1ae --- /dev/null +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.cmake @@ -0,0 +1 @@ +# CMake file for Waveshare RP2040-Plus boards diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h new file mode 100644 index 0000000000..04b4727f6b --- /dev/null +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h @@ -0,0 +1,4 @@ +#define MICROPY_HW_BOARD_NAME "Waveshare RP2040-Plus 4MB" + +// Allow 1MB for the firmware image itself, allocate the remainder to the filesystem +#define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - (640 * 1024)) diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/README.md b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/README.md new file mode 100644 index 0000000000..0d2d289ede --- /dev/null +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/README.md @@ -0,0 +1,8 @@ +# WeAct Studio RP2040 + +The Waveshare RP2040-Plus Board is based on the Raspberry Pi RP2040 and can be +purchased with 4/16 MiB of flash. + +These boards are available from a number of resellers +Waveshare maintain the [Wiki:RP2040-Plus](https://www.waveshare.com/wiki/RP2040-Plus) +Wiki containing information on the board. diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json new file mode 100644 index 0000000000..5028fdf0d0 --- /dev/null +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json @@ -0,0 +1,21 @@ +{ + "deploy": [ + "../deploy.md" + ], + "docs": "", + "features": [ + "Breadboard Friendly", + "Castellated Pads", + "SPI Flash", + "USB-C" + ], + "id": "rp2-waveshare_rp2040_plus_4mb", + "images": [ + "rp2040-plus-1_5.jpg" + ], + "mcu": "rp2040", + "product": "RP2040-Plus-4mb", + "thumbnail": "", + "url": "https://www.waveshare.com/rp2040-plus.htm", + "vendor": "Waveshare" +} diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.cmake b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.cmake new file mode 100644 index 0000000000..19ddf6b1ae --- /dev/null +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.cmake @@ -0,0 +1 @@ +# CMake file for Waveshare RP2040-Plus boards diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.h b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.h new file mode 100644 index 0000000000..04b4727f6b --- /dev/null +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.h @@ -0,0 +1,4 @@ +#define MICROPY_HW_BOARD_NAME "Waveshare RP2040-Plus 4MB" + +// Allow 1MB for the firmware image itself, allocate the remainder to the filesystem +#define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - (640 * 1024)) From b506131f807afa4e42bdea5ab9e5c784ce271901 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Fri, 23 Dec 2022 14:16:34 -0500 Subject: [PATCH 2/7] WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h: Fix boardname. Update the MICROPY_HW_BOARD_NAME parameter with the correct name indicating 16MB of flash rather than 4MB. Signed-off-by: RetiredWizard --- ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h index 04b4727f6b..bfd9e7b2fa 100644 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h @@ -1,4 +1,4 @@ -#define MICROPY_HW_BOARD_NAME "Waveshare RP2040-Plus 4MB" +#define MICROPY_HW_BOARD_NAME "Waveshare RP2040-Plus 16MB" // Allow 1MB for the firmware image itself, allocate the remainder to the filesystem #define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - (640 * 1024)) From dc4ed3cc3ff691dbbd2a29f74342877d44c26d9f Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Fri, 23 Dec 2022 14:31:30 -0500 Subject: [PATCH 3/7] boards/WAVESHARE_RP2040_PLUS_/board.json: Replace tab with spaces. A tab was used on one of the features line, this replaces it with 4 spaces. Signed-off-by: RetiredWizard --- ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json | 2 +- ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json index 3441f44bac..3066e8b600 100644 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json @@ -5,7 +5,7 @@ "docs": "", "features": [ "Breadboard Friendly", - "Castellated Pads", + "Castellated Pads", "SPI Flash", "USB-C" ], diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json index 5028fdf0d0..ced3af671a 100644 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json @@ -5,7 +5,7 @@ "docs": "", "features": [ "Breadboard Friendly", - "Castellated Pads", + "Castellated Pads", "SPI Flash", "USB-C" ], From 71760c87a03482798ef2f4112c12f01a7dacacb4 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sun, 25 Dec 2022 01:33:39 -0500 Subject: [PATCH 4/7] boards/WAVESHARE_RP2040_PLUS: Modify to use variants. Modified the ports/rp2/boards/WAVESHARE_RP2040_PLUS directory to use "make" variants to select the 4mb or 16mb flash option. This results in a single board definition for the two configurations the board can be purchased in. Signed-off-by: RetiredWizard --- .../boards/WAVESHARE_RP2040_PLUS/README.md | 22 +++++++++++++++++++ .../board.json | 4 ++++ .../WAVESHARE_RP2040_PLUS/mpconfigboard.cmake | 11 ++++++++++ .../mpconfigboard.h | 2 +- .../WAVESHARE_RP2040_PLUS_16MB/README.md | 8 ------- .../WAVESHARE_RP2040_PLUS_16MB/board.json | 21 ------------------ .../mpconfigboard.cmake | 1 - .../mpconfigboard.h | 4 ---- .../WAVESHARE_RP2040_PLUS_4MB/README.md | 8 ------- .../mpconfigboard.cmake | 1 - 10 files changed, 38 insertions(+), 44 deletions(-) create mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md rename ports/rp2/boards/{WAVESHARE_RP2040_PLUS_4MB => WAVESHARE_RP2040_PLUS}/board.json (81%) create mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS/mpconfigboard.cmake rename ports/rp2/boards/{WAVESHARE_RP2040_PLUS_4MB => WAVESHARE_RP2040_PLUS}/mpconfigboard.h (73%) delete mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/README.md delete mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json delete mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.cmake delete mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h delete mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/README.md delete mode 100644 ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.cmake diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md new file mode 100644 index 0000000000..015e04fd31 --- /dev/null +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md @@ -0,0 +1,22 @@ +# WeAct Studio RP2040 + +The Waveshare RP2040-Plus Board is based on the Raspberry Pi RP2040 and can be +purchased with 4/16 MiB of flash. + +These boards are available from a number of resellers +Waveshare maintain the [Wiki:RP2040-Plus](https://www.waveshare.com/wiki/RP2040-Plus) +Wiki 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: + +```bash +> cd ports/rp2 +> make BOARD=WAVESHARE_RP2040_PLUS query-variants +VARIANTS: flash_2mb flash_4mb flash_8mb flash_16mb +> make BOARD=WAVESHARE_RP2040_PLUS BOARD_VARIANT=flash_16mb submodules all # Build the 16 MiB variant +``` + +`flash_4mb` is the default if `BOARD_VARIANT` is not supplied. diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/board.json similarity index 81% rename from ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json rename to ports/rp2/boards/WAVESHARE_RP2040_PLUS/board.json index ced3af671a..b0b2303772 100644 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/board.json +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/board.json @@ -17,5 +17,9 @@ "product": "RP2040-Plus-4mb", "thumbnail": "", "url": "https://www.waveshare.com/rp2040-plus.htm", + "variants": { + "flash_4mb": "4 MiB Flash", + "flash_16mb": "16 MiB Flash" + }, "vendor": "Waveshare" } diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS/mpconfigboard.cmake b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/mpconfigboard.cmake new file mode 100644 index 0000000000..66161c0bdb --- /dev/null +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/mpconfigboard.cmake @@ -0,0 +1,11 @@ +# CMake file for Waveshare RP2040-Plus boards + +# Provide different variants for the downloads page +set(BOARD_VARIANTS "flash_4mb flash_16mb") + +# Select the 4MB variant as the default +set(PICO_BOARD "waveshare_rp2040_plus_4mb") + +if("${BOARD_VARIANT}" STREQUAL "flash_16mb") +set(PICO_BOARD "waveshare_rp2040_plus_16mb") +endif() diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.h b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/mpconfigboard.h similarity index 73% rename from ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.h rename to ports/rp2/boards/WAVESHARE_RP2040_PLUS/mpconfigboard.h index 04b4727f6b..321ff071be 100644 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.h +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/mpconfigboard.h @@ -1,4 +1,4 @@ -#define MICROPY_HW_BOARD_NAME "Waveshare RP2040-Plus 4MB" +#define MICROPY_HW_BOARD_NAME "Waveshare RP2040-Plus" // Allow 1MB for the firmware image itself, allocate the remainder to the filesystem #define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - (640 * 1024)) diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/README.md b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/README.md deleted file mode 100644 index 0d2d289ede..0000000000 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# WeAct Studio RP2040 - -The Waveshare RP2040-Plus Board is based on the Raspberry Pi RP2040 and can be -purchased with 4/16 MiB of flash. - -These boards are available from a number of resellers -Waveshare maintain the [Wiki:RP2040-Plus](https://www.waveshare.com/wiki/RP2040-Plus) -Wiki containing information on the board. diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json deleted file mode 100644 index 3066e8b600..0000000000 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/board.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "deploy": [ - "../deploy.md" - ], - "docs": "", - "features": [ - "Breadboard Friendly", - "Castellated Pads", - "SPI Flash", - "USB-C" - ], - "id": "rp2-waveshare_rp2040_plus_16mb", - "images": [ - "rp2040-plus-1_5.jpg" - ], - "mcu": "rp2040", - "product": "RP2040-Plus-16mb", - "thumbnail": "", - "url": "https://www.waveshare.com/rp2040-plus.htm", - "vendor": "Waveshare" -} diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.cmake b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.cmake deleted file mode 100644 index 19ddf6b1ae..0000000000 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.cmake +++ /dev/null @@ -1 +0,0 @@ -# CMake file for Waveshare RP2040-Plus boards diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h deleted file mode 100644 index bfd9e7b2fa..0000000000 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_16MB/mpconfigboard.h +++ /dev/null @@ -1,4 +0,0 @@ -#define MICROPY_HW_BOARD_NAME "Waveshare RP2040-Plus 16MB" - -// Allow 1MB for the firmware image itself, allocate the remainder to the filesystem -#define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - (640 * 1024)) diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/README.md b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/README.md deleted file mode 100644 index 0d2d289ede..0000000000 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# WeAct Studio RP2040 - -The Waveshare RP2040-Plus Board is based on the Raspberry Pi RP2040 and can be -purchased with 4/16 MiB of flash. - -These boards are available from a number of resellers -Waveshare maintain the [Wiki:RP2040-Plus](https://www.waveshare.com/wiki/RP2040-Plus) -Wiki containing information on the board. diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.cmake b/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.cmake deleted file mode 100644 index 19ddf6b1ae..0000000000 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS_4MB/mpconfigboard.cmake +++ /dev/null @@ -1 +0,0 @@ -# CMake file for Waveshare RP2040-Plus boards From e414b451440be0cc0487a81a7873c2401e753124 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sun, 25 Dec 2022 09:05:18 -0500 Subject: [PATCH 5/7] rp2/boards/WAVESHARE_RP2040_PLUS/README: Fix board name in Title. Signed-off-by: RetiredWizard --- ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md index 015e04fd31..1688677d08 100644 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md @@ -1,4 +1,4 @@ -# WeAct Studio RP2040 +# Waveshare RP2040-Plus The Waveshare RP2040-Plus Board is based on the Raspberry Pi RP2040 and can be purchased with 4/16 MiB of flash. From bef413523f81b91faeb8a6093d0d2150dc25d872 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sun, 25 Dec 2022 09:09:30 -0500 Subject: [PATCH 6/7] rp2/boards/WAVESHARE_RP2040_PLUS/README: Fix query-variants result. Signed-off-by: RetiredWizard --- ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md index 1688677d08..b5716a82a6 100644 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/README.md @@ -15,7 +15,7 @@ can be displayed with the `query-variant` target. An example: ```bash > cd ports/rp2 > make BOARD=WAVESHARE_RP2040_PLUS query-variants -VARIANTS: flash_2mb flash_4mb flash_8mb flash_16mb +VARIANTS: flash_4mb flash_16mb > make BOARD=WAVESHARE_RP2040_PLUS BOARD_VARIANT=flash_16mb submodules all # Build the 16 MiB variant ``` From e92ca9ec2b1c63d27aef453c02a646a1eee2a751 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Mon, 26 Dec 2022 12:07:25 -0500 Subject: [PATCH 7/7] ports/WAVESHARE_RP2040_PLUS/board.json: Generalize for variants. Remove the variant identifier from general board identifier keys. Signed-off-by: RetiredWizard --- ports/rp2/boards/WAVESHARE_RP2040_PLUS/board.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/rp2/boards/WAVESHARE_RP2040_PLUS/board.json b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/board.json index b0b2303772..a8efd6be8c 100644 --- a/ports/rp2/boards/WAVESHARE_RP2040_PLUS/board.json +++ b/ports/rp2/boards/WAVESHARE_RP2040_PLUS/board.json @@ -9,12 +9,12 @@ "SPI Flash", "USB-C" ], - "id": "rp2-waveshare_rp2040_plus_4mb", + "id": "rp2-waveshare-rp2040-plus", "images": [ "rp2040-plus-1_5.jpg" ], "mcu": "rp2040", - "product": "RP2040-Plus-4mb", + "product": "RP2040 Plus", "thumbnail": "", "url": "https://www.waveshare.com/rp2040-plus.htm", "variants": {