Skip to content

Commit 28f5a14

Browse files
committed
Merge branch 'rpi_pico-picolibc' into keithp-sdk-1.0-all
2 parents c590e76 + 4bae387 commit 28f5a14

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

modules/hal_rpi_pico/bootloader/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ target_include_directories(boot_stage2 PUBLIC
4545

4646
target_link_options(boot_stage2 PRIVATE
4747
"-nostartfiles"
48-
"--specs=nosys.specs"
49-
"LINKER:--script=${boot_stage_dir}/boot_stage2.ld"
48+
"--specs=picolibc.specs"
49+
"-T${boot_stage_dir}/boot_stage2.ld"
5050
)
5151

5252
# The second stage bootloader is compiled without kconfig definitions.

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ manifest:
231231
- hal
232232
- name: hal_rpi_pico
233233
path: modules/hal/rpi_pico
234-
revision: 5a981c7c29e3846646549a1902183684f0147e1d
234+
revision: b547a36a722af7787e5f55b551fd6ce72dcba5a4
235235
groups:
236236
- hal
237237
- name: hal_silabs

0 commit comments

Comments
 (0)