Skip to content

Commit fad92f5

Browse files
Mic92Mic92
committed
ucm-imx95: expand pkgs in callPackage for overrides
1 parent f2e49f2 commit fad92f5

File tree

8 files changed

+89
-61
lines changed

8 files changed

+89
-61
lines changed

‎compulab/ucm-imx95/bsp/ucm-imx95-boot.nix‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
{
2-
pkgs,
2+
callPackage,
3+
fetchFromGitHub,
4+
stdenv,
5+
clang,
6+
git,
7+
dtc,
8+
glibc,
9+
zlib,
10+
vim,
311
}:
4-
with pkgs;
512
let
613

7-
imx95-atf = pkgs.callPackage ./ucm-imx95-atf.nix { };
8-
imx95-firmware = pkgs.callPackage ./ucm-imx95-firmware.nix { };
9-
imx95-uboot = pkgs.callPackage ./ucm-imx95-uboot.nix { };
10-
imx95-optee-os = pkgs.callPackage ./ucm-imx95-optee-os.nix { };
11-
imx95-sm-fw = pkgs.callPackage ./ucm-imx95-sm-fw.nix { };
12-
imx95-oei-ddr = pkgs.callPackage ./ucm-imx95-oei-ddr.nix { };
13-
imx95-oei-tcm = pkgs.callPackage ./ucm-imx95-oei-tcm.nix { };
14-
src = pkgs.fetchFromGitHub {
14+
imx95-atf = callPackage ./ucm-imx95-atf.nix { };
15+
imx95-firmware = callPackage ./ucm-imx95-firmware.nix { };
16+
imx95-uboot = callPackage ./ucm-imx95-uboot.nix { };
17+
imx95-optee-os = callPackage ./ucm-imx95-optee-os.nix { };
18+
imx95-sm-fw = callPackage ./ucm-imx95-sm-fw.nix { };
19+
imx95-oei-ddr = callPackage ./ucm-imx95-oei-ddr.nix { };
20+
imx95-oei-tcm = callPackage ./ucm-imx95-oei-tcm.nix { };
21+
src = fetchFromGitHub {
1522
owner = "nxp-imx";
1623
repo = "imx-mkimage";
1724
#tag: lf-6.6.52-2.2.1
@@ -21,7 +28,7 @@ let
2128
shortRev = builtins.substring 0 8 src.rev;
2229
in
2330
{
24-
imx95-boot = pkgs.stdenv.mkDerivation rec {
31+
imx95-boot = stdenv.mkDerivation rec {
2532
inherit src;
2633
name = "imx95-mkimage";
2734
version = "lf-6.6.52-2.2.1";
@@ -32,11 +39,11 @@ in
3239
substituteInPlace Makefile \
3340
--replace-fail 'CC = gcc' 'CC = clang'
3441
substituteInPlace iMX95/soc.mak \
35-
--replace-fail 'xxd' "${pkgs.vim.xxd}/bin/xxd"
42+
--replace-fail 'xxd' "${vim.xxd}/bin/xxd"
3643
substituteInPlace scripts/fspi_fcb_gen.sh \
37-
--replace-fail 'xxd' "${pkgs.vim.xxd}/bin/xxd"
44+
--replace-fail 'xxd' "${vim.xxd}/bin/xxd"
3845
substituteInPlace scripts/fspi_packer.sh \
39-
--replace-fail 'xxd' "${pkgs.vim.xxd}/bin/xxd"
46+
--replace-fail 'xxd' "${vim.xxd}/bin/xxd"
4047
patchShebangs scripts
4148
'';
4249

‎compulab/ucm-imx95/bsp/ucm-imx95-firmware.nix‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
2-
pkgs,
2+
stdenv,
3+
fetchurl,
4+
coreutils,
5+
bash,
36
siliconRev ? "A0",
47
...
58
}:
69

7-
with pkgs;
810
stdenv.mkDerivation rec {
911
pname = "nxp-firmware-imx95";
1012
version = "nxp-firmware-8.28-994fa14";

‎compulab/ucm-imx95/bsp/ucm-imx95-linux.nix‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
{ lib, pkgs, ... }@args:
2-
with pkgs;
1+
{
2+
lib,
3+
buildLinux,
4+
fetchFromGitHub,
5+
...
6+
}@args:
37
buildLinux (
48
args
59
// rec {

‎compulab/ucm-imx95/bsp/ucm-imx95-oei-ddr.nix‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
{
22
lib,
3-
pkgs,
3+
stdenv,
4+
buildPackages,
5+
gcc-arm-embedded,
6+
fetchFromGitHub,
7+
fetchpatch,
48
}:
59
let
610
metaBspImx95Rev = "5f4c7b5db846fa3a75055054e32215089d15a7b7"; # scarthgap
711
in
8-
pkgs.stdenv.mkDerivation rec {
12+
stdenv.mkDerivation rec {
913
pname = "imx95-imx-oei";
1014
version = "lf-6.6.36-2.1.0";
1115

1216
nativeBuildInputs = [
13-
pkgs.buildPackages.python3
14-
pkgs.gcc-arm-embedded
17+
buildPackages.python3
18+
gcc-arm-embedded
1519
];
1620

17-
src = pkgs.fetchFromGitHub {
21+
src = fetchFromGitHub {
1822
owner = "nxp-imx";
1923
repo = "imx-oei";
2024
rev = "5fca9f47544d03c52ca371eadfffbfd2454e6925";
2125
sha256 = "sha256-Sb6u1NlhJpDCOKBu3HqUb4BLEy0F8LYVnJE0tRSvzWc=";
2226
};
2327

2428
patches = [
25-
(pkgs.fetchpatch {
29+
(fetchpatch {
2630
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-oei/imx-oei/0001-Add-CompuLab-lpddr5_timing.c.patch";
2731
sha256 = "sha256-6ZpBOXw2aIhD2i9Wx368xfHq6NvdZghWHU9u8+gRTj8=";
2832
})
29-
(pkgs.fetchpatch {
33+
(fetchpatch {
3034
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-oei/imx-oei/0002-board-mx95lp5-Fix-default-DDR_CONFIG-timing-name.patch";
3135
sha256 = "sha256-WZ/vYaTC2iKIC+jnHtnPriCxK9gjRsOv2Uy13Ye4698=";
3236
})
33-
(pkgs.fetchpatch {
37+
(fetchpatch {
3438
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-oei/imx-oei/0003-Add-CompuLab-lpddr5_timing_4g.c.patch";
3539
sha256 = "sha256-yyierv2USZlM8Cuxf4FDj4+UtILvJQH9BJSj+fmayL8=";
3640
})
@@ -45,8 +49,8 @@ pkgs.stdenv.mkDerivation rec {
4549

4650
makeFlags = [
4751
"board=mx95lp5"
48-
"CROSS_COMPILE=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-"
49-
"OEI_CROSS_COMPILE=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-"
52+
"CROSS_COMPILE=${gcc-arm-embedded}/bin/arm-none-eabi-"
53+
"OEI_CROSS_COMPILE=${gcc-arm-embedded}/bin/arm-none-eabi-"
5054
"ARCH=arm"
5155
"DDR_CONFIG=lpddr5_timing"
5256
"oei=ddr"

‎compulab/ucm-imx95/bsp/ucm-imx95-oei-tcm.nix‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
{
22
lib,
3-
pkgs,
3+
stdenv,
4+
buildPackages,
5+
gcc-arm-embedded,
6+
fetchFromGitHub,
7+
fetchpatch,
48
}:
59
let
610
metaBspImx95Rev = "5f4c7b5db846fa3a75055054e32215089d15a7b7"; # scarthgap
711
in
8-
pkgs.stdenv.mkDerivation rec {
12+
stdenv.mkDerivation rec {
913
pname = "imx95-imx-oei-tcm";
1014
version = "lf-6.6.36-2.1.0";
1115

1216
nativeBuildInputs = [
13-
pkgs.buildPackages.python3
14-
pkgs.gcc-arm-embedded
17+
buildPackages.python3
18+
gcc-arm-embedded
1519
];
1620

17-
src = pkgs.fetchFromGitHub {
21+
src = fetchFromGitHub {
1822
owner = "nxp-imx";
1923
repo = "imx-oei";
2024
rev = "5fca9f47544d03c52ca371eadfffbfd2454e6925";
2125
sha256 = "sha256-Sb6u1NlhJpDCOKBu3HqUb4BLEy0F8LYVnJE0tRSvzWc=";
2226
};
2327

2428
patches = [
25-
(pkgs.fetchpatch {
29+
(fetchpatch {
2630
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-oei/imx-oei/0001-Add-CompuLab-lpddr5_timing.c.patch";
2731
sha256 = "sha256-6ZpBOXw2aIhD2i9Wx368xfHq6NvdZghWHU9u8+gRTj8=";
2832
})
29-
(pkgs.fetchpatch {
33+
(fetchpatch {
3034
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-oei/imx-oei/0002-board-mx95lp5-Fix-default-DDR_CONFIG-timing-name.patch";
3135
sha256 = "sha256-WZ/vYaTC2iKIC+jnHtnPriCxK9gjRsOv2Uy13Ye4698=";
3236
})
33-
(pkgs.fetchpatch {
37+
(fetchpatch {
3438
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-oei/imx-oei/0003-Add-CompuLab-lpddr5_timing_4g.c.patch";
3539
sha256 = "sha256-yyierv2USZlM8Cuxf4FDj4+UtILvJQH9BJSj+fmayL8=";
3640
})
@@ -45,8 +49,8 @@ pkgs.stdenv.mkDerivation rec {
4549

4650
makeFlags = [
4751
"board=mx95lp5"
48-
"CROSS_COMPILE=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-"
49-
"OEI_CROSS_COMPILE=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-"
52+
"CROSS_COMPILE=${gcc-arm-embedded}/bin/arm-none-eabi-"
53+
"OEI_CROSS_COMPILE=${gcc-arm-embedded}/bin/arm-none-eabi-"
5054
"ARCH=arm"
5155
"DDR_CONFIG=lpddr5_timing"
5256
"oei=tcm"

‎compulab/ucm-imx95/bsp/ucm-imx95-optee-os.nix‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
lib,
3-
pkgs,
3+
stdenv,
4+
fetchFromGitHub,
5+
buildPackages,
6+
bash,
47
}:
58
let
6-
inherit (pkgs.buildPackages) python3;
7-
toolchain = pkgs.stdenv.cc;
8-
binutils = pkgs.stdenv.cc.bintools.bintools_bin;
9-
cpp = pkgs.stdenv.cc;
9+
inherit (buildPackages) python3;
10+
toolchain = stdenv.cc;
11+
binutils = stdenv.cc.bintools.bintools_bin;
12+
cpp = stdenv.cc;
1013
in
11-
pkgs.stdenv.mkDerivation {
14+
stdenv.mkDerivation {
1215
pname = "imx95-optee-os";
1316
version = "lf-6.6.36_2.1.0";
1417

@@ -24,7 +27,7 @@ pkgs.stdenv.mkDerivation {
2427
cryptography
2528
];
2629

27-
src = pkgs.fetchFromGitHub {
30+
src = fetchFromGitHub {
2831
owner = "nxp-imx";
2932
repo = "imx-optee-os";
3033
rev = "612bc5a642a4608d282abeee2349d86de996d7ee";
@@ -50,7 +53,7 @@ pkgs.stdenv.mkDerivation {
5053
substituteInPlace scripts/pem_to_pub_c.py \
5154
--replace-fail '/usr/bin/env python3' '${python3}/bin/python'
5255
substituteInPlace ta/pkcs11/scripts/verify-helpers.sh \
53-
--replace-fail '/bin/bash' '${pkgs.bash}/bin/bash'
56+
--replace-fail '/bin/bash' '${bash}/bin/bash'
5457
substituteInPlace mk/gcc.mk \
5558
--replace-fail "\$(CROSS_COMPILE_\$(sm))objcopy" ${binutils}/bin/${toolchain.targetPrefix}objcopy
5659
substituteInPlace mk/gcc.mk \

‎compulab/ucm-imx95/bsp/ucm-imx95-sm-fw.nix‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,62 @@
11
{
22
lib,
3-
pkgs,
3+
stdenv,
4+
buildPackages,
5+
gcc-arm-embedded,
6+
fetchFromGitHub,
7+
fetchpatch,
48
}:
59
let
610
metaBspImx95Rev = "224eed17cddc573061150e9d2ce6f9acb39ea50e"; # scarthgap-6.6.36-EVAL-UCM-iMX95-1.0
711
in
8-
pkgs.stdenv.mkDerivation rec {
12+
stdenv.mkDerivation rec {
913
pname = "imx95-sm-fw";
1014
version = "lf-6.6.36-2.1.0";
1115

1216
nativeBuildInputs = [
13-
pkgs.buildPackages.python3
14-
pkgs.gcc-arm-embedded
17+
buildPackages.python3
18+
gcc-arm-embedded
1519
];
1620

17-
propagatedBuildInputs = with pkgs.buildPackages.python3.pkgs; [
21+
propagatedBuildInputs = with buildPackages.python3.pkgs; [
1822
pycryptodomex
1923
pyelftools
2024
cryptography
2125
];
2226

23-
src = pkgs.fetchFromGitHub {
27+
src = fetchFromGitHub {
2428
owner = "nxp-imx";
2529
repo = "imx-sm";
2630
rev = "709deccd9338399eb39b5cf99a60eab4fa60d539";
2731
sha256 = "sha256-02Cl+XhWGSFswspdBJ/4B/mBm4XTs/qKotx0BXMQpJk=";
2832
};
2933

3034
patches = [
31-
(pkgs.fetchpatch {
35+
(fetchpatch {
3236
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-system-manager/imx-system-manager/0001-Add-mcimx95cust-board.patch";
3337
sha256 = "sha256-zvZ4bNew+yRPmaZQMrAH087KpCLRqz6zdElfe72Dtuc=";
3438
})
35-
(pkgs.fetchpatch {
39+
(fetchpatch {
3640
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-system-manager/imx-system-manager/0002-Fix-null-pionter-except.patch";
3741
sha256 = "sha256-q72VEvJqm2CmOxdWMqGibgXS5lY08mC4srEcy00QdrE=";
3842
})
39-
(pkgs.fetchpatch {
43+
(fetchpatch {
4044
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-system-manager/imx-system-manager/0001-update-for-yocto-6.6.36-compatibility.patch";
4145
sha256 = "sha256-JzHqDiD/ZOu6VQQI0JxY17RQ3bA2t1aP3O1sjLPguWs=";
4246
})
43-
(pkgs.fetchpatch {
47+
(fetchpatch {
4448
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-system-manager/imx-system-manager/0003-sm-Disable-GPIO1-10-interrupt.patch";
4549
sha256 = "sha256-dhcDv7Uq856+MBonczMPznk+tuqUFxTcHiKLX+myCVA=";
4650
})
47-
(pkgs.fetchpatch {
51+
(fetchpatch {
4852
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-system-manager/imx-system-manager/0004-configs-mx95cust-change-LPTPM1-ownership.patch";
4953
sha256 = "sha256-NcLu6+zXpiSz1bHKW14Zuf6F/4pzKsekb+zaRtKjSTY=";
5054
})
5155
];
5256

5357
postPatch = ''
5458
substituteInPlace sm/makefiles/gcc_cross.mak \
55-
--replace-fail "\$(SM_CROSS_COMPILE)objcopy" ${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-objcopy
59+
--replace-fail "\$(SM_CROSS_COMPILE)objcopy" ${gcc-arm-embedded}/bin/arm-none-eabi-objcopy
5660
substituteInPlace sm/makefiles/build_info.mak \
5761
--replace-fail "/bin/echo" "echo"
5862
substituteInPlace sm/makefiles/gcc_cross.mak \
@@ -63,8 +67,8 @@ pkgs.stdenv.mkDerivation rec {
6367
makeFlags = [
6468
"config=mx95cust"
6569
"M=2"
66-
"CROSS_COMPILE=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-"
67-
"CROSS_COMPILE64=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-"
70+
"CROSS_COMPILE=${gcc-arm-embedded}/bin/arm-none-eabi-"
71+
"CROSS_COMPILE64=${gcc-arm-embedded}/bin/arm-none-eabi-"
6872
"ARCH=arm"
6973
];
7074

‎compulab/ucm-imx95/overlay.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
final: _prev: {
2-
inherit (final.callPackage ./bsp/ucm-imx95-boot.nix { pkgs = final; }) imx95-boot;
2+
inherit (final.callPackage ./bsp/ucm-imx95-boot.nix { }) imx95-boot;
33
}

0 commit comments

Comments
 (0)