nixos/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-08 19:46:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm-imx95: fix firmware parameter collision and update imx-mkimage

Browse source 
Fixed parameter name collision in ucm-imx95-firmware.nix where the
'silicon' parameter conflicted with the nixpkgs silicon package, causing
the wrong AHAB container to be selected. Renamed to 'siliconRev'.

Updated imx-mkimage from lf-6.6.36 to lf-6.6.52-2.2.1 to match the
firmware version expectations (v202409 instead of v202311).
This commit is contained in:
Jörg Thalheim 2025-10-30 14:48:42 +01:00
parent 11ea8b8477
commit 8650454db6
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compulab/ucm-imx95/bsp/ucm-imx95-boot.nix
View file

@ -14,9 +14,9 @@ let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nxp-imx"; owner = "nxp-imx";
repo = "imx-mkimage"; repo = "imx-mkimage";
#tag: lf-6.6.36 #tag: lf-6.6.52-2.2.1
rev = "4622115cbc037f79039c4522faeced4aabea986b"; rev = "f620fb8ef7a04c8dbed8119880f5eeffe3e69746";
sha256 = "sha256-2gz0GxlB3jwy8PC6+cP3+MpyUzqE1vDTw8nuxK6vo3g="; sha256 = "sha256-JZlX122uZntCIISI1H3Hw+tnk+N/gBJpFFDaZoY8W3c=";
}; };
shortRev = builtins.substring 0 8 src.rev; shortRev = builtins.substring 0 8 src.rev;
in in

4
compulab/ucm-imx95/bsp/ucm-imx95-firmware.nix
View file

@ -1,6 +1,6 @@
{ {
pkgs, pkgs,
silicon ? "A0", siliconRev ? "A0",
... ...
}: }:
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
export SILICON=${silicon} export SILICON=${siliconRev}
# M7 firmware # M7 firmware
echo "Copying M7 firmware..." echo "Copying M7 firmware..."