From 01549c940052f30384cc456ced477f5bc3eb3bf4 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Mon, 3 Jul 2023 23:51:46 -0700
Subject: [PATCH] src/image: rename parameter initramfs_image -> initramfs

This allows to have the argument automatically populated by
`callPackage`.
---
 src/default.nix                | 4 +---
 src/image/default.nix          | 6 +++---
 src/platform/kevin/default.nix | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/default.nix b/src/default.nix
index 133e0f6..b333fca 100644
--- a/src/default.nix
+++ b/src/default.nix
@@ -27,9 +27,7 @@ let
 
       iasl_20180531 = final.nixpkgsOnBuildForBuild.callPackage ./coreboot/iasl_20180531 { };
       coreboot = final.callPackage ./coreboot { };
-      image = final.callPackage ./image {
-        initramfs_image = final.initramfs;
-      };
+      image         = final.callPackage ./image { };
       kernel        = final.callPackage ./kernel { };
       userspace     = final.callPackage ./userspace { };
       initramfs     = final.callPackage ./initramfs { };
diff --git a/src/image/default.nix b/src/image/default.nix
index 9bc65cd..189e62d 100644
--- a/src/image/default.nix
+++ b/src/image/default.nix
@@ -7,7 +7,7 @@
 , payload-compression-type ? "none"
 , payload-prefix           ? "prefix"
 , payload-name             ? "payload"
-, initramfs_image          # path to the initramfs `cpio` archive
+, initramfs                ? null # initramfs `cpio` archive
 , linux-command-line       ? null
 }:
 
@@ -34,8 +34,8 @@ nixpkgsOnBuildForHost.stdenv.mkDerivation {
       "-c${payload-compression-type}"
     ] ++ lib.optionals (linux-command-line != null) [
       "-C'${linux-command-line}'"
-    ] ++ lib.optionals (initramfs_image != null) [
-      "-I'${initramfs_image}'"
+    ] ++ lib.optionals (initramfs != null) [
+      "-I'${initramfs}'"
     ] ++ [
       "\n"
     ]);
diff --git a/src/platform/kevin/default.nix b/src/platform/kevin/default.nix
index 8807986..ef77cca 100644
--- a/src/platform/kevin/default.nix
+++ b/src/platform/kevin/default.nix
@@ -78,7 +78,7 @@ in {
 
     image = prev.image.override {
       payload = "${final.fit}/Image.fit";
-      initramfs_image = null;  # it is part of the FIT image
+      initramfs = null;  # it is part of the FIT image
     };
 
     coreboot =