diff --git a/hosts/pi/hardware-configuration.nix b/hosts/pi/hardware-configuration.nix index ca56fe7..01778a5 100644 --- a/hosts/pi/hardware-configuration.nix +++ b/hosts/pi/hardware-configuration.nix @@ -7,9 +7,9 @@ boot = { kernelPackages = let - version = "6.6.51"; - tag = "stable_20241008"; - srcHash = "sha256-phCxkuO+jUGZkfzSrBq6yErQeO2Td+inIGHxctXbD5U="; + version = "6.1.73"; + tag = "stable_20240124"; + srcHash = "sha256-P4ExzxWqZj+9FZr9U2tmh7rfs/3+iHEv0m74PCoXVuM="; in pkgs.linuxPackagesFor (pkgs.linux_rpi4.override { argsOverride = { src = pkgs.fetchFromGitHub { @@ -21,7 +21,22 @@ version = version; modDirVersion = version; structuredExtraConfig = {}; - kernelPatches = []; + kernelPatches = [ + { + name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch"; + patch = pkgs.fetchpatch { + url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch"; + hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw="; + }; + } + { + name = "iommu-bcm2712-don-t-allow-building-as-module.patch"; + patch = pkgs.fetchpatch { + url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch"; + hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A="; + }; + } + ]; }; }); @@ -39,9 +54,9 @@ }) (final: prev: { raspberrypifw = let - version = "1.20241008"; - srcHash = "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0="; - in pkgs.blah.override { + version = "1.20240529"; + srcHash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA="; + in pkgs.raspberrypifw.override { argsOverride = { src = prev.fetchFromGitHub { owner = "raspberrypi";