Moved back onto upstream CHERIoT RTOS

lowRISC · Jul 31, 2024 · 461e1a9 · 461e1a9
1 parent 69a5df4
commit 461e1a9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cheriot-rtos b/cheriot-rtos
diff --git 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
@@ -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
@@ -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)
+3 −3		README.md
+1 −1		compile_flags.txt
+1 −1		docs/BoardDescriptions.md
+4 −4		examples/08.memory_safety/README.md
+9 −7		examples/08.memory_safety/memory_safety_inner.cc
+85 −0		sdk/boards/sonata-0.2.json
+153 −0		sdk/boards/sonata-prerelease.json
+0 −138		sdk/boards/sonata.json
+1 −0		sdk/boards/sonata.json
+63 −0		sdk/include/FreeRTOS-Compat/FreeRTOS_errno.h
+1 −1		sdk/include/c++-config/atomic
+8 −0		sdk/include/cdefs.h
+13 −0		sdk/include/debug.hh
+4 −0		sdk/include/errno.h
+7 −0		sdk/include/platform/concepts/ethernet.hh
+65 −0		sdk/include/platform/sunburst/platform-entropy.hh
+817 −0		sdk/include/platform/sunburst/platform-ethernet.hh
+1 −1		sdk/include/platform/sunburst/platform-i2c.hh
+24 −0		sdk/include/stdint.h
+2 −0		sdk/include/stdio.h
+9 −4		tests/test-runner.cc
+6 −0		tests/tests.hh