From 873bd00ad48b0c4a2b3addb95964ac0ecbb918f2 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Wed, 16 Aug 2023 13:13:01 +1000 Subject: [PATCH] rp2: Rename PICO, PICO_W to RPI_PICO, RPI_PICO_W. PICO might not always be a unique name across all ports, and the convention generally for other boards is to do VENDOR_BOARD. This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared --- ports/rp2/CMakeLists.txt | 2 +- ports/rp2/Makefile | 7 +++++-- ports/rp2/boards/{PICO => RPI_PICO}/board.json | 0 ports/rp2/boards/{PICO => RPI_PICO}/mpconfigboard.cmake | 1 + ports/rp2/boards/{PICO => RPI_PICO}/mpconfigboard.h | 0 ports/rp2/boards/{PICO => RPI_PICO}/pins.csv | 0 ports/rp2/boards/{PICO_W => RPI_PICO_W}/board.json | 0 ports/rp2/boards/{PICO_W => RPI_PICO_W}/manifest.py | 0 .../rp2/boards/{PICO_W => RPI_PICO_W}/mpconfigboard.cmake | 2 ++ ports/rp2/boards/{PICO_W => RPI_PICO_W}/mpconfigboard.h | 0 ports/rp2/boards/{PICO_W => RPI_PICO_W}/pins.csv | 0 tools/ci.sh | 4 ++-- 12 files changed, 11 insertions(+), 5 deletions(-) rename ports/rp2/boards/{PICO => RPI_PICO}/board.json (100%) rename ports/rp2/boards/{PICO => RPI_PICO}/mpconfigboard.cmake (60%) rename ports/rp2/boards/{PICO => RPI_PICO}/mpconfigboard.h (100%) rename ports/rp2/boards/{PICO => RPI_PICO}/pins.csv (100%) rename ports/rp2/boards/{PICO_W => RPI_PICO_W}/board.json (100%) rename ports/rp2/boards/{PICO_W => RPI_PICO_W}/manifest.py (100%) rename ports/rp2/boards/{PICO_W => RPI_PICO_W}/mpconfigboard.cmake (93%) rename ports/rp2/boards/{PICO_W => RPI_PICO_W}/mpconfigboard.h (100%) rename ports/rp2/boards/{PICO_W => RPI_PICO_W}/pins.csv (100%) diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt index 4334a0aba9..7718697b43 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 fdca11d11e..8399b9e98a 100644 --- a/ports/rp2/Makefile +++ b/ports/rp2/Makefile @@ -8,12 +8,15 @@ 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 diff --git a/ports/rp2/boards/PICO/board.json b/ports/rp2/boards/RPI_PICO/board.json similarity index 100% rename from ports/rp2/boards/PICO/board.json rename to ports/rp2/boards/RPI_PICO/board.json 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 3a40ca2871..13269e81e5 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 100% rename from ports/rp2/boards/PICO_W/board.json rename to ports/rp2/boards/RPI_PICO_W/board.json 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 e6db8dda6a..5610c313e6 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/tools/ci.sh b/tools/ci.sh index f60ba0fd51..33dc58d6b8 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -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