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 <jim.mussared@gmail.com>
This commit is contained in:
parent
ef03ca8bf2
commit
873bd00ad4
@ -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.
|
||||
|
@ -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
|
||||
|
||||
|
@ -1 +1,2 @@
|
||||
# cmake file for Raspberry Pi Pico
|
||||
set(PICO_BOARD "pico")
|
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user