Unverified Commit df6941b2 authored by K900's avatar K900 Committed by GitHub
Browse files

uboot: 2025.07 -> 2025.10 (#450220)

parents 34484f70 3b680a27

pkgs/misc/arm-trusted-firmware/default.nix

+13 −2
Original line number Diff line number Diff line
@@ -98,8 +98,19 @@ let 
        hardeningDisable = [ "all" ];

        dontStrip = true;



        env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [

          # breaks secondary CPU bringup on at least RK3588, maybe others

        env.NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";

          "-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;

pkgs/misc/uboot/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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,