gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgsCross.aarch64-multiplatform.armTrustedFirmwareRK3399: fix build

Browse Source 
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.
This commit is contained in:
Colin
2026-03-13 20:54:41 +00:00
parent dd6722c0d5
commit 1e8864c95b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/arm-trusted-firmware/default.nix
+4 -3
View File
@@ -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 ];