2
0
Fork 0

nixos: add genode.init.coreROMs option

Explicitly specify ROMs that must route past the nix-store.
llvm-11
Emery Hemingway 2 years ago
parent cd5f6f84f8
commit f8df320507
  1. 41
      nixos-modules/genode-core.nix
  2. 13
      nixos-modules/genode-init.nix
  3. 10
      nixos-modules/store-wrapper.dhall
  4. 1
      tests/x86.nix

@ -90,11 +90,15 @@ in {
in (foldl' f "[" inputs) + "]";
};
romDirectories = mapAttrs (name: value:
pkgs.symlinkJoin {
name = "${name}-rom";
paths = value.inputs;
}) config.genode.init.children;
romDirectories = filterAttrs (_: value: value != null) (mapAttrs
(name: value:
if value.inputs == [ ] then
null
else
pkgs.symlinkJoin {
name = "${name}-rom";
paths = value.inputs;
}) config.genode.init.children);
in {
@ -115,18 +119,33 @@ in {
report_rom
vfs
])));
storeRomPolicies = let
policies = mapAttrsToList
(name: value: '', { mapKey = "${name}", mapValue = "${value}" }'')
romDirectories;
in "[${toString policies}]";
storeRomPolicies = mapAttrsToList
(name: value: '', { mapKey = "${name}", mapValue = "${value}" }'')
romDirectories;
extraRoutes = lib.concatStringsSep ", " (lib.lists.flatten
(lib.mapAttrsToList (name: value:
map (suffix: ''
{ service =
{ name = "ROM"
, label =
Genode.Init.LabelSelector.Type.Partial
{ prefix = Some "nixos -> ${name}", suffix = Some "${suffix}" }
}
, route = Genode.Init.Route.parent (Some "${suffix}")
}
'') value.coreROMs) config.genode.init.children));
in localPackages.runCommand "boot.dhall" { } ''
cat > $out << EOF
let Genode = env:DHALL_GENODE in
${./store-wrapper.dhall}
(${config.genode.init.configFile})
"${config.system.build.tarball.fileName}.tar"
$(stat --format '%s' ${tarball})
${storeRomPolicies}
([${toString storeRomPolicies} ] : Genode.Prelude.Map.Type Text Text)
([${extraRoutes} ] : List Genode.Init.ServiceRoute.Type)
${manifest}
EOF
'';

@ -4,6 +4,15 @@ with lib;
let
cfg = config.genode.init;
coreROMs = mkOption {
type = with types; listOf str;
default = [ ];
description = ''
List of label suffixes that when matched against
ROM requests shall be forwared to the core.
'';
example = [ "platform_info" ];
};
inputs = mkOption {
description = "List of packages to build a ROM store with.";
default = [ ];
@ -47,7 +56,7 @@ in {
type = with types;
attrsOf (submodule {
options = {
inherit inputs;
inherit coreROMs inputs;
configFile = mkOption {
type = types.path;
description = ''
@ -67,7 +76,7 @@ in {
type = with types;
attrsOf (submodule {
options = {
inherit inputs;
inherit coreROMs inputs;
configFile = mkOption {
type = types.path;
description = ''

@ -16,9 +16,11 @@ in λ(subinit : Init.Type) →
λ(storeName : Text) →
λ(storeSize : Natural) →
λ(storeRomPolicies : Prelude.Map.Type Text Text) →
λ(routes : List Init.ServiceRoute.Type) →
λ(bootManifest : Manifest/Type) →
Genode.Boot::{
, config = Init::{
, routes
, children =
let child = Prelude.Map.keyValue Child.Type
@ -164,13 +166,7 @@ in λ(subinit : Init.Type) →
)
in parentROMs
[ "ld.lib.so"
, "vfs.lib.so"
, "init"
, "platform_info"
, "core_log"
, "kernel_log"
]
[ "ld.lib.so", "vfs.lib.so", "init" ]
# [ Init.ServiceRoute.parent "IO_MEM"
, Init.ServiceRoute.parent "IO_PORT"
, Init.ServiceRoute.parent "IRQ"

@ -4,6 +4,7 @@
machine = { pkgs, ... }: {
genode.init.subinits.test = {
configFile = ./x86.dhall;
coreROMs = [ "platform_info" ];
inputs = with pkgs.genodePackages; [
acpi_drv
platform_drv

Loading…
Cancel
Save