about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-09-10 23:19:44 -0500
committerFlorian Klink <flokli@flokli.de>2020-12-27 16:48:51 +0100
commit44dae8d0c8d096ee0cde77115700a41f6e3a40bf (patch)
treeea25f4dcd903f5aed01a8cdeacec7f6d3a6d9728 /pkgs/os-specific
parenteb2913551fb152f2ff757c51a3f7fa9b058c4457 (diff)
downloadnixlib-44dae8d0c8d096ee0cde77115700a41f6e3a40bf.tar
nixlib-44dae8d0c8d096ee0cde77115700a41f6e3a40bf.tar.gz
nixlib-44dae8d0c8d096ee0cde77115700a41f6e3a40bf.tar.bz2
nixlib-44dae8d0c8d096ee0cde77115700a41f6e3a40bf.tar.lz
nixlib-44dae8d0c8d096ee0cde77115700a41f6e3a40bf.tar.xz
nixlib-44dae8d0c8d096ee0cde77115700a41f6e3a40bf.tar.zst
nixlib-44dae8d0c8d096ee0cde77115700a41f6e3a40bf.zip
linux_rpi: 4.19.118 -> 5.4.51
Update to the new default branch for the Raspberry Pi vendor kernel.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-rpi.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index a3d2bfd4836c..f96ab2797799 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args:
 
 let
-  modDirVersion = "4.19.118";
-  tag = "1.20200601";
+  modDirVersion = "5.4.51";
+  tag = "1.20200819";
 in
 lib.overrideDerivation (buildLinux (args // {
   version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ lib.overrideDerivation (buildLinux (args // {
     owner = "raspberrypi";
     repo = "linux";
     rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "11jzsmnd1qry2ir9vmsv0nfdzjpgkn5yab5ylxcz406plc073anp";
+    sha256 = "0n23q5mm2jyi42m0a45mx0add12pcc5jmfkd858s3v2d5g3bb1f0";
   };
 
   defconfig = {
@@ -22,6 +22,11 @@ lib.overrideDerivation (buildLinux (args // {
     "4" = "bcm2711_defconfig";
   }.${toString rpiVersion};
 
+  extraConfig = ''
+    # ../drivers/pci/controller/pcie-altera.c:679:8: error: too few arguments to function 'devm_of_pci_get_host_bridge_resources'
+    PCIE_ALTERA n
+  '';
+
   features = {
     efiBootStub = false;
   } // (args.features or {});