Merge branch 'master' into imx93

Signed-off-by: Indan Zupancic <[email protected]>
seL4 · Feb 9, 2025 · 1e8e921 · 1e8e921
2 parents fa3d185 + 2cac3e7
commit 1e8e921
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cmake-tool/README.md b/cmake-tool/README.md
@@ -27,9 +27,9 @@ the actual build.
 It is assumed that
 
  * CMake of an appropriate version is installed
- * You are using the Ninja CMake generator 
+ * You are using the Ninja CMake generator
  * You understand how to checkout projects using the repo tool as described on the
-   [Getting started](https://docs.sel4.systems/GettingStarted) page
+   [seL4 docsite](https://docs.sel4.systems/Resources#running-sel4)
 
 #### Basic build initialisation
 

diff --git a/cmake-tool/helpers/application_settings.cmake b/cmake-tool/helpers/application_settings.cmake
@@ -12,7 +12,7 @@ include_guard(GLOBAL)
 function(ApplyData61ElfLoaderSettings kernel_platform kernel_sel4_arch)
     set(
         binary_list
-        "tx1;hikey;odroidc2;odroidc4;imx8mq-evk;imx8mm-evk;imx8mp-evk;hifive;tqma8xqp1gb;imx93;bcm2711;rocketchip;star64"
+        "tx1;hikey;odroidc2;odroidc4;imx8mq-evk;imx8mm-evk;imx8mp-evk;hifive;tqma8xqp1gb;imx93;bcm2711;rocketchip;star64;cheshire"
     )
     set(efi_list "tk1;rockpro64;quartz64")
     set(uimage_list "tx2;am335x")
@@ -66,6 +66,10 @@ function(ApplyData61ElfLoaderSettings kernel_platform kernel_sel4_arch)
     if(KernelPlatformStar64)
         set(IMAGE_START_ADDR 0x60000000 CACHE INTERNAL "" FORCE)
     endif()
+    if(KernelPlatformCheshire)
+        set(UseRiscVOpenSBI OFF CACHE BOOL "" FORCE)
+        set(IMAGE_START_ADDR 0x80200000 CACHE INTERNAL "" FORCE)
+    endif()
 endfunction()
 
 function(ApplyCommonSimulationSettings kernel_sel4_arch)