diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index b3b43b9a78c8..c813e6e94b10 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -98,8 +98,19 @@ let hardeningDisable = [ "all" ]; dontStrip = true; - # breaks secondary CPU bringup on at least RK3588, maybe others - env.NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; + env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + # breaks secondary CPU bringup on at least RK3588, maybe others + "-fomit-frame-pointer" + + # Breaks compilation of armTrustedFirmwareRK3399: + # /nix/store/hash-arm-none-eabi-binutils-2.44/bin/arm-none-eabi-ld: /build/source/build/rk3399/release/m0/rk3399m0.elf: error: PHDR segment not covered by LOAD segment + # + # This was caused by ccc56d1a79ff2a0f528cecf5e36eb76beaacc8c0 adding the flag `--enable-default-pie`. + # According to https://trustedfirmware-a.readthedocs.io/en/v2.2/getting_started/user-guide.html, + # Trusted Firmware-A has an option called ENABLE_PIE, which is turned off by default. + # Someone with more knowledge of the implications can try using that option instead. + "-no-pie" + ]; meta = with lib; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 15977020a903..7d5d74f1c730 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -34,10 +34,10 @@ }@pkgs: let - defaultVersion = "2025.07"; + defaultVersion = "2025.10"; defaultSrc = fetchurl { url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - hash = "sha256-D5M/bFpCaJW/MG6T5qxTxghw5LVM2lbZUhG+yZ5jvsc="; + hash = "sha256-tPAyhI5WzI8hOtWfkTLAhNu7YyvCkXbQJOWCIODv30o="; }; # Dependencies for the tools need to be included as either native or cross,