From 1e8864c95b3f0dc87a7a0425ee1086285d22445b Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 13 Mar 2026 20:54:41 +0000 Subject: [PATCH] pkgsCross.aarch64-multiplatform.armTrustedFirmwareRK3399: fix build atf 2.14 changed the toolchain guessing logic, and the undecorated `objcopy` (for the build platform) was improperly taking precedent over the rk3399-compatible `arm-none-eabi-objcopy`. force ATF's build script to use the old toolchain detection ordering. --- pkgs/misc/arm-trusted-firmware/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 2636b917585b..0ad2f8c3acb7 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -63,9 +63,10 @@ let openssl # For fiptool ]; - # Make the new toolchain guessing (from 2.11+) happy - # https://github.com/ARM-software/arm-trusted-firmware/blob/4ec2948fe3f65dba2f19e691e702f7de2949179c/make_helpers/toolchains/rk3399-m0.mk#L21-L22 - rk3399-m0-oc = "${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}objcopy"; + # Make the new toolchain guessing (from 2.14+) happy + # https://github.com/ARM-software/arm-trusted-firmware/blob/1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc/make_helpers/toolchain.mk#L370 + # https://github.com/ARM-software/arm-trusted-firmware/blob/1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc/make_helpers/toolchains/rk3399-m0.mk#L22 + rk3399-m0-oc-parameter = "rk3399-m0-oc-default"; buildInputs = [ openssl ];