x

seL4 · Apr 16, 2024 · 9d2383a · 9d2383a
1 parent b67763e
commit 9d2383a
Showing 1 changed file with 28 additions and 6 deletions.
diff --git a/hacking/nix/scope/worlds.nix b/hacking/nix/scope/worlds.nix
@@ -32,7 +32,11 @@ in rec {
       qemu-arm-virt =
         let
           mk =
-            { smp ? false
+            { debugBuild ? null
+            , printing ? null
+            , benchmarks ? null
+
+            , smp ? false
             , mcs ? false
             , el2 ? true
             , hypervisor ? false
@@ -53,16 +57,20 @@ in rec {
                   KernelPlatform = mkString "qemu-arm-virt";
                   KernelMaxNumNodes = mkString numCores;
                   KernelIsMCS = fromBool mcs;
-
+                } // lib.optionalAttrs hypervisor {
+                  KernelArmHypervisorSupport = on;
+                } // lib.optionalAttrs (debugBuild != null) {
+                  KernelDebugBuild = fromBool debugBuild;
+                } // lib.optionalAttrs (printing != null) {
+                  KernelPrinting = fromBool printing;
+                } // lib.optionalAttrs (benchmarks != null) {
+                  KernelDebugBuild = mkString benchmarks;
+                };
                   # benchmarking config
                   # KernelDebugBuild = off;
                   # KernelBenchmarks = mkString "track_utilisation";
                   # KernelArmExportPMUUser = on;
                   # KernelSignalFastpath = on;
-
-                } // lib.optionalAttrs hypervisor {
-                  KernelArmHypervisorSupport = on;
-                };
                 canSimulate = true;
                 mkInstanceForPlatform = platUtils.qemu.mkMkInstanceForPlatform {
                   mkQemuCmd = loader: [
@@ -88,6 +96,20 @@ in rec {
             cpu = "cortex-a53";
             mkSeL4KernelLoaderWithPayloadArgs = loader: [ "-device" "loader,file=${loader},addr=0x70000000,cpu-num=0" ];
           };
+
+          release = {
+            mcs = mk {
+              debugBuild = false;
+              printing = false;
+              benchmarks = "track_utilisation";
+              mcs = true;
+            };
+            legacy = mk {
+              debugBuild = false;
+              printing = false;
+              benchmarks = "track_utilisation";
+            };
+          };
         };
 
       bcm2711 = mkWorld {