summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/linux-rpi.nix
diff options
context:
space:
mode:
authorAndersonTorres <torres.anderson.85@protonmail.com>2022-02-26 21:04:25 -0300
committerAndersonTorres <torres.anderson.85@protonmail.com>2022-02-26 21:04:25 -0300
commited2b1b4b909538716abb6378971ba75fae65b7d2 (patch)
tree25c9f8f505f3ad7d3955c556a50ef6c111e7c369 /pkgs/os-specific/linux/kernel/linux-rpi.nix
parentf68dbdc7c39faa5f685e34b10da0b373ad6a7c22 (diff)
parent2970b27faf15840714feba50186e7e02d945569f (diff)
downloadnixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar
nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.gz
nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.bz2
nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.lz
nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.xz
nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.zst
nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.zip
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-rpi.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-rpi.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 17d24c187d5..99b966ac5cd 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -2,8 +2,9 @@
 
 let
   # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
-  modDirVersion = "5.10.52";
-  tag = "1.20210805";
+  modDirVersion = "5.10.92";
+  tag = "1.20220118";
+  rev = "650082a559a570d6c9d2739ecc62843d6f951059";
 in
 lib.overrideDerivation (buildLinux (args // {
   version = "${modDirVersion}-${tag}";
@@ -12,8 +13,8 @@ lib.overrideDerivation (buildLinux (args // {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "linux";
-    rev = tag;
-    sha256 = "1j71xblflslfi4c3zx2srw6fahnhp3bjx4yjfqrp39kzaa41ij0b";
+    inherit rev;
+    sha256 = "sha256-OSDx9dzqm8JnLUvdiv1aKqhRz80uWqfjXLd7m6ycXME=";
   };
 
   defconfig = {
@@ -75,6 +76,7 @@ lib.overrideDerivation (buildLinux (args // {
   '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux"]) ''
     copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
   '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) ''
+    copyDTB bcm2710-rpi-zero-2.dtb bcm2837-rpi-zero-2.dtb
     copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
     copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb
     copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb