diff --git a/systems/charlie/bootsplash.bmp b/systems/charlie/bootsplash.bmp new file mode 100644 index 0000000..a4b247f Binary files /dev/null and b/systems/charlie/bootsplash.bmp differ diff --git a/systems/charlie/bootsplash.jpg b/systems/charlie/bootsplash.jpg deleted file mode 100644 index 62b2b7d..0000000 Binary files a/systems/charlie/bootsplash.jpg and /dev/null differ diff --git a/systems/charlie/default.nix b/systems/charlie/default.nix index 8865a0c..5c97cee 100644 --- a/systems/charlie/default.nix +++ b/systems/charlie/default.nix @@ -20,17 +20,12 @@ pkgs.callPackage ../../coreboot.nix { }; # display - bootsplash = true; generic-linear-framebuffer = true; linear-framebuffer = { - max-width = 1024; + max-width = 1366; max-height = 768; }; - # custom bootsplash - bootsplash-image = true; - bootsplash-file = ./bootsplash.jpg; - # payload seabios = { revision = true; @@ -50,4 +45,9 @@ pkgs.callPackage ../../coreboot.nix { use-me-cleaner = true; }; + postCommands = '' + # add SeaBios BMP bootsplash + ./build/cbfstool build/coreboot.rom add -f ${./bootsplash.bmp} -c lzma -n bootsplash.bmp.lzma -t raw + ''; + } diff --git a/systems/vm/default.nix b/systems/vm/default.nix index 38b2636..f42b00a 100644 --- a/systems/vm/default.nix +++ b/systems/vm/default.nix @@ -2,28 +2,16 @@ pkgs.callPackage ../../coreboot.nix { # last known good - rev = "d8bc5c127ad13ed0475bbf7465f6ba56a5fa34ee"; + rev = "4bd69273882c66667590f098f2b9bb916b6c1a44"; sources = pkgs.callPackage ../charlie/sources.nix { }; conf = { - # display - bootsplash = true; - generic-linear-framebuffer = true; - linear-framebuffer = { - max-width = 1366; - max-height = 768; - }; - - # custom bootsplash - bootsplash-image = true; - bootsplash-file = ../charlie/bootsplash.jpg; - # payload seabios = { revision = true; - revision_id = "ef88eeaf052c8a7d28c5f85e790c5e45bcffa45e"; + revision-id = "ef88eeaf052c8a7d28c5f85e790c5e45bcffa45e"; + debug-level = 3; }; - }; }