Unverified Commit 228b2cd4 authored by Bernardo Meurer's avatar Bernardo Meurer
Browse files

linux_rpi{1,2,3,4}: 1.20230106 -> 1.20230405

parent 6c0773fc
Loading
Loading
Loading
Loading
+3 −16
Original line number Diff line number Diff line
@@ -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 = [];