about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-03-04T14·43+0200
committerclbot <clbot@tvl.fyi>2024-03-07T13·56+0000
commit4749e2e70323e2cec5f1a57d1a82ee5b3962301b (patch)
tree5c4b4e63aae5d565f61ccbb0fea5554fa6c874eb
parent04ac1c995c6cfd45d531b0fd73a8ea00c73a5f12 (diff)
chore(users/flokli/ipu6-softisp): align with linux-firmware r/7652
The firmware files ended up in linux-firmware, and
https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=dbc294d3e49aa63a61bb4026b5784bae5b75aa2b
moved them to a ipu/ subpath, so update our patches to find them there,
and stop using the pkgs.ipu6-camera-bins package.

https://github.com/NixOS/nixpkgs/pull/290216 bumped our linux-firmware
image past this, so this should work for people tracking nixos-unstable.

Change-Id: Ic3eb9fb364c93ee0d10951451a59f7e98888b5d7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11097
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
-rw-r--r--users/flokli/ipu6-softisp/config.nix2
-rw-r--r--users/flokli/ipu6-softisp/kernel/softisp.patch8
2 files changed, 4 insertions, 6 deletions
diff --git a/users/flokli/ipu6-softisp/config.nix b/users/flokli/ipu6-softisp/config.nix
index b7565932ab29..ff945dfbe33e 100644
--- a/users/flokli/ipu6-softisp/config.nix
+++ b/users/flokli/ipu6-softisp/config.nix
@@ -49,8 +49,6 @@ let
   });
 in
 {
-  hardware.firmware = [ pkgs.ipu6-camera-bins ];
-
   boot.kernelPatches = [{
     name = "linux-kernel-test.patch";
     patch = ./kernel/softisp.patch;
diff --git a/users/flokli/ipu6-softisp/kernel/softisp.patch b/users/flokli/ipu6-softisp/kernel/softisp.patch
index b94126b53ad1..eb0b00564810 100644
--- a/users/flokli/ipu6-softisp/kernel/softisp.patch
+++ b/users/flokli/ipu6-softisp/kernel/softisp.patch
@@ -1212,10 +1212,10 @@ index 000000000000..04e7e7e61ca5
 +#define IPU6_NAME			"intel-ipu6"
 +#define IPU6_MEDIA_DEV_MODEL_NAME	"ipu6"
 +
-+#define IPU6SE_FIRMWARE_NAME		"intel/ipu6se_fw.bin"
-+#define IPU6EP_FIRMWARE_NAME		"intel/ipu6ep_fw.bin"
-+#define IPU6_FIRMWARE_NAME		"intel/ipu6_fw.bin"
-+#define IPU6EPMTL_FIRMWARE_NAME		"intel/ipu6epmtl_fw.bin"
++#define IPU6SE_FIRMWARE_NAME		"intel/ipu/ipu6se_fw.bin"
++#define IPU6EP_FIRMWARE_NAME		"intel/ipu/ipu6ep_fw.bin"
++#define IPU6_FIRMWARE_NAME		"intel/ipu/ipu6_fw.bin"
++#define IPU6EPMTL_FIRMWARE_NAME		"intel/ipu/ipu6epmtl_fw.bin"
 +
 +enum ipu6_version {
 +	IPU6_VER_INVALID = 0,