Skip to content

Commit 75f2822

Browse files
d-c-dd-c-d
authored
Merge branch 'raspberrypi:develop' into develop
2 parents 551bbcb + 93ea261 commit 75f2822

File tree

86 files changed

+1411
-408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1411
-408
lines changed

‎.github/workflows/choco_packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="gcc-arm-embedded" version="10.2.1" />
44
<package id="mingw" version="12.2.0" />
5-
<package id="ninja" version="1.11.1" />
5+
<package id="ninja" version="1.12.1" />
66
</packages>

‎bazel/config/BUILD.bazel‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,12 @@ int_flag(
186186
build_setting_default = 0,
187187
)
188188

189+
# PICO_BAZEL_CONFIG: PICO_TINYUSB_CONFIG, [Bazel only] The library that provides TinyUSB config header (e.g. tusb_config.h), default=//src/rp2_common/pico_stdio_usb:tusb_config, group=build
190+
label_flag(
191+
name = "PICO_TINYUSB_CONFIG",
192+
build_setting_default = "//src/rp2_common/pico_stdio_usb:tusb_config",
193+
)
194+
189195
# PICO_BAZEL_CONFIG: PICO_TINYUSB_LIB, [Bazel only] The library that provides TinyUSB, default=@tinyusb//:tinyusb, group=build
190196
label_flag(
191197
name = "PICO_TINYUSB_LIB",

‎cmake/pico_pre_load_platform.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ if (PICO_PREVIOUS_PLATFORM AND NOT PICO_PREVIOUS_PLATFORM STREQUAL PICO_PLATFORM
122122
The best practice is to use separate build directories for different platforms.")
123123
endif()
124124
set(PICO_PLATFORM ${PICO_PLATFORM} CACHE STRING "PICO Build platform (e.g. rp2040, rp2350, rp2350-riscv, host)" FORCE)
125-
set(PICO_PREVIOUS_PLATFORM ${PICO_PLATFORM} CACHE STRING "Saved PICO Build platform (e.g. rp2040, rp2350, rp2350-riscv, host)" INTERNAL)
125+
set(PICO_PREVIOUS_PLATFORM ${PICO_PLATFORM} CACHE INTERNAL "Saved PICO Build platform (e.g. rp2040, rp2350, rp2350-riscv, host)")
126126

127127
# PICO_CMAKE_CONFIG: PICO_CMAKE_PRELOAD_PLATFORM_FILE, Custom CMake file to use to set up the platform environment, type=string, group=build
128128
set(PICO_CMAKE_PRELOAD_PLATFORM_FILE ${PICO_CMAKE_PRELOAD_PLATFORM_FILE} CACHE INTERNAL "")

‎docs/index.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
* \cond hardware_watchdog \defgroup hardware_watchdog hardware_watchdog \endcond
4949
* \cond hardware_xip_cache \defgroup hardware_xip_cache hardware_xip_cache \endcond
5050
* \cond hardware_xosc \defgroup hardware_xosc hardware_xosc \endcond
51-
* \cond hardware_powman hardware_powman
52-
* \cond hardware_hazard3 hardware_hazard3
53-
* \cond hardware_riscv hardware_riscv
51+
* \cond hardware_powman \defgroup hardware_powman hardware_powman \endcond
52+
* \cond hardware_hazard3 \defgroup hardware_hazard3 hardware_hazard3 \endcond
53+
* \cond hardware_riscv \defgroup hardware_riscv hardware_riscv \endcond
5454
5555
* @}
5656
*

‎src/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ alias(
1919
"//src/rp2_common/boot_bootrom_headers:__pkg__",
2020
"//src/rp2_common/hardware_boot_lock:__pkg__",
2121
"//src/rp2_common/pico_flash:__pkg__",
22+
"//src/rp2_common/hardware_rcp:__pkg__",
2223
],
2324
)
2425

‎src/boards/include/boards/amethyst_fpga.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
// SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
1010
// -----------------------------------------------------
1111

12-
// FIXME delete this file before release (board file for Amethyst FPGA platform)
13-
1412
// pico_cmake_set PICO_PLATFORM=rp2350
1513

1614
#ifndef _BOARDS_AMETHYST_FPGA_H

‎src/boards/include/boards/eelectronicparts_picomini_16mb.h‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/*
2+
* Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
3+
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*/
6+
7+
// -----------------------------------------------------
8+
// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
9+
// SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
10+
// -----------------------------------------------------
11+
//
12+
//------------------------------------------------------------------------------------------
13+
// Board definition for the E Electronic Parts "Pico_Mini RP2040"
14+
//
15+
// This header may be included by other board headers as "boards/eelectronicparts_picomini_16mb.h"
16+
17+
// pico_cmake_set PICO_PLATFORM=rp2040
18+
19+
#ifndef _BOARDS_EELECTRONICPARTS_PICOMINI_16MB_H
20+
#define _BOARDS_EELECTRONICPARTS_PICOMINI_16MB_H
21+
22+
// For board detection
23+
#define EELECTRONICPARTS_PICOMINI_16MB
24+
25+
#ifndef PICO_DEFAULT_UART
26+
#define PICO_DEFAULT_UART 0
27+
#endif
28+
#ifndef PICO_DEFAULT_UART_TX_PIN
29+
#define PICO_DEFAULT_UART_TX_PIN 0
30+
#endif
31+
#ifndef PICO_DEFAULT_UART_RX_PIN
32+
#define PICO_DEFAULT_UART_RX_PIN 1
33+
#endif
34+
35+
#ifndef PICO_DEFAULT_LED_PIN
36+
#define PICO_DEFAULT_LED_PIN 25
37+
#endif
38+
#ifndef PICO_DEFAULT_WS2812_PIN
39+
#define PICO_DEFAULT_WS2812_PIN 16
40+
#endif
41+
42+
#ifndef PICO_DEFAULT_I2C
43+
#define PICO_DEFAULT_I2C 0
44+
#endif
45+
#ifndef PICO_DEFAULT_I2C_SDA_PIN
46+
#define PICO_DEFAULT_I2C_SDA_PIN 16
47+
#endif
48+
#ifndef PICO_DEFAULT_I2C_SCL_PIN
49+
#define PICO_DEFAULT_I2C_SCL_PIN 17
50+
#endif
51+
52+
// --- SPI ---
53+
#ifndef PICO_DEFAULT_SPI
54+
#define PICO_DEFAULT_SPI 1
55+
#endif
56+
#ifndef PICO_DEFAULT_SPI_SCK_PIN
57+
#define PICO_DEFAULT_SPI_SCK_PIN 10
58+
#endif
59+
#ifndef PICO_DEFAULT_SPI_TX_PIN
60+
#define PICO_DEFAULT_SPI_TX_PIN 11
61+
#endif
62+
#ifndef PICO_DEFAULT_SPI_RX_PIN
63+
#define PICO_DEFAULT_SPI_RX_PIN 12
64+
#endif
65+
#ifndef PICO_DEFAULT_SPI_CSN_PIN
66+
#define PICO_DEFAULT_SPI_CSN_PIN 13
67+
#endif
68+
69+
#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
70+
71+
#ifndef PICO_FLASH_SPI_CLKDIV
72+
#define PICO_FLASH_SPI_CLKDIV 2
73+
#endif
74+
75+
// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
76+
#ifndef PICO_FLASH_SIZE_BYTES
77+
// This board comes in 2MB, 4MB, 8MB, and 16MB variants
78+
#define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
79+
#endif
80+
// All boards have B1 RP2040
81+
82+
#ifndef PICO_RP2040_B0_SUPPORTED
83+
#define PICO_RP2040_B0_SUPPORTED 0
84+
#endif
85+
86+
#endif

‎src/boards/include/boards/eelectronicparts_picomini_2mb.h‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/*
2+
* Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
3+
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*/
6+
7+
// -----------------------------------------------------
8+
// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
9+
// SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
10+
// -----------------------------------------------------
11+
//
12+
//------------------------------------------------------------------------------------------
13+
// Board definition for the E Electronic Parts "Pico_Mini RP2040"
14+
//
15+
// This header may be included by other board headers as "boards/eelectronicparts_picomini_2mb.h"
16+
17+
// pico_cmake_set PICO_PLATFORM=rp2040
18+
19+
#ifndef _BOARDS_EELECTRONICPARTS_PICOMINI_2MB_H
20+
#define _BOARDS_EELECTRONICPARTS_PICOMINI_2MB_H
21+
22+
// For board detection
23+
#define EELECTRONICPARTS_PICOMINI_2MB
24+
25+
#ifndef PICO_DEFAULT_UART
26+
#define PICO_DEFAULT_UART 0
27+
#endif
28+
#ifndef PICO_DEFAULT_UART_TX_PIN
29+
#define PICO_DEFAULT_UART_TX_PIN 0
30+
#endif
31+
#ifndef PICO_DEFAULT_UART_RX_PIN
32+
#define PICO_DEFAULT_UART_RX_PIN 1
33+
#endif
34+
35+
#ifndef PICO_DEFAULT_LED_PIN
36+
#define PICO_DEFAULT_LED_PIN 25
37+
#endif
38+
#ifndef PICO_DEFAULT_WS2812_PIN
39+
#define PICO_DEFAULT_WS2812_PIN 16
40+
#endif
41+
42+
#ifndef PICO_DEFAULT_I2C
43+
#define PICO_DEFAULT_I2C 0
44+
#endif
45+
#ifndef PICO_DEFAULT_I2C_SDA_PIN
46+
#define PICO_DEFAULT_I2C_SDA_PIN 16
47+
#endif
48+
#ifndef PICO_DEFAULT_I2C_SCL_PIN
49+
#define PICO_DEFAULT_I2C_SCL_PIN 17
50+
#endif
51+
52+
// --- SPI ---
53+
#ifndef PICO_DEFAULT_SPI
54+
#define PICO_DEFAULT_SPI 1
55+
#endif
56+
#ifndef PICO_DEFAULT_SPI_SCK_PIN
57+
#define PICO_DEFAULT_SPI_SCK_PIN 10
58+
#endif
59+
#ifndef PICO_DEFAULT_SPI_TX_PIN
60+
#define PICO_DEFAULT_SPI_TX_PIN 11
61+
#endif
62+
#ifndef PICO_DEFAULT_SPI_RX_PIN
63+
#define PICO_DEFAULT_SPI_RX_PIN 12
64+
#endif
65+
#ifndef PICO_DEFAULT_SPI_CSN_PIN
66+
#define PICO_DEFAULT_SPI_CSN_PIN 13
67+
#endif
68+
69+
#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
70+
71+
#ifndef PICO_FLASH_SPI_CLKDIV
72+
#define PICO_FLASH_SPI_CLKDIV 2
73+
#endif
74+
75+
// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
76+
#ifndef PICO_FLASH_SIZE_BYTES
77+
// This board comes in 2MB, 4MB, 8MB, and 16MB variants
78+
#define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
79+
#endif
80+
// All boards have B1 RP2040
81+
82+
#ifndef PICO_RP2040_B0_SUPPORTED
83+
#define PICO_RP2040_B0_SUPPORTED 0
84+
#endif
85+
86+
#endif

‎src/boards/include/boards/eelectronicparts_picomini_4mb.h‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/*
2+
* Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
3+
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*/
6+
7+
// -----------------------------------------------------
8+
// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
9+
// SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
10+
// -----------------------------------------------------
11+
//
12+
//------------------------------------------------------------------------------------------
13+
// Board definition for the E Electronic Parts "Pico_Mini RP2040"
14+
//
15+
// This header may be included by other board headers as "boards/eelectronicparts_picomini_4mb.h"
16+
17+
// pico_cmake_set PICO_PLATFORM=rp2040
18+
19+
#ifndef _BOARDS_EELECTRONICPARTS_PICOMINI_4MB_H
20+
#define _BOARDS_EELECTRONICPARTS_PICOMINI_4MB_H
21+
22+
// For board detection
23+
#define EELECTRONICPARTS_PICOMINI_4MB
24+
25+
#ifndef PICO_DEFAULT_UART
26+
#define PICO_DEFAULT_UART 0
27+
#endif
28+
#ifndef PICO_DEFAULT_UART_TX_PIN
29+
#define PICO_DEFAULT_UART_TX_PIN 0
30+
#endif
31+
#ifndef PICO_DEFAULT_UART_RX_PIN
32+
#define PICO_DEFAULT_UART_RX_PIN 1
33+
#endif
34+
35+
#ifndef PICO_DEFAULT_LED_PIN
36+
#define PICO_DEFAULT_LED_PIN 25
37+
#endif
38+
#ifndef PICO_DEFAULT_WS2812_PIN
39+
#define PICO_DEFAULT_WS2812_PIN 16
40+
#endif
41+
42+
#ifndef PICO_DEFAULT_I2C
43+
#define PICO_DEFAULT_I2C 0
44+
#endif
45+
#ifndef PICO_DEFAULT_I2C_SDA_PIN
46+
#define PICO_DEFAULT_I2C_SDA_PIN 16
47+
#endif
48+
#ifndef PICO_DEFAULT_I2C_SCL_PIN
49+
#define PICO_DEFAULT_I2C_SCL_PIN 17
50+
#endif
51+
52+
// --- SPI ---
53+
#ifndef PICO_DEFAULT_SPI
54+
#define PICO_DEFAULT_SPI 1
55+
#endif
56+
#ifndef PICO_DEFAULT_SPI_SCK_PIN
57+
#define PICO_DEFAULT_SPI_SCK_PIN 10
58+
#endif
59+
#ifndef PICO_DEFAULT_SPI_TX_PIN
60+
#define PICO_DEFAULT_SPI_TX_PIN 11
61+
#endif
62+
#ifndef PICO_DEFAULT_SPI_RX_PIN
63+
#define PICO_DEFAULT_SPI_RX_PIN 12
64+
#endif
65+
#ifndef PICO_DEFAULT_SPI_CSN_PIN
66+
#define PICO_DEFAULT_SPI_CSN_PIN 13
67+
#endif
68+
69+
#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
70+
71+
#ifndef PICO_FLASH_SPI_CLKDIV
72+
#define PICO_FLASH_SPI_CLKDIV 2
73+
#endif
74+
75+
// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (4 * 1024 * 1024)
76+
#ifndef PICO_FLASH_SIZE_BYTES
77+
// This board comes in 2MB, 4MB, 8MB, and 16MB variants
78+
#define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
79+
#endif
80+
// All boards have B1 RP2040
81+
82+
#ifndef PICO_RP2040_B0_SUPPORTED
83+
#define PICO_RP2040_B0_SUPPORTED 0
84+
#endif
85+
86+
#endif

0 commit comments

Comments
 (0)