.

3 files changed, 25 insertions, 5 deletions

diff --git a/modules/coreboot/default.nix b/modules/corenix/default.nix
index b49c8a7d871e..ddfde736f8b2 100644
--- a/modules/coreboot/default.nix
+++ b/modules/corenix/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  cfg = config.coreboot;
+  cfg = config.corenix;
 
   fileOptions.options = {
     src = mkOption {
@@ -15,7 +15,7 @@ let
     };
   };
 in {
-  options.coreboot = {
+  options.corenix = {
     extraFiles = mkOption {
       type = types.attrsOf (types.submodule fileOptions);
     };
@@ -29,7 +29,7 @@ in {
   };
 
   config = {
-    coreboot.rom = let
+    corenix.rom = let
       base = pkgs.coreboot.override {
         inherit (cfg) corebootConfig;
       };
diff --git a/modules/default.nix b/modules/default.nix
index 6012f715f372..bb1dc181aae2 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,8 +2,8 @@
 
 {
   imports = [
-    ./coreboot
+    ./corenix
     ./grub2
-    #./tianocore
+    ./tianocore
   ];
 }
diff --git a/modules/tianocore/default.nix b/modules/tianocore/default.nix
new file mode 100644
index 000000000000..d71232519ab3
--- /dev/null
+++ b/modules/tianocore/default.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.tianocore;
+in {
+  options.tianocore = {
+    enable = mkEnableOption "tianocore coreboot primary payload";
+  };
+
+  config = lib.mkIf cfg.enable {
+    coreboot.extraFiles = {
+      "fallback/payload" = {
+        type = "payload";
+        src = "${pkgs.coreboot-payload-tianocore}/FV/UEFIPAYLOAD.fd";
+      };
+    };
+  };
+}