ehmry/genodepkgs
ehmry/genodepkgs
2
0
Fork 0
Code Releases Activity

nixos-module: fix boot paths, add timer, fix FS

Browse Source
This commit is contained in:
Ehmry - 2020-05-22 16:50:02 +05:30
parent 16e788ad72
commit d9a4cfb7d2
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos-modules/default.nix
View File

@ -137,15 +137,15 @@ in {
menuentry Genode on NOVA { menuentry Genode on NOVA {
insmod multiboot2 insmod multiboot2
insmod gzio insmod gzio
multiboot2 /boot/bender multiboot2 /bender
module2 /boot/hypervisor hypervisor iommu novpid serial logmem module2 /hypervisor hypervisor iommu novpid serial logmem
module2 /boot/image.elf.gz image.elf module2 /image.elf.gz image.elf
} }
''; '';
extraFiles = { extraFiles = {
bender = "${pkgs'.genodeSources}/tool/boot/bender"; "bender" = "${pkgs'.genodeSources}/tool/boot/bender";
hypervisor = "${pkgs'.NOVA}/hypervisor-x86_64"; "hypervisor" = "${pkgs'.NOVA}/hypervisor-x86_64";
"image.elf.gz" = "${firmware}/image.elf.gz"; "image.elf.gz" = "${firmware}/image.elf.gz";
}; };
}; };

7
nixos-modules/dhall/vbox-guest.dhall
View File

@ -149,11 +149,12 @@ let toVbox =
, ram = Genode.units.MiB 64 + Genode.units.MiB params.memorySize , ram = Genode.units.MiB 64 + Genode.units.MiB params.memorySize
} }
, routes = , routes =
[ ServiceRoute.parent "VM" [ ServiceRoute.parent "File_system"
, ServiceRoute.parent "Nitpicker"
, ServiceRoute.parent "File_system"
, ServiceRoute.parent "Nic" , ServiceRoute.parent "Nic"
, ServiceRoute.parent "Nitpicker"
, ServiceRoute.parent "Rtc" , ServiceRoute.parent "Rtc"
, ServiceRoute.parent "Timer"
, ServiceRoute.parent "VM"
, ServiceRoute.parent "Report" , ServiceRoute.parent "Report"
, ServiceRoute.parentLabel , ServiceRoute.parentLabel
"ROM" "ROM"

12
nixos-modules/dhall/vbox-host.dhall
View File

@ -480,15 +480,7 @@ let rootInit =
{ name = "policy" { name = "policy"
, attributes = toMap , attributes = toMap
{ label_last = "nix" { label_last = "nix"
, root = "/nix" , root = "/store"
, writeable = "no"
}
}
, XML.leaf
{ name = "policy"
, attributes = toMap
{ label = "store_rom"
, root = "/nix/store"
, writeable = "no" , writeable = "no"
} }
} }
@ -517,7 +509,7 @@ let rootInit =
"File_system" "File_system"
"file_system" "file_system"
(None Text) (None Text)
(Some "store_rom") (Some "nix")
] ]
} }
, chroot = , chroot =