From 0b2043f7b63fb7f57014eada5224c2f6ced4680c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Feb 2021 04:42:51 +0100 Subject: [PATCH 1/5] linux_rpi: 5.4.79 -> 5.10.11 --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 176c2180f35..373984298cc 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,8 +2,8 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "5.4.79"; - tag = "1.20201201"; + modDirVersion = "5.10.11"; + tag = "1.20210201"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "093p5kh5f27djkhbcw371w079lhhihvg3s4by3wzsd40di4fcgn9"; + sha256 = "0n4zq47k9bmkgmarrhwvivp10v5ga8y2bphsx0il3kmcpf0c1m3q"; }; defconfig = { @@ -23,15 +23,18 @@ 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 {}); + extraConfig = '' + # ../drivers/gpu/drm/ast/ast_mode.c:851:18: error: initialization of 'void (*)(struct drm_crtc *, struct drm_atomic_state *)' from incompatible pointer type 'void (*)(struct drm_crtc *, struct drm_crtc_state *)' [-Werror=incompatible-pointer-types] + # 851 | .atomic_flush = ast_crtc_helper_atomic_flush, + # | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ + # ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush') + DRM_AST n + ''; + extraMeta = if (rpiVersion < 3) then { platforms = with lib.platforms; [ arm ]; hydraPlatforms = []; From 8f1996880db4debf173c0b62e1de65693d870c8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Feb 2021 04:59:15 +0100 Subject: [PATCH 2/5] libraspberrypi: unstable-2020-11-30 -> unstable-2021-01-11 --- pkgs/development/libraries/libraspberrypi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 217a83bcebc..532800ddd96 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libraspberrypi"; - version = "unstable-2020-11-30"; + version = "unstable-2021-01-11"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "093b30bbc2fd083d68cc3ee07e6e555c6e592d11"; - sha256 = "0n2psqyxlsic9cc5s8h65g0blblw3xws4czhpbbgjm58px3822d7"; + rev = "4a0a19b88b43e48c6b51b526b9378289fb712a4c"; + sha256 = "0g3a1a7w717h0fwk39banzgjwphh62fx64k130w2s5885lsn5r5k"; }; patches = [ From 9d6df5f6fe3ac3e4dc7b6dee2e589585b5615670 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Feb 2021 04:21:38 +0100 Subject: [PATCH 3/5] raspberrypi-eeprom: 2020-12-11 -> 2021-01-11 --- pkgs/os-specific/linux/raspberrypi-eeprom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index ee5ead73bc1..b0fd6b354b9 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -3,13 +3,13 @@ }: stdenvNoCC.mkDerivation { pname = "raspberrypi-eeprom"; - version = "2020-12-11"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "54a9796abbee59067bff9da6b90c1014178f2c21"; - sha256 = "0yp7bn444n6yisp4hiblrm00rrvrf213amzb4sh96mlb5nhxspqk"; + rev = "54cadc816ba739afd08ead6d679e647de028a65c"; + sha256 = "0zlacr4z6h40h0g47195xsbss29gaa7kf8r31h372sxsn8srlnjf"; }; buildInputs = [ python3 ]; From 82dadb9f06ac0f11970bfe52d0d0e3385cef0819 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Feb 2021 04:47:35 +0100 Subject: [PATCH 4/5] raspberrypifw: 1.20201201 -> 1.20210201 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 3561916fd6f..8a19e6b8584 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -3,13 +3,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20201201"; + version = "1.20210201"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "09yha3k72yqx29rwnv2j2zm73lzc4jgmcbmcc6yrl1i07x84lx3n"; + sha256 = "0frmsixzy9nd8nfg15jsz037522h4gq1hca666cyaf9zg2sa1i7i"; }; installPhase = '' From a79a1b49780b2d0807fea5e7473048515d53c2eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Feb 2021 04:36:53 +0100 Subject: [PATCH 5/5] raspberrypiWirelessFirmware: 2020-12-01 -> 2021-01-28 --- .../linux/firmware/raspberrypi-wireless/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 041694e2ec1..e6a03ef7df5 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "2020-12-01"; + version = "2021-01-28"; srcs = [ (fetchFromGitHub { name = "bluez-firmware"; owner = "RPi-Distro"; repo = "bluez-firmware"; - rev = "1e4ee0c05bae10002124b56c0e44bb9ac6581ddc"; - sha256 = "10n6ibr3ra71f4hlvbpy8csjlgrapawxrr6jmijn470vkcqcpq27"; + rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d"; + sha256 = "1dkg8mzn7n4afi50ibrda2s33nw2qj52jjjdv9w560q601gms47b"; }) (fetchFromGitHub { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "b66ab26cebff689d0d3257f56912b9bb03c20567"; - sha256 = "0cffgsp0w7vv7ylpymdddx0bl9dx3pl7snlh30p4rr9srmn8869f"; + rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5"; + sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp"; }) ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "17k9y499kjc4zv7ivnsfrgfibwj0ldr3sqdgia4dackbr70jfg2h"; + outputHash = "0a54gyrq6jfxxvimaa4yjfiyfwf7wv58v0a32l74yrzyarr3ldby"; meta = with lib; { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W";