Update coreboot to 24.05

jmbaur · May 25, 2024 · c08401a · c08401a
1 parent 1bd7339
commit c08401a
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 121 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,8 @@
 {
   description = "A small linuxboot payload for coreboot";
   inputs = {
+    coreboot.flake = false;
+    coreboot.url = "git+https://github.com/coreboot/coreboot?ref=refs/tags/24.05&submodules=1";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     zig.flake = false;
     zig.url = "github:ziglang/zig/0.12.x";
@@ -15,6 +17,10 @@
       final: prev:
       (
         {
+          buildCoreboot = import ./pkgs/coreboot {
+            corebootSrc = inputs.coreboot.outPath;
+            version = "24.05";
+          };
           tinyboot = prev.callPackage ./pkgs/tinyboot.nix { zigSrc = inputs.zig.outPath; };
           armTrustedFirmwareMT8183 = prev.callPackage ./pkgs/arm-trusted-firmware-cros.nix {
             platform = "mt8183";

diff --git a/options.nix b/options.nix
@@ -295,7 +295,7 @@ in
         inherit (config.build) linux initrd;
         inherit (config.linux) dtb dtbPattern;
       };
-      coreboot = pkgs.callPackage ./pkgs/coreboot {
+      coreboot = pkgs.callPackage pkgs.buildCoreboot {
         inherit board;
         inherit (config.coreboot) kconfig;
       };

diff --git a/pkgs/coreboot/amd_blobs.json b/pkgs/coreboot/amd_blobs.json
diff --git a/pkgs/coreboot/blobs.json b/pkgs/coreboot/blobs.json
diff --git a/pkgs/coreboot/cmocka.json b/pkgs/coreboot/cmocka.json
diff --git a/pkgs/coreboot/default.nix b/pkgs/coreboot/default.nix
@@ -1,3 +1,4 @@
+{ corebootSrc, version }:
 {
   board,
   fetchgit,
@@ -24,29 +25,11 @@ let
       .${stdenvNoCC.hostPlatform.linuxArch}
     }.override
       { withAda = stdenvNoCC.hostPlatform.isx86_64; };
-  importJsonSource = source: {
-    inherit (lib.importJSON source)
-      url
-      rev
-      hash
-      fetchLFS
-      fetchSubmodules
-      deepClone
-      leaveDotGit
-      ;
-  };
-  installSubmodule =
-    source: dest: ''rm -r ${dest} && ln -sf ${fetchgit (importJsonSource source)} ${dest}'';
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "coreboot-${board}";
-  version = "24.02.01";
-  src = fetchgit {
-    url = "https://github.com/coreboot/coreboot";
-    rev = finalAttrs.version;
-    fetchSubmodules = true;
-    hash = "sha256-OV6OsnAAXU51IZYzAIZQu4qZqau8n/rVAc22Lfjt4iw=";
-  };
+  inherit version;
+  src = corebootSrc;
   patches = [
     ./0001-Add-Kconfig-VBOOT_SIGN-option.patch
     ./0002-Fix-build-for-brya.patch
@@ -57,23 +40,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     pkg-config
     openssl
     nss
+    python3
   ];
-  nativeBuildInputs = [ python3 ];
-  buildInputs = [ ];
   enableParallelBuilding = true;
-  # nixpkgs fetchgit fetcher does not fetch a submodule if the repo sets
-  # "update=none" on the submodule, so we must fetch them ourselves
+  inherit kconfig;
+  passAsFile = [ "kconfig" ];
   postPatch = ''
     patchShebangs util 3rdparty/vboot/scripts
-    ${installSubmodule ./amd_blobs.json "3rdparty/amd_blobs"}
-    ${installSubmodule ./blobs.json "3rdparty/blobs"}
-    ${installSubmodule ./cmocka.json "3rdparty/cmocka"}
-    ${installSubmodule ./fsp.json "3rdparty/fsp"}
-    ${installSubmodule ./intel_microcode.json "3rdparty/intel-microcode"}
-    ${installSubmodule ./qc_blobs.json "3rdparty/qc_blobs"}
   '';
-  inherit kconfig;
-  passAsFile = [ "kconfig" ];
   configurePhase = ''
     runHook preConfigure
     cat $kconfigPath > .config

diff --git a/pkgs/coreboot/fsp.json b/pkgs/coreboot/fsp.json
diff --git a/pkgs/coreboot/intel_microcode.json b/pkgs/coreboot/intel_microcode.json
diff --git a/pkgs/coreboot/qc_blobs.json b/pkgs/coreboot/qc_blobs.json
diff --git a/pkgs/coreboot/update-submodules.bash b/pkgs/coreboot/update-submodules.bash