From 00a0adfe70855bc023782f6075e79ed43397b422 Mon Sep 17 00:00:00 2001
From: Noah Pendleton <2538614+noahp@users.noreply.github.com>
Date: Tue, 20 May 2025 11:35:28 -0400
Subject: [PATCH 1/4] Zephyr 4.1.0 + Memfault SDK update

---
 west.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/west.yml b/west.yml
index adff06f..85f7e14 100644
--- a/west.yml
+++ b/west.yml
@@ -2,7 +2,7 @@ manifest:
   projects:
     - name: zephyr
       url: https://github.com/zephyrproject-rtos/zephyr
-      revision: v4.0.0
+      revision: v4.1.0
       import:
         # Limit the Zephyr modules to the required set
         name-allowlist:
@@ -13,4 +13,4 @@ manifest:
     - name: memfault-firmware-sdk
       url: https://github.com/memfault/memfault-firmware-sdk
       path: modules/lib/memfault-firmware-sdk
-      revision: 1.17.0
+      revision: 1.24.0

From db0124456c46b2d28458d567c0442265bc669854 Mon Sep 17 00:00:00 2001
From: Noah Pendleton <2538614+noahp@users.noreply.github.com>
Date: Tue, 27 May 2025 14:10:00 -0400
Subject: [PATCH 2/4] cache esp32 blobs

---
 .github/workflows/ci.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bae7e83..c6a6036 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,6 +33,20 @@ jobs:
           rm -rf .west
           west init -l zephyr-esp32-example
           west update --narrow -o=--depth=1
+
+      - name: Cache ESP32 Blobs
+        uses: actions/cache@v4
+        # the blobs are at /zephyr-workspace/modules/hal/espressif/zephyr/blobs
+        with:
+          path: zephyr-workspace/modules/hal/espressif/zephyr/blobs
+          key: zephyr-esp32-blobs-main-${{ hashFiles('/zephyr-workspace/zephyr/west.yml') }}
+          restore-keys: |
+            zephyr-esp32-blobs-main-
+
+      # fetch the ESP32 blobs
+      - name: ⬇️ Fetch ESP32 Blobs
+        run: |
+          cd zephyr-workspace
           west blobs fetch hal_espressif
 
       - name: 💾 Cache ~/.cache/ccache

From 967c1f50a652f233a93fdad266eceffa7de1c24a Mon Sep 17 00:00:00 2001
From: Noah Pendleton <2538614+noahp@users.noreply.github.com>
Date: Tue, 27 May 2025 14:14:52 -0400
Subject: [PATCH 3/4] zephyr workspace cache

---
 .github/workflows/ci.yml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c6a6036..4494584 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,29 +21,37 @@ jobs:
       CMAKE_PREFIX_PATH: /opt/toolchains
 
     steps:
-      - name: Checkout code
+      - name: 💾 Cache Zephyr Workspace
+        uses: actions/cache@v4
+        with:
+          path: zephyr-workspace
+          key: zephyr-workspace-${{ hashFiles('zephyr-workspace/zephyr/west.yml') }}
+
+      - name: 🧹 Clean Zephyr Manifest Directory
+        # Clean the manifest directory to ensure a fresh start
+        run: |
+          rm -rf zephyr-workspace/zephyr-esp32-example
+          rm -rf zephyr-workspace/.west
+
+      - name: ✅ Checkout code
         uses: actions/checkout@v4
         with:
           path: zephyr-workspace/zephyr-esp32-example
 
       - name: ♻️ Initialize Zephyr Workspace
-        # Set up the Zephyr workspace and install the Python dependencies
+        # Set up the Zephyr workspace
         run: |
           cd zephyr-workspace
           rm -rf .west
           west init -l zephyr-esp32-example
           west update --narrow -o=--depth=1
 
-      - name: Cache ESP32 Blobs
+      - name: 💾 Cache ESP32 Blobs
         uses: actions/cache@v4
-        # the blobs are at /zephyr-workspace/modules/hal/espressif/zephyr/blobs
         with:
           path: zephyr-workspace/modules/hal/espressif/zephyr/blobs
-          key: zephyr-esp32-blobs-main-${{ hashFiles('/zephyr-workspace/zephyr/west.yml') }}
-          restore-keys: |
-            zephyr-esp32-blobs-main-
+          key: zephyr-esp32-blobs-${{ hashFiles('zephyr-workspace/zephyr/west.yml') }}
 
-      # fetch the ESP32 blobs
       - name: ⬇️ Fetch ESP32 Blobs
         run: |
           cd zephyr-workspace

From 15ccdf6bf726d8ca3a88ddaf7c8cc35e17f24930 Mon Sep 17 00:00:00 2001
From: Noah Pendleton <2538614+noahp@users.noreply.github.com>
Date: Tue, 27 May 2025 14:33:31 -0400
Subject: [PATCH 4/4] fix build issue on esp32s3

---
 boards/esp32s3_devkitc_esp32s3_procpu.overlay | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/boards/esp32s3_devkitc_esp32s3_procpu.overlay b/boards/esp32s3_devkitc_esp32s3_procpu.overlay
index b417db0..44eee6f 100644
--- a/boards/esp32s3_devkitc_esp32s3_procpu.overlay
+++ b/boards/esp32s3_devkitc_esp32s3_procpu.overlay
@@ -11,3 +11,8 @@
 &coretemp {
 	status = "okay";
 };
+
+/* 2MB psram. This assumes target board is the ESP32-S3-DevKitC-1-N8R2 */
+&psram0 {
+	size = <DT_SIZE_M(2)>;
+};