From 44dae8d0c8d096ee0cde77115700a41f6e3a40bf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 Sep 2020 23:19:44 -0500 Subject: [PATCH] linux_rpi: 4.19.118 -> 5.4.51 Update to the new default branch for the Raspberry Pi vendor kernel. --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 11 ++++++++--- 1 file 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 a3d2bfd4836..f96ab279779 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 {});