From 037b813286f14e331bb3b00859945860cc6e22a0 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Mon, 2 Jun 2025 18:07:06 -0400
Subject: [PATCH 1/4] rpi_pico: make it work with picolibc

The picolibc changes were merged upstream; switch to using that revision.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 747d03276670..04f00cbbb2bb 100644
--- a/west.yml
+++ b/west.yml
@@ -231,7 +231,7 @@ manifest:
         - hal
     - name: hal_rpi_pico
       path: modules/hal/rpi_pico
-      revision: 5a981c7c29e3846646549a1902183684f0147e1d
+      revision: b547a36a722af7787e5f55b551fd6ce72dcba5a4
       groups:
         - hal
     - name: hal_silabs

From ffe02da4f71da92801c556efa58eb8a6de8d5b39 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 4 Jun 2025 12:24:54 -0700
Subject: [PATCH 2/4] modules/hal_rpi_pico: Switch boot_stage2 to picolibc

Now that rpi_pico can use picolibc, let's switch to it.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 modules/hal_rpi_pico/bootloader/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hal_rpi_pico/bootloader/CMakeLists.txt b/modules/hal_rpi_pico/bootloader/CMakeLists.txt
index 7e8d39d8951f..241ba3c23c30 100644
--- a/modules/hal_rpi_pico/bootloader/CMakeLists.txt
+++ b/modules/hal_rpi_pico/bootloader/CMakeLists.txt
@@ -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.

From f45b15f05f5cf0e4097d636eee3f6704dd3d602c Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 4 Jun 2025 18:37:37 -0700
Subject: [PATCH 3/4] modules: Update trusted-firmware-m for picolibc

This is queued for merging but not yet upstream.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 04f00cbbb2bb..3fcde347af7f 100644
--- a/west.yml
+++ b/west.yml
@@ -358,7 +358,7 @@ manifest:
       groups:
         - tee
     - name: trusted-firmware-m
-      revision: 021e2bbd50c215e41710a72e05abce3224f074a7
+      revision: pull/134/head
       path: modules/tee/tf-m/trusted-firmware-m
       groups:
         - tee

From 96aaf106a4c637d454e611e9c422d4eafb17a16a Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 11 Jul 2025 15:42:37 -0700
Subject: [PATCH 4/4] modules/cmsis_6: Add picolibc support patch

This allows cmsis_6 to compile against picolibc

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 west.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/west.yml b/west.yml
index 3fcde347af7f..831dc9f8a554 100644
--- a/west.yml
+++ b/west.yml
@@ -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