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

Merge pull request #1666 from brianmcgillion/update-imx8

Browse Source 
imx8-evk: fix cross-compiled builds
This commit is contained in:
Jörg Thalheim
2025-11-05 19:41:19 +00:00
committed by GitHub
parent d48e8f0e16 ae91411396
commit e4c6ee69e7
4 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nxp/common/bsp/imx-mkimage.nix
View File

@@ -16,12 +16,12 @@ pkgs.stdenv.mkDerivation rec {
--replace 'CC = gcc' 'CC = clang' --replace 'CC = gcc' 'CC = clang'
''; '';
nativeBuildInputs = [ depsBuildBuild = [
clang pkgs.buildPackages.stdenv.cc
git
]; ];
buildInputs = [ nativeBuildInputs = [
clang
git git
glibc.static glibc.static
]; ];

4
nxp/common/bsp/imx-optee-builder.nix
View File

@@ -15,7 +15,7 @@ let
inherit (pkgs.buildPackages) python3; inherit (pkgs.buildPackages) python3;
toolchain = pkgs.stdenv.cc; toolchain = pkgs.stdenv.cc;
binutils = pkgs.stdenv.cc.bintools.bintools_bin; binutils = pkgs.stdenv.cc.bintools.bintools_bin;
cpp = pkgs.stdenv.gcc; cpp = pkgs.stdenv.cc;
# Determine PLATFORM and PLATFORM_FLAVOR from platformFlavor # Determine PLATFORM and PLATFORM_FLAVOR from platformFlavor
# Format can be either "imx-mx93evk" (full platform string) or "mx8mpevk" (just flavor, platform is "imx") # Format can be either "imx-mx93evk" (full platform string) or "mx8mpevk" (just flavor, platform is "imx")
@@ -58,7 +58,7 @@ pkgs.stdenv.mkDerivation {
substituteInPlace mk/gcc.mk \ substituteInPlace mk/gcc.mk \
--replace-fail "\$(CROSS_COMPILE_\$(sm))ar" ${binutils}/bin/${toolchain.targetPrefix}ar --replace-fail "\$(CROSS_COMPILE_\$(sm))ar" ${binutils}/bin/${toolchain.targetPrefix}ar
substituteInPlace mk/gcc.mk \ substituteInPlace mk/gcc.mk \
--replace-fail "\$(CROSS_COMPILE_\$(sm))cpp"${cpp}/bin/${toolchain.targetPrefix}cpp --replace-fail "\$(CROSS_COMPILE_\$(sm))cpp" ${cpp}/bin/${toolchain.targetPrefix}cpp
''; '';
makeFlags = [ makeFlags = [

23
nxp/imx8mp-evk/bsp/imx8mp-boot.nix
View File

@@ -2,7 +2,6 @@
pkgs, pkgs,
enable-tee ? true, enable-tee ? true,
}: }:
with pkgs;
let let
fw-ver = "202006"; fw-ver = "202006";
cp-tee = if enable-tee then "install -m 0644 ${imx8mp-optee-os}/tee.bin ./iMX8M/tee.bin" else ""; cp-tee = if enable-tee then "install -m 0644 ${imx8mp-optee-os}/tee.bin ./iMX8M/tee.bin" else "";
@@ -22,7 +21,7 @@ let
shortRev = builtins.substring 0 8 src.rev; shortRev = builtins.substring 0 8 src.rev;
in in
{ {
imx8m-boot = pkgs.stdenv.mkDerivation rec { imx8m-boot = pkgs.buildPackages.stdenv.mkDerivation {
inherit src; inherit src;
name = "imx8mp-mkimage"; name = "imx8mp-mkimage";
version = "lf-6.1.55-2.2.0"; version = "lf-6.1.55-2.2.0";
@@ -30,22 +29,16 @@ in
postPatch = '' postPatch = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace 'git rev-parse --short=8 HEAD' 'echo ${shortRev}' --replace 'git rev-parse --short=8 HEAD' 'echo ${shortRev}'
substituteInPlace Makefile \
--replace 'CC = gcc' 'CC = clang'
patchShebangs scripts patchShebangs scripts
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
clang pkgs.buildPackages.stdenv.cc
git pkgs.buildPackages.git
dtc pkgs.buildPackages.dtc
]; pkgs.buildPackages.glibc.static
pkgs.buildPackages.zlib
buildInputs = [ pkgs.buildPackages.zlib.static
git
glibc.static
zlib
zlib.static
]; ];
buildPhase = '' buildPhase = ''
@@ -54,7 +47,7 @@ in
make bin make bin
make SOC=iMX8MP mkimage_imx8 make SOC=iMX8MP mkimage_imx8
cp -v ${pkgs.ubootTools}/bin/mkimage ./iMX8M/mkimage_uboot cp -v ${pkgs.buildPackages.ubootTools}/bin/mkimage ./iMX8M/mkimage_uboot
install -m 0644 ${imx8mp-uboot}/u-boot-spl.bin ./iMX8M/u-boot-spl.bin install -m 0644 ${imx8mp-uboot}/u-boot-spl.bin ./iMX8M/u-boot-spl.bin
install -m 0644 ${imx8mp-uboot}/u-boot-nodtb.bin ./iMX8M/u-boot-nodtb.bin install -m 0644 ${imx8mp-uboot}/u-boot-nodtb.bin ./iMX8M/u-boot-nodtb.bin

2
nxp/imx8mp-evk/bsp/imx8mp-firmware.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
installPhase = '' installPhase = ''
${pkgs.bash}/bin/bash $src --auto-accept --force ${pkgs.buildPackages.bash}/bin/bash $src --auto-accept --force
mv firmware-imx-${version} $out mv firmware-imx-${version} $out
''; '';
} }