From 7cace9391cbb7c9b8c898cbb3954a76f259517e7 Mon Sep 17 00:00:00 2001
From: Hugo McNally <hugo.mcnally@gmail.com>
Date: Tue, 30 Jul 2024 17:24:32 +0100
Subject: [PATCH] Moved back onto upstream CHERIoT RTOS

---
 cheriot-rtos       | 2 +-
 examples/xmake.lua | 2 +-
 flake.nix          | 2 +-
 tests/xmake.lua    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cheriot-rtos b/cheriot-rtos
index 6d8d482..9baefdb 160000
--- a/cheriot-rtos
+++ b/cheriot-rtos
@@ -1 +1 @@
-Subproject commit 6d8d48246e7f2695ef68c91db7a514dd87727a59
+Subproject commit 9baefdb3af9896f04cbd6e7b25ea65c1e14e9561
diff --git a/examples/xmake.lua b/examples/xmake.lua
index 42a9c3e..c2e080a 100644
--- a/examples/xmake.lua
+++ b/examples/xmake.lua
@@ -11,7 +11,7 @@ includes("../libraries")
 includes("../common.lua")
 
 option("board")
-    set_default("sonata")
+    set_default("sonata-prerelease")
 
 includes("all")
 
diff --git a/flake.nix b/flake.nix
index 4ac54d7..d64a5a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,7 +46,7 @@
             fileset = fs.unions [./cheriot-rtos ./scripts/elf2uf2.sh];
           };
           buildPhase = ''
-            xmake config -P cheriot-rtos/tests/ --board=sonata
+            xmake config -P cheriot-rtos/tests/ --board=sonata-prerelease
             xmake -P ./cheriot-rtos/tests/
             ./scripts/elf2uf2.sh build/cheriot/cheriot/release/test-suite
           '';
diff --git a/tests/xmake.lua b/tests/xmake.lua
index 1f3679c..7f45047 100644
--- a/tests/xmake.lua
+++ b/tests/xmake.lua
@@ -10,7 +10,7 @@ includes(path.join(sdkdir, "lib"))
 includes("../common.lua")
 
 option("board")
-    set_default("sonata")
+    set_default("sonata-prerelease")
 
 library("uart_tests")
     set_default(false)