diff options
author | Bernardo Meurer <bernardo@meurer.org> | 2023-05-04 14:56:42 -0400 |
---|---|---|
committer | Bernardo Meurer <bernardo@meurer.org> | 2023-05-04 14:56:42 -0400 |
commit | 228b2cd449a61ca94abf7b5fd5b27a48987a888d (patch) | |
tree | 371b7d9544cb946e4d25ce070f0a63c3eef07542 | |
parent | 6c0773fc34b75a0702d47f9336b60457b5453b99 (diff) |
linux_rpi{1,2,3,4}: 1.20230106 -> 1.20230405
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-rpi.nix | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index da3fa88469d07..1bea619752975 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.15.84"; - tag = "1.20230106"; + modDirVersion = "6.1.21"; + tag = "1.20230405"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = tag; - hash = "sha512-6Dcpo81JBvc8NOv1nvO8JwjUgOOviRgHmXLLcGpE/pI2lEOcSeDRlB/FZtflzXTGilapvmwOSx5NxQfAmysHqQ=="; + hash = "sha256-ILwecHZ1BN6GhZAUB6/UwiN/rZ8gHndKON6DUhidtxI="; }; defconfig = { @@ -27,19 +27,6 @@ lib.overrideDerivation (buildLinux (args // { 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 - # ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_commit_tail': - # ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:7757:4: error: implicit declaration of function 'is_hdr_metadata_different' [-Werror=implicit-function-declaration] - # 7757 | is_hdr_metadata_different(old_con_state, new_con_state); - # | ^~~~~~~~~~~~~~~~~~~~~~~~~ - DRM_AMDGPU n - ''; - extraMeta = if (rpiVersion < 3) then { platforms = with lib.platforms; arm; hydraPlatforms = []; |