Skip to content

Switch bootloaders to picolibc #93470

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.

Sign up for GitHub

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
wants to merge 4 commits into
base: main
Choose a base branch
from
+5 −5
Open

Switch bootloaders to picolibc #93470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
037b813
rpi_pico: make it work with picolibc
nashif Jun 2, 2025
ffe02da
modules/hal_rpi_pico: Switch boot_stage2 to picolibc
keith-packard Jun 4, 2025
f45b15f
modules: Update trusted-firmware-m for picolibc
keith-packard Jun 5, 2025
96aaf10
modules/cmsis_6: Add picolibc support patch
keith-packard Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/hal_rpi_pico/bootloader/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ target_include_directories(boot_stage2 PUBLIC

target_link_options(boot_stage2 PRIVATE
"-nostartfiles"
"--specs=nosys.specs"
"LINKER:--script=${boot_stage_dir}/boot_stage2.ld"
"--specs=picolibc.specs"
"-T${boot_stage_dir}/boot_stage2.ld"
)

# The second stage bootloader is compiled without kconfig definitions.
Expand Down
6 changes: 3 additions & 3 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ manifest:
path: modules/lib/cmsis-nn
- name: cmsis_6
repo-path: CMSIS_6
revision: 06d952b6713a2ca41c9224a62075e4059402a151
revision: pull/5/head
path: modules/hal/cmsis_6
groups:
- hal
Expand Down Expand Up @@ -231,7 +231,7 @@ manifest:
- hal
- name: hal_rpi_pico
path: modules/hal/rpi_pico
revision: 5a981c7c29e3846646549a1902183684f0147e1d
revision: b547a36a722af7787e5f55b551fd6ce72dcba5a4
groups:
- hal
- name: hal_silabs
Expand Down Expand Up @@ -358,7 +358,7 @@ manifest:
groups:
- tee
- name: trusted-firmware-m
revision: 021e2bbd50c215e41710a72e05abce3224f074a7
revision: pull/134/head
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is queued for merging but not yet upstream.

Does this mean that you have submitted the changes upstream? (if so please link to that in the TF-M PR commits)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to the Zephyr repository (shown in the revision above). I suppose I should attempt to figure out how to submit upstream to tf-m.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, that looks extremely complicated. Can we get some review here first and see if this change is reasonable?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. I can also submit the changes upstream for you if needed.
Though I'm not qualified to review the changes in zephyrproject-rtos/trusted-firmware-m#134. I mentioned the PR to upstream maintainers so I hope they can also chime in to tell their opinions. (cc @Anton-TF @adeaarm)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're willing to shepherd the change upstream, that would be helpful (especially given their email-based submission process).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, the trusted-firmware-m changes are actually passing tests with both Zephyr SDK version 0.17 (+ a few patches) and SDK version 0.18 (alpha4 + a few patches). I think they're ready for review.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still find the commit message (This is queued for merging but not yet upstream.) a tad confusing, please update it when you make changes to the PR.

path: modules/tee/tf-m/trusted-firmware-m
groups:
- tee
Expand Down
Loading