allow tianocore as secondary payload

2 files changed, 14 insertions, 2 deletions

diff --git a/configs/milan-x1c.nix b/configs/milan-x1c.nix
index 41238461e287..2049e8086a2d 100644
--- a/configs/milan-x1c.nix
+++ b/configs/milan-x1c.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
 
 {
   imports = [
@@ -14,6 +14,8 @@
   grub2.enable = true;
   seabios.enable = true;
   seabios.asSecondaryPayload = true;
+  tianocore.enable = true;
+  tianocore.asSecondaryPayload = true;
   coreinfo.enable = true;
   nvramcui.enable = true;
   tint.enable = true;
diff --git a/modules/tianocore/default.nix b/modules/tianocore/default.nix
index 1ebf3d93d945..0ebe453909bb 100644
--- a/modules/tianocore/default.nix
+++ b/modules/tianocore/default.nix
@@ -4,14 +4,24 @@ with lib;
 
 let
   cfg = config.tianocore;
+  payloadName = if cfg.asSecondaryPayload then
+    "img/tianocore"
+  else
+    "fallback/payload";
+
 in {
   options.tianocore = {
     enable = mkEnableOption "tianocore coreboot primary payload";
+
+    asSecondaryPayload = mkOption {
+      type = types.bool;
+      default = false;
+    };
   };
 
   config = lib.mkIf cfg.enable {
     corenix.extraFiles = {
-      "fallback/payload" = {
+      ${payloadName} = {
         type = "payload";
         src = "${pkgs.coreboot-payload-tianocore}/FV/UEFIPAYLOAD.fd";
       };