Unverified Commit 84549cb0 authored by Bernardo Meurer's avatar Bernardo Meurer Committed by GitHub
Browse files

Merge pull request #229947 from lovesegfault/rpi-updates

parents 7975a3ce 228b2cd4

pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix

+5 −10
Original line number Diff line number Diff line
@@ -2,22 +2,22 @@ 


stdenvNoCC.mkDerivation {

  pname = "raspberrypi-wireless-firmware";

  version = "2022-07-06";

  version = "unstable-2023-05-04";



  srcs = [

    (fetchFromGitHub {

      name = "bluez-firmware";

      owner = "RPi-Distro";

      repo = "bluez-firmware";

      rev = "dd840d991939f5046959b8c564596c7228f9d41d";

      hash = "sha512-XvF6IHDoKBJkSs0Wyt8O1vcCMpSNS9WSYopn0+EyCr4btABGsHWTkgxb4nQbd+VbE6Ls2dcKr+c+X6aw/y1jhQ==";

      rev = "9556b08ace2a1735127894642cc8ea6529c04c90";

      hash = "sha256-gKGK0XzNrws5REkKg/JP6SZx3KsJduu53SfH3Dichkc=";

    })

    (fetchFromGitHub {

      name = "firmware-nonfree";

      owner = "RPi-Distro";

      repo = "firmware-nonfree";

      rev = "541e5a05d152e7e6f0d9be45622e4a3741e51c02";

      hash = "sha512-0erVWiFom0V5AMu+XlolJnY9Q5/RCFlZwUovMBMNdEPb+L5rHcCdrA7zehDX1oRNe8DPb4S5gjny0iG/G7G6NQ==";

      rev = "2b465a10b04555b7f45b3acb85959c594922a3ce";

      hash = "sha256-9UgB8f2AaxG7S5Px46jOP9wUeO1VXKB0uJiPWh32oDI=";

    })

  ];
@@ -37,11 +37,6 @@ stdenvNoCC.mkDerivation { 
    # Bluetooth firmware

    cp -rv "$NIX_BUILD_TOP/bluez-firmware/broadcom/." "$out/lib/firmware/brcm"



    # CM4 symlink must be added since it's missing from upstream

    pushd $out/lib/firmware/brcm &>/dev/null

    ln -s "./brcmfmac43455-sdio.txt" "$out/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt"

    popd &>/dev/null



    runHook postInstall

  '';

pkgs/os-specific/linux/firmware/raspberrypi/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
stdenvNoCC.mkDerivation rec {

  # NOTE: this should be updated with linux_rpi

  pname = "raspberrypi-firmware";

  version = "1.20230106";

  version = "1.20230405";



  src = fetchFromGitHub {

    owner = "raspberrypi";

    repo = "firmware";

    rev = version;

    hash = "sha512-iKUR16RipN8BGAmXteTJUzd/P+m5gnbWCJ28LEzYfOTJnGSal63zI7LDQg/HIKXx9wMTARQKObeKn+7ioS4QkA==";

    hash = "sha256-UtUd1MbsrDFxd/1C3eOAMDKPZMx+kSMFYOJP+Kc6IU8=";

  };



  installPhase = ''
@@ -26,6 +26,8 @@ stdenvNoCC.mkDerivation rec { 
    homepage = "https://github.com/raspberrypi/firmware";

    license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom

    maintainers = with maintainers; [ dezgeg ];

    broken = stdenvNoCC.isDarwin; # Hash mismatch on source, mystery.

    # Hash mismatch on source, mystery.

    # Maybe due to https://github.com/NixOS/nix/issues/847

    broken = stdenvNoCC.isDarwin;

  };

}

pkgs/os-specific/linux/kernel/linux-rpi.nix

+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 = [];