diff --git a/purism/librem/5r4/u-boot/default.nix b/purism/librem/5r4/u-boot/default.nix index 43dcee43..9cb4d4c4 100644 --- a/purism/librem/5r4/u-boot/default.nix +++ b/purism/librem/5r4/u-boot/default.nix @@ -1,6 +1,5 @@ { stdenv, - gcc11Stdenv, buildUBoot, fetchurl, fetchFromGitLab, @@ -28,7 +27,7 @@ let meta.license = lib.licenses.unfree; }); - arm-trusted-firmware-imx8mq = gcc11Stdenv.mkDerivation (_fa: { + arm-trusted-firmware-imx8mq = stdenv.mkDerivation (_fa: { pname = "arm-trusted-firmware-bl31"; version = "unstable-2020-07-08"; src = fetchFromGitLab { @@ -40,6 +39,7 @@ let }; enableParallelBuilding = true; hardeningDisable = [ "all" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; NIX_LDFLAGS = "--no-warn-rwx-segments"; buildFlags = [ "PLAT=imx8mq" @@ -53,14 +53,14 @@ let }); ubootLibrem5 = buildUBoot { - version = "unstable-2022-12-15"; + version = "unstable-2025-03-25"; defconfig = "librem5_defconfig"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "uboot-imx"; - rev = "956aa590c93977992743b41c45d3c7ee5a024915"; # this is the latest commit on the upstream/librem5 branch - hash = "sha256-MsIIlarN+WFFEzc0ptLAgS7BwJ6Cosy42xo0EwPn1AU="; + rev = "72fcd4ee36e0874daac734c1195263cd9ce9d981"; # this is the latest commit on the upstream/librem5 branch + hash = "sha256-ymqZPuyyZoFTaCMQIJnuNs1fV0uVwJhyQdnGwv9m9lE="; }; patches = [ ]; BL31 = "${arm-trusted-firmware-imx8mq}/bl31.bin";