librem/5r4/u-boot: update and use newer compiler

This commit is contained in:
Jörg Thalheim
2025-11-06 11:21:15 +01:00
parent 64269645d4
commit ec18896955

View File

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