lenn/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-07 18:38:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

ucm-imx95: expand pkgs in callPackage for overrides

Browse Source
This commit is contained in:
Jörg Thalheim
2025-11-04 12:48:26 +01:00
parent f2e49f279c
commit fad92f5f57
8 changed files with 89 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
compulab/ucm-imx95/bsp/ucm-imx95-boot.nix
View File

@@ -1,17 +1,24 @@
{ {
pkgs, callPackage,
fetchFromGitHub,
stdenv,
clang,
git,
dtc,
glibc,
zlib,
vim,
}: }:
with pkgs;
let let
imx95-atf = pkgs.callPackage ./ucm-imx95-atf.nix { }; imx95-atf = callPackage ./ucm-imx95-atf.nix { };
imx95-firmware = pkgs.callPackage ./ucm-imx95-firmware.nix { }; imx95-firmware = callPackage ./ucm-imx95-firmware.nix { };
imx95-uboot = pkgs.callPackage ./ucm-imx95-uboot.nix { }; imx95-uboot = callPackage ./ucm-imx95-uboot.nix { };
imx95-optee-os = pkgs.callPackage ./ucm-imx95-optee-os.nix { }; imx95-optee-os = callPackage ./ucm-imx95-optee-os.nix { };
imx95-sm-fw = pkgs.callPackage ./ucm-imx95-sm-fw.nix { }; imx95-sm-fw = callPackage ./ucm-imx95-sm-fw.nix { };
imx95-oei-ddr = pkgs.callPackage ./ucm-imx95-oei-ddr.nix { }; imx95-oei-ddr = callPackage ./ucm-imx95-oei-ddr.nix { };
imx95-oei-tcm = pkgs.callPackage ./ucm-imx95-oei-tcm.nix { }; imx95-oei-tcm = callPackage ./ucm-imx95-oei-tcm.nix { };
src = pkgs.fetchFromGitHub { src = fetchFromGitHub {
owner = "nxp-imx"; owner = "nxp-imx";
repo = "imx-mkimage"; repo = "imx-mkimage";
#tag: lf-6.6.52-2.2.1 #tag: lf-6.6.52-2.2.1
@@ -21,7 +28,7 @@ let
shortRev = builtins.substring 0 8 src.rev; shortRev = builtins.substring 0 8 src.rev;
in in
{ {
imx95-boot = pkgs.stdenv.mkDerivation rec { imx95-boot = stdenv.mkDerivation rec {
inherit src; inherit src;
name = "imx95-mkimage"; name = "imx95-mkimage";
version = "lf-6.6.52-2.2.1"; version = "lf-6.6.52-2.2.1";
@@ -32,11 +39,11 @@ in
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace-fail 'CC = gcc' 'CC = clang' --replace-fail 'CC = gcc' 'CC = clang'
substituteInPlace iMX95/soc.mak \ substituteInPlace iMX95/soc.mak \
--replace-fail 'xxd' "${pkgs.vim.xxd}/bin/xxd" --replace-fail 'xxd' "${vim.xxd}/bin/xxd"
substituteInPlace scripts/fspi_fcb_gen.sh \ substituteInPlace scripts/fspi_fcb_gen.sh \
--replace-fail 'xxd' "${pkgs.vim.xxd}/bin/xxd" --replace-fail 'xxd' "${vim.xxd}/bin/xxd"
substituteInPlace scripts/fspi_packer.sh \ substituteInPlace scripts/fspi_packer.sh \
--replace-fail 'xxd' "${pkgs.vim.xxd}/bin/xxd" --replace-fail 'xxd' "${vim.xxd}/bin/xxd"
patchShebangs scripts patchShebangs scripts
''; '';

6
compulab/ucm-imx95/bsp/ucm-imx95-firmware.nix
View File

@@ -1,10 +1,12 @@
{ {
pkgs, stdenv,
fetchurl,
coreutils,
bash,
siliconRev ? "A0", siliconRev ? "A0",
... ...
}: }:
with pkgs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nxp-firmware-imx95"; pname = "nxp-firmware-imx95";
version = "nxp-firmware-8.28-994fa14"; version = "nxp-firmware-8.28-994fa14";

8
compulab/ucm-imx95/bsp/ucm-imx95-linux.nix
View File

@@ -1,5 +1,9 @@
{ lib, pkgs, ... }@args: {
with pkgs; lib,
buildLinux,
fetchFromGitHub,
...
}@args:
buildLinux ( buildLinux (
args args
// rec { // rec {

24
compulab/ucm-imx95/bsp/ucm-imx95-oei-ddr.nix
View File

@@ -1,20 +1,24 @@
{ {
lib, lib,
pkgs, stdenv,
buildPackages,
gcc-arm-embedded,
fetchFromGitHub,
fetchpatch,
}: }:
let let
metaBspImx95Rev = "5f4c7b5db846fa3a75055054e32215089d15a7b7"; # scarthgap metaBspImx95Rev = "5f4c7b5db846fa3a75055054e32215089d15a7b7"; # scarthgap
in in
pkgs.stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imx95-imx-oei"; pname = "imx95-imx-oei";
version = "lf-6.6.36-2.1.0"; version = "lf-6.6.36-2.1.0";
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.buildPackages.python3 buildPackages.python3
pkgs.gcc-arm-embedded gcc-arm-embedded
]; ];
src = pkgs.fetchFromGitHub { src = fetchFromGitHub {
owner = "nxp-imx"; owner = "nxp-imx";
repo = "imx-oei"; repo = "imx-oei";
rev = "5fca9f47544d03c52ca371eadfffbfd2454e6925"; rev = "5fca9f47544d03c52ca371eadfffbfd2454e6925";
@@ -22,15 +26,15 @@ pkgs.stdenv.mkDerivation rec {
}; };
patches = [ patches = [
(pkgs.fetchpatch { (fetchpatch {
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-oei/imx-oei/0001-Add-CompuLab-lpddr5_timing.c.patch"; url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-oei/imx-oei/0001-Add-CompuLab-lpddr5_timing.c.patch";
sha256 = "sha256-6ZpBOXw2aIhD2i9Wx368xfHq6NvdZghWHU9u8+gRTj8="; sha256 = "sha256-6ZpBOXw2aIhD2i9Wx368xfHq6NvdZghWHU9u8+gRTj8=";
}) })
(pkgs.fetchpatch { (fetchpatch {
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"; 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";
sha256 = "sha256-WZ/vYaTC2iKIC+jnHtnPriCxK9gjRsOv2Uy13Ye4698="; sha256 = "sha256-WZ/vYaTC2iKIC+jnHtnPriCxK9gjRsOv2Uy13Ye4698=";
}) })
(pkgs.fetchpatch { (fetchpatch {
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"; 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";
sha256 = "sha256-yyierv2USZlM8Cuxf4FDj4+UtILvJQH9BJSj+fmayL8="; sha256 = "sha256-yyierv2USZlM8Cuxf4FDj4+UtILvJQH9BJSj+fmayL8=";
}) })
@@ -45,8 +49,8 @@ pkgs.stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"board=mx95lp5" "board=mx95lp5"
"CROSS_COMPILE=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-" "CROSS_COMPILE=${gcc-arm-embedded}/bin/arm-none-eabi-"
"OEI_CROSS_COMPILE=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-" "OEI_CROSS_COMPILE=${gcc-arm-embedded}/bin/arm-none-eabi-"
"ARCH=arm" "ARCH=arm"
"DDR_CONFIG=lpddr5_timing" "DDR_CONFIG=lpddr5_timing"
"oei=ddr" "oei=ddr"

24
compulab/ucm-imx95/bsp/ucm-imx95-oei-tcm.nix
View File

@@ -1,20 +1,24 @@
{ {
lib, lib,
pkgs, stdenv,
buildPackages,
gcc-arm-embedded,
fetchFromGitHub,
fetchpatch,
}: }:
let let
metaBspImx95Rev = "5f4c7b5db846fa3a75055054e32215089d15a7b7"; # scarthgap metaBspImx95Rev = "5f4c7b5db846fa3a75055054e32215089d15a7b7"; # scarthgap
in in
pkgs.stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imx95-imx-oei-tcm"; pname = "imx95-imx-oei-tcm";
version = "lf-6.6.36-2.1.0"; version = "lf-6.6.36-2.1.0";
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.buildPackages.python3 buildPackages.python3
pkgs.gcc-arm-embedded gcc-arm-embedded
]; ];
src = pkgs.fetchFromGitHub { src = fetchFromGitHub {
owner = "nxp-imx"; owner = "nxp-imx";
repo = "imx-oei"; repo = "imx-oei";
rev = "5fca9f47544d03c52ca371eadfffbfd2454e6925"; rev = "5fca9f47544d03c52ca371eadfffbfd2454e6925";
@@ -22,15 +26,15 @@ pkgs.stdenv.mkDerivation rec {
}; };
patches = [ patches = [
(pkgs.fetchpatch { (fetchpatch {
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-oei/imx-oei/0001-Add-CompuLab-lpddr5_timing.c.patch"; url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-oei/imx-oei/0001-Add-CompuLab-lpddr5_timing.c.patch";
sha256 = "sha256-6ZpBOXw2aIhD2i9Wx368xfHq6NvdZghWHU9u8+gRTj8="; sha256 = "sha256-6ZpBOXw2aIhD2i9Wx368xfHq6NvdZghWHU9u8+gRTj8=";
}) })
(pkgs.fetchpatch { (fetchpatch {
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"; 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";
sha256 = "sha256-WZ/vYaTC2iKIC+jnHtnPriCxK9gjRsOv2Uy13Ye4698="; sha256 = "sha256-WZ/vYaTC2iKIC+jnHtnPriCxK9gjRsOv2Uy13Ye4698=";
}) })
(pkgs.fetchpatch { (fetchpatch {
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"; 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";
sha256 = "sha256-yyierv2USZlM8Cuxf4FDj4+UtILvJQH9BJSj+fmayL8="; sha256 = "sha256-yyierv2USZlM8Cuxf4FDj4+UtILvJQH9BJSj+fmayL8=";
}) })
@@ -45,8 +49,8 @@ pkgs.stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"board=mx95lp5" "board=mx95lp5"
"CROSS_COMPILE=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-" "CROSS_COMPILE=${gcc-arm-embedded}/bin/arm-none-eabi-"
"OEI_CROSS_COMPILE=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-" "OEI_CROSS_COMPILE=${gcc-arm-embedded}/bin/arm-none-eabi-"
"ARCH=arm" "ARCH=arm"
"DDR_CONFIG=lpddr5_timing" "DDR_CONFIG=lpddr5_timing"
"oei=tcm" "oei=tcm"

19
compulab/ucm-imx95/bsp/ucm-imx95-optee-os.nix
View File

@@ -1,14 +1,17 @@
{ {
lib, lib,
pkgs, stdenv,
fetchFromGitHub,
buildPackages,
bash,
}: }:
let let
inherit (pkgs.buildPackages) python3; inherit (buildPackages) python3;
toolchain = pkgs.stdenv.cc; toolchain = stdenv.cc;
binutils = pkgs.stdenv.cc.bintools.bintools_bin; binutils = stdenv.cc.bintools.bintools_bin;
cpp = pkgs.stdenv.cc; cpp = stdenv.cc;
in in
pkgs.stdenv.mkDerivation { stdenv.mkDerivation {
pname = "imx95-optee-os"; pname = "imx95-optee-os";
version = "lf-6.6.36_2.1.0"; version = "lf-6.6.36_2.1.0";
@@ -24,7 +27,7 @@ pkgs.stdenv.mkDerivation {
cryptography cryptography
]; ];
src = pkgs.fetchFromGitHub { src = fetchFromGitHub {
owner = "nxp-imx"; owner = "nxp-imx";
repo = "imx-optee-os"; repo = "imx-optee-os";
rev = "612bc5a642a4608d282abeee2349d86de996d7ee"; rev = "612bc5a642a4608d282abeee2349d86de996d7ee";
@@ -50,7 +53,7 @@ pkgs.stdenv.mkDerivation {
substituteInPlace scripts/pem_to_pub_c.py \ substituteInPlace scripts/pem_to_pub_c.py \
--replace-fail '/usr/bin/env python3' '${python3}/bin/python' --replace-fail '/usr/bin/env python3' '${python3}/bin/python'
substituteInPlace ta/pkcs11/scripts/verify-helpers.sh \ substituteInPlace ta/pkcs11/scripts/verify-helpers.sh \
--replace-fail '/bin/bash' '${pkgs.bash}/bin/bash' --replace-fail '/bin/bash' '${bash}/bin/bash'
substituteInPlace mk/gcc.mk \ substituteInPlace mk/gcc.mk \
--replace-fail "\$(CROSS_COMPILE_\$(sm))objcopy" ${binutils}/bin/${toolchain.targetPrefix}objcopy --replace-fail "\$(CROSS_COMPILE_\$(sm))objcopy" ${binutils}/bin/${toolchain.targetPrefix}objcopy
substituteInPlace mk/gcc.mk \ substituteInPlace mk/gcc.mk \

32
compulab/ucm-imx95/bsp/ucm-imx95-sm-fw.nix
View File

@@ -1,26 +1,30 @@
{ {
lib, lib,
pkgs, stdenv,
buildPackages,
gcc-arm-embedded,
fetchFromGitHub,
fetchpatch,
}: }:
let let
metaBspImx95Rev = "224eed17cddc573061150e9d2ce6f9acb39ea50e"; # scarthgap-6.6.36-EVAL-UCM-iMX95-1.0 metaBspImx95Rev = "224eed17cddc573061150e9d2ce6f9acb39ea50e"; # scarthgap-6.6.36-EVAL-UCM-iMX95-1.0
in in
pkgs.stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imx95-sm-fw"; pname = "imx95-sm-fw";
version = "lf-6.6.36-2.1.0"; version = "lf-6.6.36-2.1.0";
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.buildPackages.python3 buildPackages.python3
pkgs.gcc-arm-embedded gcc-arm-embedded
]; ];
propagatedBuildInputs = with pkgs.buildPackages.python3.pkgs; [ propagatedBuildInputs = with buildPackages.python3.pkgs; [
pycryptodomex pycryptodomex
pyelftools pyelftools
cryptography cryptography
]; ];
src = pkgs.fetchFromGitHub { src = fetchFromGitHub {
owner = "nxp-imx"; owner = "nxp-imx";
repo = "imx-sm"; repo = "imx-sm";
rev = "709deccd9338399eb39b5cf99a60eab4fa60d539"; rev = "709deccd9338399eb39b5cf99a60eab4fa60d539";
@@ -28,23 +32,23 @@ pkgs.stdenv.mkDerivation rec {
}; };
patches = [ patches = [
(pkgs.fetchpatch { (fetchpatch {
url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-system-manager/imx-system-manager/0001-Add-mcimx95cust-board.patch"; url = "https://raw.githubusercontent.com/compulab-yokneam/meta-bsp-imx95/${metaBspImx95Rev}/recipes-bsp/imx-system-manager/imx-system-manager/0001-Add-mcimx95cust-board.patch";
sha256 = "sha256-zvZ4bNew+yRPmaZQMrAH087KpCLRqz6zdElfe72Dtuc="; sha256 = "sha256-zvZ4bNew+yRPmaZQMrAH087KpCLRqz6zdElfe72Dtuc=";
}) })
(pkgs.fetchpatch { (fetchpatch {
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"; 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";
sha256 = "sha256-q72VEvJqm2CmOxdWMqGibgXS5lY08mC4srEcy00QdrE="; sha256 = "sha256-q72VEvJqm2CmOxdWMqGibgXS5lY08mC4srEcy00QdrE=";
}) })
(pkgs.fetchpatch { (fetchpatch {
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"; 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";
sha256 = "sha256-JzHqDiD/ZOu6VQQI0JxY17RQ3bA2t1aP3O1sjLPguWs="; sha256 = "sha256-JzHqDiD/ZOu6VQQI0JxY17RQ3bA2t1aP3O1sjLPguWs=";
}) })
(pkgs.fetchpatch { (fetchpatch {
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"; 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";
sha256 = "sha256-dhcDv7Uq856+MBonczMPznk+tuqUFxTcHiKLX+myCVA="; sha256 = "sha256-dhcDv7Uq856+MBonczMPznk+tuqUFxTcHiKLX+myCVA=";
}) })
(pkgs.fetchpatch { (fetchpatch {
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"; 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";
sha256 = "sha256-NcLu6+zXpiSz1bHKW14Zuf6F/4pzKsekb+zaRtKjSTY="; sha256 = "sha256-NcLu6+zXpiSz1bHKW14Zuf6F/4pzKsekb+zaRtKjSTY=";
}) })
@@ -52,7 +56,7 @@ pkgs.stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace sm/makefiles/gcc_cross.mak \ substituteInPlace sm/makefiles/gcc_cross.mak \
--replace-fail "\$(SM_CROSS_COMPILE)objcopy" ${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-objcopy --replace-fail "\$(SM_CROSS_COMPILE)objcopy" ${gcc-arm-embedded}/bin/arm-none-eabi-objcopy
substituteInPlace sm/makefiles/build_info.mak \ substituteInPlace sm/makefiles/build_info.mak \
--replace-fail "/bin/echo" "echo" --replace-fail "/bin/echo" "echo"
substituteInPlace sm/makefiles/gcc_cross.mak \ substituteInPlace sm/makefiles/gcc_cross.mak \
@@ -63,8 +67,8 @@ pkgs.stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"config=mx95cust" "config=mx95cust"
"M=2" "M=2"
"CROSS_COMPILE=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-" "CROSS_COMPILE=${gcc-arm-embedded}/bin/arm-none-eabi-"
"CROSS_COMPILE64=${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-" "CROSS_COMPILE64=${gcc-arm-embedded}/bin/arm-none-eabi-"
"ARCH=arm" "ARCH=arm"
]; ];

2
compulab/ucm-imx95/overlay.nix
View File

@@ -1,3 +1,3 @@
final: _prev: { final: _prev: {
inherit (final.callPackage ./bsp/ucm-imx95-boot.nix { pkgs = final; }) imx95-boot; inherit (final.callPackage ./bsp/ucm-imx95-boot.nix { }) imx95-boot;
} }