fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

rp2: Rename PICO, PICO_W to RPI_PICO, RPI_PICO_W.

Browse Source 
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 <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2023-08-16 13:13:01 +10:00
parent ef03ca8bf2
commit 873bd00ad4
12 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/rp2/CMakeLists.txt
View File

@ -26,7 +26,7 @@ set(MICROPY_PORT_DIR ${CMAKE_CURRENT_LIST_DIR})
# Set the board if it's not already set. # Set the board if it's not already set.
if(NOT MICROPY_BOARD) if(NOT MICROPY_BOARD)
set(MICROPY_BOARD PICO) set(MICROPY_BOARD RPI_PICO)
endif() endif()
# Set the board directory and check that it exists. # Set the board directory and check that it exists.

7
ports/rp2/Makefile
View File

@ -8,12 +8,15 @@ ifdef BOARD_DIR
# the path as the board name. # the path as the board name.
BOARD ?= $(notdir $(BOARD_DIR:/=)) BOARD ?= $(notdir $(BOARD_DIR:/=))
else else
# If not given on the command line, then default to PICO. # If not given on the command line, then default to RPI_PICO.
BOARD ?= PICO BOARD ?= RPI_PICO
BOARD_DIR ?= boards/$(BOARD) BOARD_DIR ?= boards/$(BOARD)
endif endif
ifeq ($(wildcard $(BOARD_DIR)/.),) 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)) $(error Invalid BOARD specified: $(BOARD_DIR))
endif endif

0
ports/rp2/boards/PICO/board.json → ports/rp2/boards/RPI_PICO/board.json
View File

1
ports/rp2/boards/PICO/mpconfigboard.cmake → ports/rp2/boards/RPI_PICO/mpconfigboard.cmake
View File

@ -1 +1,2 @@
# cmake file for Raspberry Pi Pico # cmake file for Raspberry Pi Pico
set(PICO_BOARD "pico")

0
ports/rp2/boards/PICO/mpconfigboard.h → ports/rp2/boards/RPI_PICO/mpconfigboard.h
View File

0
ports/rp2/boards/PICO/pins.csv → ports/rp2/boards/RPI_PICO/pins.csv
View File

0
ports/rp2/boards/PICO_W/board.json → ports/rp2/boards/RPI_PICO_W/board.json
View File

0
ports/rp2/boards/PICO_W/manifest.py → ports/rp2/boards/RPI_PICO_W/manifest.py
View File

2
ports/rp2/boards/PICO_W/mpconfigboard.cmake → ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
View File

@ -1,5 +1,7 @@
# cmake file for Raspberry Pi Pico W # cmake file for Raspberry Pi Pico W
set(PICO_BOARD "pico_w")
# The C malloc is needed by cyw43-driver Bluetooth # The C malloc is needed by cyw43-driver Bluetooth
set(MICROPY_C_HEAP_SIZE 4096) set(MICROPY_C_HEAP_SIZE 4096)

0
ports/rp2/boards/PICO_W/mpconfigboard.h → ports/rp2/boards/RPI_PICO_W/mpconfigboard.h
View File

0
ports/rp2/boards/PICO_W/pins.csv → ports/rp2/boards/RPI_PICO_W/pins.csv
View File

4
tools/ci.sh
View File

@ -272,8 +272,8 @@ function ci_rp2_build {
make ${MAKEOPTS} -C mpy-cross make ${MAKEOPTS} -C mpy-cross
make ${MAKEOPTS} -C ports/rp2 submodules make ${MAKEOPTS} -C ports/rp2 submodules
make ${MAKEOPTS} -C ports/rp2 make ${MAKEOPTS} -C ports/rp2
make ${MAKEOPTS} -C ports/rp2 BOARD=PICO_W submodules make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_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 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 submodules
make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO