diff options
| author | leo60228 <leo@60228.dev> | 2021-11-04 15:01:01 -0400 |
|---|---|---|
| committer | Zhaofeng Li <hello@zhaofeng.li> | 2022-02-12 00:04:47 -0800 |
| commit | 40d136278235bca9bc61995caa36c4ab5289194b (patch) | |
| tree | ffebcac5f592fc55790faf5dc2f77e1139190e00 | |
| parent | 1e853c8d2d895987d5ebdafcb1fe135e839cadf2 (diff) | |
| download | nixpkgs-40d136278235bca9bc61995caa36c4ab5289194b.tar nixpkgs-40d136278235bca9bc61995caa36c4ab5289194b.tar.gz nixpkgs-40d136278235bca9bc61995caa36c4ab5289194b.tar.bz2 nixpkgs-40d136278235bca9bc61995caa36c4ab5289194b.tar.lz nixpkgs-40d136278235bca9bc61995caa36c4ab5289194b.tar.xz nixpkgs-40d136278235bca9bc61995caa36c4ab5289194b.tar.zst nixpkgs-40d136278235bca9bc61995caa36c4ab5289194b.zip | |
linux_rpi: 5.10.52-1.20210805 -> 5.10.92-1.20220118
Co-authored-by: Zhaofeng Li <hello@zhaofeng.li>
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-rpi.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 |
2 files changed, 8 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 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 82cc419298b..ea742671b84 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -625,6 +625,7 @@ mapAliases ({ linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; + linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; @@ -641,6 +642,7 @@ mapAliases ({ linux_5_4 = linuxKernel.kernels.linux_5_4; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_rpi0 = linuxKernel.kernels.linux_rpi1; + linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; |