Skip to content

Commit 3277508

Browse files
gngramgngram
committed
bsp update for imx8mp-evk
Signed-off-by: Ganga Ram <[email protected]>
1 parent a65b650 commit 3277508

File tree

6 files changed

+59
-76
lines changed

6 files changed

+59
-76
lines changed

‎nxp/imx8mp-evk/bsp/imx8mp-atf.nix

Lines changed: 17 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,36 @@
1-
{
2-
lib,
3-
fetchgit,
4-
enable-tee,
5-
stdenv,
6-
buildPackages,
7-
pkgsCross,
8-
openssl,
1+
{ pkgs
2+
, lib
3+
, fetchgit
4+
, buildArmTrustedFirmware
5+
, enable-tee ? true
6+
,
97
}:
10-
let
11-
opteedflag = if enable-tee then "SPD=opteed" else "";
8+
with pkgs; let
129
target-board = "imx8mp";
10+
opteedflag = if enable-tee then "SPD=opteed" else "";
1311
in
14-
stdenv.mkDerivation rec {
12+
buildArmTrustedFirmware rec {
1513
pname = "imx8mp-atf";
16-
version = "lf6.1.55_2.2.0";
1714
platform = target-board;
1815
enableParallelBuilding = true;
16+
extraMeta.platforms = [ "aarch64-linux" ];
1917

2018
src = fetchgit {
2119
url = "https://github.com/nxp-imx/imx-atf.git";
22-
rev = "08e9d4eef2262c0dd072b4325e8919e06d349e02";
23-
sha256 = "sha256-96EddJXlFEkP/LIGVgNBvUP4IDI3BbDE/c9Yub22gnc=";
20+
rev = "6ddd57019494cabfca5065368349109c37f2cc9f";
21+
sha256 = "sha256-8+5kV6wHhwMYVA9aqn4fNRhvgOLsU9RlX3UL7edMM+A=";
2422
};
2523

26-
depsBuildBuild = [ buildPackages.stdenv.cc ];
27-
28-
# For Cortex-M0 firmware in RK3399
29-
nativeBuildInputs = [ pkgsCross.arm-embedded.stdenv.cc ];
30-
31-
buildInputs = [ openssl ];
32-
33-
makeFlags = [
34-
"HOSTCC=$(CC_FOR_BUILD)"
35-
"M0_CROSS_COMPILE=${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}"
36-
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
37-
# binutils 2.39 regression
38-
# `warning: /build/source/build/rk3399/release/bl31/bl31.elf has a LOAD segment with RWX permissions`
39-
# See also: https://developer.trustedfirmware.org/T996
40-
"LDFLAGS=-no-warn-rwx-segments"
24+
extraMakeFlags = [
4125
"PLAT=${platform}"
4226
"bl31"
4327
"${opteedflag}"
4428
];
4529

46-
installPhase = ''
47-
runHook preInstall
48-
49-
mkdir -p $out
50-
cp build/${target-board}/release/bl31.bin $out
51-
52-
runHook postInstall
53-
'';
30+
filesToInstall = [
31+
"build/${target-board}/release/bl31.bin"
32+
];
5433

55-
hardeningDisable = [ "all" ];
56-
dontStrip = true;
5734

5835
meta = with lib; {
5936
homepage = "https://github.com/nxp-imx/imx-atf";
@@ -62,4 +39,5 @@ stdenv.mkDerivation rec {
6239
maintainers = with maintainers; [ gngram ];
6340
platforms = [ "aarch64-linux" ];
6441
};
42+
6543
}

‎nxp/imx8mp-evk/bsp/imx8mp-boot.nix

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{
2-
pkgs,
3-
enable-tee ? true,
1+
{ pkgs
2+
, enable-tee ? true
3+
,
44
}:
55
with pkgs;
66
let
@@ -15,8 +15,9 @@ let
1515
imx8mp-optee-os = pkgs.callPackage ./imx8mp-optee-os.nix { };
1616
src = pkgs.fetchgit {
1717
url = "https://github.com/nxp-imx/imx-mkimage.git";
18-
rev = "c4365450fb115d87f245df2864fee1604d97c06a";
19-
sha256 = "sha256-KVIVHwBpAwd1RKy3RrYxGIniE45CDlN5RQTXsMg1Jwk=";
18+
#tag: lf-6.12.20_2.0.0
19+
rev = "4c2e5b25232f5aa003976ddca9d1d2fb9667beb1";
20+
sha256 = "sha256-bXvM5Q0Fsb18gupw6/ub62/qNE7wGLaZKugp0URWeUk=";
2021
};
2122
shortRev = builtins.substring 0 8 src.rev;
2223
in

‎nxp/imx8mp-evk/bsp/imx8mp-firmware.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
with pkgs;
33
stdenv.mkDerivation rec {
44
pname = "imx8mp-firmware";
5-
version = "8.22";
5+
version = "8.23";
66

77
src = pkgs.fetchurl {
88
url = "https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-${version}.bin";
9-
sha256 = "sha256-lMi86sVuxQPCMuYU931rvY4Xx9qnHU5lHqj9UDTDA1A=";
9+
sha256 = "sha256-/gdjMpXaw92Z8LpOB6fN6VuySinKgrmps/YCbSmukWo=";
1010
};
1111

1212
dontUnpack = true;

‎nxp/imx8mp-evk/bsp/imx8mp-linux.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ with pkgs;
33
buildLinux (
44
args
55
// rec {
6-
version = "6.1.55";
6+
version = "6.12.20";
77
name = "imx8mp-linux";
88

99
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
@@ -47,10 +47,10 @@ buildLinux (
4747
src = fetchFromGitHub {
4848
owner = "nxp-imx";
4949
repo = "linux-imx";
50-
# tag: lf-6.1.55-2.2.0
51-
rev = "770c5fe2c1d1529fae21b7043911cd50c6cf087e";
52-
sha256 = "sha256-tIWt75RUrjB6KmUuAYBVyAC1dmVGSUAgqV5ROJh3xU0=";
50+
# tag: lf-6.12.20-2.0.0
51+
rev = "dfaf2136deb2af2e60b994421281ba42f1c087e0";
52+
sha256 = "sha256-ITrmj3a5YfXh/PSRTi+Rlto5uEBIAWFWtkTsO1ATXIo=";
5353
};
5454
}
55-
// (args.argsOverride or { })
55+
// (args.argsOverride or { })
5656
)

‎nxp/imx8mp-evk/bsp/imx8mp-optee-os.nix

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{ pkgs }:
22
let
33
python3 = pkgs.buildPackages.python3;
4-
toolchain = pkgs.gcc9Stdenv.cc;
5-
binutils = pkgs.gcc9Stdenv.cc.bintools.bintools_bin;
4+
toolchain = pkgs.gccStdenv.cc;
5+
binutils = pkgs.gccStdenv.cc.bintools.bintools_bin;
66
cpp = pkgs.gcc;
77
in
88
pkgs.stdenv.mkDerivation rec {
99
pname = "imx8mp-optee-os";
10-
version = "lf-6.1.55-2.2.0";
10+
version = "lf-6.12.20-2.0.0";
1111

1212
nativeBuildInputs = [
1313
python3
@@ -23,8 +23,8 @@ pkgs.stdenv.mkDerivation rec {
2323

2424
src = pkgs.fetchgit {
2525
url = "https://github.com/nxp-imx/imx-optee-os.git";
26-
rev = "a303fc80f7c4bd713315687a1fa1d6ed136e78ee";
27-
sha256 = "sha256-OpyG812DX0c06bRZPKWB2cNu6gtZCOvewDhsKgrGB+s=";
26+
rev = "87964807d80baf1dcfd89cafc66de34a1cf16bf3";
27+
sha256 = "sha256-AMZUMgmmyi5l3BMT84uubwjU0lwNObs9XW6ZCbqfhmc=";
2828
};
2929

3030
postPatch = ''
@@ -35,7 +35,9 @@ pkgs.stdenv.mkDerivation rec {
3535
substituteInPlace scripts/pem_to_pub_c.py \
3636
--replace '/usr/bin/env python3' '${python3}/bin/python'
3737
substituteInPlace ta/pkcs11/scripts/verify-helpers.sh \
38-
--replace '/bin/bash' '${pkgs.bash}/bin/bash'
38+
--replace '/usr/bin/env bash' '${pkgs.bash}/bin/bash'
39+
substituteInPlace ta/pkcs11/scripts/dump_ec_curve_params.sh \
40+
--replace '/usr/bin/env bash' '${pkgs.bash}/bin/bash'
3941
substituteInPlace mk/gcc.mk \
4042
--replace "\$(CROSS_COMPILE_\$(sm))objcopy" ${binutils}/bin/${toolchain.targetPrefix}objcopy
4143
substituteInPlace mk/gcc.mk \

‎nxp/imx8mp-evk/bsp/imx8mp-uboot.nix

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
{
2-
stdenv,
3-
lib,
4-
bison,
5-
dtc,
6-
fetchgit,
7-
flex,
8-
gnutls,
9-
libuuid,
10-
ncurses,
11-
openssl,
12-
which,
13-
perl,
14-
buildPackages,
1+
{ stdenv
2+
, lib
3+
, bison
4+
, dtc
5+
, fetchgit
6+
, flex
7+
, gnutls
8+
, libuuid
9+
, ncurses
10+
, openssl
11+
, which
12+
, perl
13+
, buildPackages
14+
, efitools
15+
,
1516
}:
1617
let
1718
ubsrc = fetchgit {
1819
url = "https://github.com/nxp-imx/uboot-imx.git";
19-
# tag: "lf-6.1.55-2.2.0"
20-
rev = "49b102d98881fc28af6e0a8af5ea2186c1d90a5f";
21-
sha256 = "sha256-1j6X82DqezEizeWoSS600XKPNwrQ4yT0vZuUImKAVVA=";
20+
# tag: lf-6.12.20-2.0.0
21+
rev = "9383f8387dc76524524da69992db96c22195a57c";
22+
sha256 = "sha256-httRSwN8NiKOdL7fZEvN/4AbypGQfegYtJgxKIea+Zg=";
2223
};
2324
in
2425
(stdenv.mkDerivation {
2526
pname = "imx8mp-uboot";
26-
version = "2023.04";
27+
version = "2025.04";
2728
src = ubsrc;
2829

2930
postPatch = ''
@@ -41,6 +42,7 @@ in
4142
gnutls
4243
openssl
4344
perl
45+
efitools
4446
];
4547

4648
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -81,7 +83,7 @@ in
8183
mkdir -p $out
8284
cp ./u-boot-nodtb.bin $out
8385
cp ./spl/u-boot-spl.bin $out
84-
cp ./arch/arm/dts/imx8mp-evk.dtb $out
86+
cp ./dts/upstream/src/arm64/freescale/imx8mp-evk.dtb $out
8587
cp .config $out
8688
8789
runHook postInstall

0 commit comments

Comments
 (0)