Move to master seL4

.github/workflows/sdk.yaml

@@ -15,6 +15,9 @@ on:
   push:
     branches: [ "main" ]
 
+env:
+  SEL4_VERSION: 0f497ab3a0a25500b7dc70f3a2c2ad34b8453c24
+
 # To reduce the load we cancel any older runs of this workflow for the current
 # PR. For deployment to the main branch, the workflow will run on each push,
 # and the `run_id` parameter will prevent cancellation.
@@ -36,7 +39,7 @@ jobs:
         uses: actions/checkout@v4
         with:
             repository: seL4/seL4
-            ref: microkit
+            ref: ${{ env.SEL4_VERSION }}
             path: seL4
       - name: Install SDK dependencies
         run: |
@@ -95,7 +98,7 @@ jobs:
         uses: actions/checkout@v4
         with:
             repository: seL4/seL4
-            ref: microkit
+            ref: ${{ env.SEL4_VERSION }}
             path: seL4
       - name: Get Nix dependencies
         run: nix develop -c bash -c 'echo Hello World'

DEVELOPER.md

@@ -25,6 +25,7 @@ This section attempts to list the packages or external development tools which a
 * qemu-system-x86_64
 
 To build the documentation you also need
+
 * pandoc
 * pdflatex
 * texlive-latex-recommended
@@ -115,9 +116,11 @@ Please clone seL4 from:
 
     https://github.com/seL4/seL4.git
 
-The correct branch to use is `microkit`.
+It should be noted that while Microkit uses mainline seL4, it is fairly tied to the
+specific version used.
 
-Testing has been performed using commit `3aafe9e0b9527794c547d12090117e1000302da0`.
+For this version of Microkit please use the following commit:
+`0f497ab3a0a25500b7dc70f3a2c2ad34b8453c24`.
 
 ## Building the SDK
 

build_sdk.py

@@ -243,8 +243,6 @@ class ConfigInfo:
         kernel_options={
             "KernelPlatform": "qemu-riscv-virt",
             "QEMU_MEMORY": "2048",
-            "KernelRiscvExtD": True,
-            "KernelRiscvExtF": True,
         } | DEFAULT_KERNEL_OPTIONS_RISCV64,
     ),
     BoardInfo(
@@ -303,8 +301,6 @@ class ConfigInfo:
         loader_link_address=0x90000000,
         kernel_options={
             "KernelPlatform": "hifive-p550",
-            "KernelRiscvExtD": True,
-            "KernelRiscvExtF": True,
         } | DEFAULT_KERNEL_OPTIONS_RISCV64,
     ),
     BoardInfo(
@@ -314,8 +310,6 @@ class ConfigInfo:
         loader_link_address=0x60000000,
         kernel_options={
             "KernelPlatform": "star64",
-            "KernelRiscvExtD": True,
-            "KernelRiscvExtF": True,
         } | DEFAULT_KERNEL_OPTIONS_RISCV64,
     ),
     BoardInfo(
@@ -325,8 +319,6 @@ class ConfigInfo:
         loader_link_address=0x90000000,
         kernel_options={
             "KernelPlatform": "ariane",
-            "KernelRiscvExtD": True,
-            "KernelRiscvExtF": True,
         } | DEFAULT_KERNEL_OPTIONS_RISCV64,
     ),
     BoardInfo(
@@ -336,8 +328,6 @@ class ConfigInfo:
         loader_link_address=0x90000000,
         kernel_options={
             "KernelPlatform": "cheshire",
-            "KernelRiscvExtD": True,
-            "KernelRiscvExtF": True,
         } | DEFAULT_KERNEL_OPTIONS_RISCV64,
     ),
     BoardInfo(
@@ -347,8 +337,6 @@ class ConfigInfo:
         loader_link_address=0x90000000,
         kernel_options={
             "KernelPlatform": "cheshire",
-            "KernelRiscvExtD": True,
-            "KernelRiscvExtF": True,
         } | DEFAULT_KERNEL_OPTIONS_RISCV64,
     ),
     BoardInfo(

loader/src/loader.c

@@ -33,9 +33,7 @@ typedef void (*sel4_entry)(
     intptr_t pv_offset,
     uintptr_t v_entry,
     uintptr_t dtb_addr_p,
-    uintptr_t dtb_size,
-    uintptr_t extra_device_addr_p,
-    uintptr_t extra_device_size
+    uintptr_t dtb_size
 );
 
 extern char _text;
@@ -114,8 +112,6 @@ static void start_kernel(void)
         loader_data->pv_offset,
         loader_data->v_entry,
         0,
-        0,
-        0,
         0
     );
 }