MicroPython: Update boards to match upstream naming conventions.

pimoroni · Gadgetoid · Oct 6, 2023 · Oct 5, 2023 · Oct 5, 2023 · Oct 6, 2023
commit 08ce4fbb812f15fbaaa26198b01fddea7f1c8106
diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
@@ -69,9 +69,9 @@ jobs:
       matrix:
         include:
         - name: pico
-          board: PICO
+          board: RPI_PICO
         - name: picow
-          board: PICO_W
+          board: RPI_PICO_W
         - name: tiny2040
           board: PIMORONI_TINY2040
         - name: picolipo_4mb
@@ -84,11 +84,11 @@ jobs:
           board: PICO_W_ENVIRO
           patch: true
         - name: galactic_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: cosmic_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: stellar_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: inky_frame
           board: PICO_W_INKY
           patch: true

diff --git a/micropython/board/PICO_W_ENVIRO/mpconfigboard.cmake b/micropython/board/PICO_W_ENVIRO/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 # cmake file for Pimoroni Enviro with Raspberry Pi Pico W
-set(MICROPY_BOARD PICO_W)
+set(MICROPY_BOARD RPI_PICO_W)
+set(PICO_BOARD "pico_w")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)

diff --git a/micropython/board/PICO_W_INKY/mpconfigboard.cmake b/micropython/board/PICO_W_INKY/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 # cmake file for Pimoroni Inky with Raspberry Pi Pico W
-set(MICROPY_BOARD PICO_W)
+set(MICROPY_BOARD RPI_PICO_W)
+set(PICO_BOARD "pico_w")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)

diff --git a/micropython/board/PICO/board.json → micropython/board/RPI_PICO/board.json b/micropython/board/PICO/board.json → micropython/board/RPI_PICO/board.json
diff --git a/micropython/board/PICO/manifest.py → micropython/board/RPI_PICO/manifest.py b/micropython/board/PICO/manifest.py → micropython/board/RPI_PICO/manifest.py
diff --git a/micropython/board/PICO/mpconfigboard.cmake → ...python/board/RPI_PICO/mpconfigboard.cmake b/micropython/board/PICO/mpconfigboard.cmake → ...python/board/RPI_PICO/mpconfigboard.cmake
@@ -1,4 +1,5 @@
 # cmake file for Raspberry Pi Pico
+set(PICO_BOARD "pico")
 
 # Board specific version of the frozen manifest
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)

diff --git a/micropython/board/PICO/mpconfigboard.h → micropython/board/RPI_PICO/mpconfigboard.h b/micropython/board/PICO/mpconfigboard.h → micropython/board/RPI_PICO/mpconfigboard.h
diff --git a/micropython/board/PICO/pins.csv → micropython/board/RPI_PICO/pins.csv b/micropython/board/PICO/pins.csv → micropython/board/RPI_PICO/pins.csv
diff --git a/micropython/board/PICO_W/board.json → micropython/board/RPI_PICO_W/board.json b/micropython/board/PICO_W/board.json → micropython/board/RPI_PICO_W/board.json
diff --git a/micropython/board/PICO_W/manifest.py → micropython/board/RPI_PICO_W/manifest.py b/micropython/board/PICO_W/manifest.py → micropython/board/RPI_PICO_W/manifest.py
diff --git a/micropython/board/PICO_W/mpconfigboard.cmake → ...thon/board/RPI_PICO_W/mpconfigboard.cmake b/micropython/board/PICO_W/mpconfigboard.cmake → ...thon/board/RPI_PICO_W/mpconfigboard.cmake
@@ -1,4 +1,5 @@
 # cmake file for Raspberry Pi Pico W
+set(PICO_BOARD "pico_w")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)

diff --git a/micropython/board/PICO_W/mpconfigboard.h → micropython/board/RPI_PICO_W/mpconfigboard.h b/micropython/board/PICO_W/mpconfigboard.h → micropython/board/RPI_PICO_W/mpconfigboard.h
diff --git a/micropython/board/PICO_W/pins.csv → micropython/board/RPI_PICO_W/pins.csv b/micropython/board/PICO_W/pins.csv → micropython/board/RPI_PICO_W/pins.csv