mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(users/flokli/ipu6-softisp): align with linux-firmware

Browse source 
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>
This commit is contained in:
Florian Klink 2024-03-04 16:43:19 +02:00 committed by clbot
parent 04ac1c995c
commit 4749e2e703
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
users/flokli/ipu6-softisp/config.nix
View file

@ -49,8 +49,6 @@ let
}); });
in in
{ {
hardware.firmware = [ pkgs.ipu6-camera-bins ];
boot.kernelPatches = [{ boot.kernelPatches = [{
name = "linux-kernel-test.patch"; name = "linux-kernel-test.patch";
patch = ./kernel/softisp.patch; patch = ./kernel/softisp.patch;

8
users/flokli/ipu6-softisp/kernel/softisp.patch
View file

@ -1212,10 +1212,10 @@ index 000000000000..04e7e7e61ca5
+#define IPU6_NAME "intel-ipu6" +#define IPU6_NAME "intel-ipu6"
+#define IPU6_MEDIA_DEV_MODEL_NAME "ipu6" +#define IPU6_MEDIA_DEV_MODEL_NAME "ipu6"
+ +
+#define IPU6SE_FIRMWARE_NAME "intel/ipu6se_fw.bin" +#define IPU6SE_FIRMWARE_NAME "intel/ipu/ipu6se_fw.bin"
+#define IPU6EP_FIRMWARE_NAME "intel/ipu6ep_fw.bin" +#define IPU6EP_FIRMWARE_NAME "intel/ipu/ipu6ep_fw.bin"
+#define IPU6_FIRMWARE_NAME "intel/ipu6_fw.bin" +#define IPU6_FIRMWARE_NAME "intel/ipu/ipu6_fw.bin"
+#define IPU6EPMTL_FIRMWARE_NAME "intel/ipu6epmtl_fw.bin" +#define IPU6EPMTL_FIRMWARE_NAME "intel/ipu/ipu6epmtl_fw.bin"
+ +
+enum ipu6_version { +enum ipu6_version {
+ IPU6_VER_INVALID = 0, + IPU6_VER_INVALID = 0,