nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux/common-config: update for 6.10

Browse Source 
We assume RISC-V uses an uncompressed kernel in
lib/systems/platforms.nix.  Since this is the first Linux version to
support either xz or zstd compressed kernels on RISC-V, we can't
change platforms.nix to match the other platforms without breaking
builds of older kernel versions, so let's just preserve the old
behaviour.

We could in future decide to use gzip-compressed kernels on RISC-V,
which is supported going back further.
This commit is contained in:
Alyssa Ross 2024-05-28 09:05:38 +02:00
parent 51889eb9a6
commit a84c4c3168
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -441,7 +441,8 @@ let
# (stable) amdgpu support for bonaire and newer chipsets # (stable) amdgpu support for bonaire and newer chipsets
DRM_AMDGPU_CIK = yes; DRM_AMDGPU_CIK = yes;
# Allow device firmware updates # Allow device firmware updates
DRM_DP_AUX_CHARDEV = yes; DRM_DP_AUX_CHARDEV = whenOlder "6.10" yes;
DRM_DISPLAY_DP_AUX_CHARDEV = whenAtLeast "6.10" yes;
# amdgpu display core (DC) support # amdgpu display core (DC) support
DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes; DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes;
DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes; DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes;
@ -470,7 +471,8 @@ let
MEDIA_CEC_RC = whenAtLeast "5.10" yes; MEDIA_CEC_RC = whenAtLeast "5.10" yes;
# Enable CEC over DisplayPort # Enable CEC over DisplayPort
DRM_DP_CEC = yes; DRM_DP_CEC = whenOlder "6.10" yes;
DRM_DISPLAY_DP_AUX_CEC = whenAtLeast "6.10" yes;
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
# Intel GVT-g graphics virtualization supports 64-bit only # Intel GVT-g graphics virtualization supports 64-bit only
DRM_I915_GVT = yes; DRM_I915_GVT = yes;
@ -927,8 +929,10 @@ let
# i686 issues: https://github.com/NixOS/nixpkgs/pull/117961#issuecomment-812106375 # i686 issues: https://github.com/NixOS/nixpkgs/pull/117961#issuecomment-812106375
useZstd = stdenv.buildPlatform.is64bit && versionAtLeast version "5.9"; useZstd = stdenv.buildPlatform.is64bit && versionAtLeast version "5.9";
in { in {
KERNEL_XZ = mkIf (!useZstd) yes; # stdenv.hostPlatform.linux-kernel.target assumes uncompressed on RISC-V.
KERNEL_ZSTD = mkIf useZstd yes; KERNEL_UNCOMPRESSED = mkIf stdenv.hostPlatform.isRiscV yes;
KERNEL_XZ = mkIf (!stdenv.hostPlatform.isRiscV && !useZstd) yes;
KERNEL_ZSTD = mkIf (!stdenv.hostPlatform.isRiscV && useZstd) yes;
HID_BATTERY_STRENGTH = yes; HID_BATTERY_STRENGTH = yes;
# enabled by default in x86_64 but not arm64, so we do that here # enabled by default in x86_64 but not arm64, so we do that here