-
Notifications
You must be signed in to change notification settings - Fork 8.1k
soc: raspberrypi: rp2350: support AMP builds #93379
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
dsseng
wants to merge
6
commits into
zephyrproject-rtos:main
Choose a base branch
from
dsseng:rp2350-cpu1-boot
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6c4ec1e
dts: raspberrypi: rpi_pico-led: disable by default
dsseng 50124ac
dts: arm: rpi_pico2: do not enable peripherals in the common dtsi
dsseng e13256b
boards: rpi_pico2: create CPU0/1 targets
dancollins 80b253c
soc: rp2350: add support for building for CPU1 with a code partition
dsseng 2994cfe
soc: rp2350: skip clock initialisation for cpu1
dancollins a0805a6
soc: raspberrypi: rp2350: support booting CPU1
dancollins File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,3 +8,7 @@ | |
|
||
#include "rpi_pico-common.dtsi" | ||
#include "../common/rpi_pico-led.dtsi" | ||
|
||
&led0 { | ||
status = "okay"; | ||
}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33_cpu0.dts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
/* | ||
* Copyright (c) 2024 Andrew Featherstone | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
/dts-v1/; | ||
|
||
/* The build system assumes that there's a cpucluster-specific file. | ||
* | ||
* This file provides composition of the device tree: | ||
* 1. The common features of the SoC | ||
* 2. Core-specific configuration. | ||
* 3. Board-specific configuration. | ||
*/ | ||
#include <raspberrypi/rpi_pico/rp2350a.dtsi> | ||
#include <raspberrypi/rpi_pico/m33.dtsi> | ||
|
||
/* there's nothing specific to the Cortex-M33 cores vs the (not yet | ||
* implemented) Hazard3 cores. | ||
*/ | ||
#include "rpi_pico2.dtsi" | ||
#include "rpi_pico2_split.dtsi" | ||
|
||
/delete-node/ &cpu1; | ||
|
||
/ { | ||
chosen { | ||
zephyr,sram = &sram0_cpu0; | ||
zephyr,flash = &flash0; | ||
zephyr,console = &uart0; | ||
zephyr,shell-uart = &uart0; | ||
}; | ||
|
||
aliases { | ||
watchdog0 = &wdt0; | ||
}; | ||
}; | ||
|
||
&uart0 { | ||
status = "okay"; | ||
}; | ||
|
||
gpio0_lo: &gpio0 { | ||
status = "okay"; | ||
}; | ||
|
||
&led0 { | ||
status = "okay"; | ||
}; | ||
|
||
&flash0 { | ||
status = "okay"; | ||
}; | ||
|
||
&spi0 { | ||
status = "okay"; | ||
}; | ||
|
||
&i2c0 { | ||
status = "okay"; | ||
}; | ||
|
||
&i2c1 { | ||
status = "okay"; | ||
}; | ||
|
||
&adc { | ||
status = "okay"; | ||
}; | ||
|
||
&pwm { | ||
status = "okay"; | ||
}; | ||
|
||
&timer0 { | ||
status = "okay"; | ||
}; | ||
|
||
&wdt0 { | ||
status = "okay"; | ||
}; |
16 changes: 16 additions & 0 deletions
16
boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33_cpu0.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
identifier: rpi_pico2/rp2350a/m33_cpu0 | ||
name: Raspberry Pi Pico 2 (Cortex-M33 CPU0) | ||
type: mcu | ||
arch: arm | ||
flash: 4096 | ||
ram: 256 | ||
toolchain: | ||
- zephyr | ||
- gnuarmemb | ||
supported: | ||
- clock | ||
- counter | ||
- hwinfo | ||
- i2c | ||
- pwm | ||
- uart |
13 changes: 13 additions & 0 deletions
13
boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33_cpu0_defconfig
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# This configuration is orthogonal to whether the Cortex-M33 or Hazard3 cores | ||
# are in use, but Zephyr does not support providing a qualifier-agnostic | ||
# _defconfig file. | ||
CONFIG_BUILD_OUTPUT_HEX=y | ||
CONFIG_BUILD_OUTPUT_UF2=y | ||
CONFIG_CLOCK_CONTROL=y | ||
CONFIG_CONSOLE=y | ||
CONFIG_GPIO=y | ||
CONFIG_RESET=y | ||
CONFIG_SERIAL=y | ||
CONFIG_UART_CONSOLE=y | ||
CONFIG_UART_INTERRUPT_DRIVEN=y | ||
CONFIG_USE_DT_CODE_PARTITION=y |
40 changes: 40 additions & 0 deletions
40
boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33_cpu1.dts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* | ||
* Copyright (c) 2024 Andrew Featherstone | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
/dts-v1/; | ||
|
||
/* The build system assumes that there's a cpucluster-specific file. | ||
* | ||
* This file provides composition of the device tree: | ||
* 1. The common features of the SoC | ||
* 2. Core-specific configuration. | ||
* 3. Board-specific configuration. | ||
*/ | ||
#include <raspberrypi/rpi_pico/rp2350a.dtsi> | ||
#include <raspberrypi/rpi_pico/m33.dtsi> | ||
|
||
/* there's nothing specific to the Cortex-M33 cores vs the (not yet | ||
* implemented) Hazard3 cores. | ||
*/ | ||
#include "rpi_pico2.dtsi" | ||
#include "rpi_pico2_split.dtsi" | ||
|
||
/delete-node/ &cpu0; | ||
|
||
/ { | ||
chosen { | ||
zephyr,sram = &sram0_cpu1; | ||
// Flash is only assigned to CPU0, CPU1 must | ||
// execute from RAM to avoid access conflicts | ||
// You can add a code-partition | ||
// Then add image-source to the &cpu1_launcher on cpu0 | ||
// zephyr,code-partition = &cpu1_slot0_partition; | ||
}; | ||
}; | ||
|
||
zephyr_udc0: &usbd { | ||
status = "okay"; | ||
}; |
13 changes: 13 additions & 0 deletions
13
boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33_cpu1.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
identifier: rpi_pico2/rp2350a/m33_cpu1 | ||
name: Raspberry Pi Pico 2 (Cortex-M33 CPU1) | ||
type: mcu | ||
arch: arm | ||
flash: 0 | ||
ram: 256 | ||
toolchain: | ||
- zephyr | ||
- gnuarmemb | ||
supported: | ||
- hwinfo | ||
- uart | ||
- usbd |
13 changes: 13 additions & 0 deletions
13
boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33_cpu1_defconfig
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# This configuration is orthogonal to whether the Cortex-M33 or Hazard3 cores | ||
# are in use, but Zephyr does not support providing a qualifier-agnostic | ||
# _defconfig file. | ||
CONFIG_BUILD_OUTPUT_HEX=y | ||
CONFIG_BUILD_OUTPUT_UF2=y | ||
CONFIG_CLOCK_CONTROL=y | ||
CONFIG_CONSOLE=y | ||
CONFIG_RESET=y | ||
CONFIG_SERIAL=y | ||
CONFIG_UART_CONSOLE=y | ||
CONFIG_UART_INTERRUPT_DRIVEN=y | ||
CONFIG_USE_DT_CODE_PARTITION=y | ||
CONFIG_XIP=n |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/* */
style comments