armTrustedFirmwareTools: 2.10.0 -> 2.12.0

This commit is contained in:
Tom Vincent
2025-01-14 09:47:52 +00:00
committed by GitHub
parent 54547d2b55
commit 2d1609b0ef

View File

@@ -26,13 +26,13 @@ let
stdenv.mkDerivation (rec {
pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}";
version = "2.10.0";
version = "2.12.0";
src = fetchFromGitHub {
owner = "ARM-software";
repo = "arm-trusted-firmware";
rev = "v${version}";
hash = "sha256-CAuftVST9Fje/DWaaoX0K2SfWwlGMaUFG4huuwsTOSU=";
hash = "sha256-PCUKLfmvIBiJqVmKSUKkNig1h44+4RypZ04BvJ+HP6M=";
};
patches = lib.optionals deleteHDCPBlobBeforeBuild [
@@ -156,17 +156,6 @@ in {
platform = "rk3588";
extraMeta.platforms = ["aarch64-linux"];
filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"];
# TODO: remove this once the following get merged:
# 1: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/21840
# 2: https://review.trustedfirmware.org/c/ci/tf-a-ci-scripts/+/21833
src = fetchFromGitLab {
domain = "gitlab.collabora.com";
owner = "hardware-enablement/rockchip-3588";
repo = "trusted-firmware-a";
rev = "002d8e85ce5f4f06ebc2c2c52b4923a514bfa701";
hash = "sha256-1XOG7ILIgWa3uXUmAh9WTfSGLD/76OsmWrUhIxm/zTg=";
};
};
armTrustedFirmwareS905 = buildArmTrustedFirmware rec {