8000 rp2: Rename PICO, PICO_W to RPI_PICO, RPI_PICO_W. · micropython/micropython@e2d120f · GitHub
[go: up one dir, main page]
Skip to content

Commit e2d120f

Browse files
jimmojimmo
committed
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>
1 parent 82eca9a commit e2d120f

11 files changed

+9
-3
lines changed

‎ports/rp2/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ set(MICROPY_PORT_DIR ${CMAKE_CURRENT_LIST_DIR})
2626

2727
# Set the board if it's not already set.
2828
if(NOT MICROPY_BOARD)
29-
set(MICROPY_BOARD PICO)
29+
set(MICROPY_BOARD RPI_PICO)
3030
endif()
3131

3232
# Set the board directory and check that it exists.

‎ports/rp2/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ ifdef BOARD_DIR
88
# the path as the board name.
99
BOARD ?= $(notdir $(BOARD_DIR:/=))
1010
else
11-
# If not given on the command line, then default to PICO.
12-
BOARD ?= PICO
11+
# If not given on the command line, then default to RPI_PICO.
12+
BOARD ?= RPI_PICO
1313
BOARD_DIR ?= boards/$(BOARD)
1414
endif
1515

1616
ifeq ($(wildcard $(BOARD_DIR)/.),)
17+
ifeq ($(findstring boards/PICO,$(BOARD_DIR)),boards/PICO)
18+
$(warning The PICO* boards have been renamed to RPI_PICO*)
19+
endif
1720
$(error Invalid BOARD specified: $(BOARD_DIR))
1821
endif
1922

‎ports/rp2/boards/PICO/board.json renamed to ‎ports/rp2/boards/RPI_PICO/board.json

File renamed without changes.

‎ports/rp2/boards/PICO/mpconfigboard.cmake renamed to ‎ports/rp2/boards/RPI_PICO/mpconfigboard.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
# cmake file for Raspberry Pi Pico
2+
set(PICO_BOARD "pico")

‎ports/rp2/boards/PICO/mpconfigboard.h renamed to ‎ports/rp2/boards/RPI_PICO/mpconfigboard.h

File renamed without changes.

‎ports/rp2/boards/PICO/pins.csv renamed to ‎ports/rp2/boards/RPI_PICO/pins.csv

File renamed without changes.

‎ports/rp2/boards/PICO_W/board.json renamed to ‎ports/rp2/boards/RPI_PICO_W/board.json

File renamed without changes.

‎ports/rp2/boards/PICO_W/manifest.py renamed to ‎ports/rp2/boards/RPI_PICO_W/manifest.py

File renamed without changes.

‎ports/rp2/boards/PICO_W/mpconfigboard.cmake renamed to ‎ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# cmake file for Raspberry Pi Pico W
22

3+
set(PICO_BOARD "pico_w")
4+
35
# The C malloc is needed by cyw43-driver Bluetooth
46
set(MICROPY_C_HEAP_SIZE 4096)
57

‎ports/rp2/boards/PICO_W/mpconfigboard.h renamed to ‎ports/rp2/boards/RPI_PICO_W/mpconfigboard.h

File renamed without changes.

‎ports/rp2/boards/PICO_W/pins.csv renamed to ‎ports/rp2/boards/RPI_PICO_W/pins.csv

File renamed without changes.

0 commit comments

Comments
 (0)
0