From 8650454db6c8250a39c0bcfe00d65a1d8201bfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 30 Oct 2025 14:48:42 +0100
Subject: [PATCH] ucm-imx95: fix firmware parameter collision and update
 imx-mkimage

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).
---
 compulab/ucm-imx95/bsp/ucm-imx95-boot.nix     | 6 +++---
 compulab/ucm-imx95/bsp/ucm-imx95-firmware.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compulab/ucm-imx95/bsp/ucm-imx95-boot.nix b/compulab/ucm-imx95/bsp/ucm-imx95-boot.nix
index 30087b21..4f30ae55 100644
--- a/compulab/ucm-imx95/bsp/ucm-imx95-boot.nix
+++ b/compulab/ucm-imx95/bsp/ucm-imx95-boot.nix
@@ -14,9 +14,9 @@ let
   src = pkgs.fetchFromGitHub {
     owner = "nxp-imx";
     repo = "imx-mkimage";
-    #tag: lf-6.6.36
-    rev = "4622115cbc037f79039c4522faeced4aabea986b";
-    sha256 = "sha256-2gz0GxlB3jwy8PC6+cP3+MpyUzqE1vDTw8nuxK6vo3g=";
+    #tag: lf-6.6.52-2.2.1
+    rev = "f620fb8ef7a04c8dbed8119880f5eeffe3e69746";
+    sha256 = "sha256-JZlX122uZntCIISI1H3Hw+tnk+N/gBJpFFDaZoY8W3c=";
   };
   shortRev = builtins.substring 0 8 src.rev;
 in
diff --git a/compulab/ucm-imx95/bsp/ucm-imx95-firmware.nix b/compulab/ucm-imx95/bsp/ucm-imx95-firmware.nix
index 84a81f34..f5dd7b51 100644
--- a/compulab/ucm-imx95/bsp/ucm-imx95-firmware.nix
+++ b/compulab/ucm-imx95/bsp/ucm-imx95-firmware.nix
@@ -1,6 +1,6 @@
 {
   pkgs,
-  silicon ? "A0",
+  siliconRev ? "A0",
   ...
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out
-    export SILICON=${silicon}
+    export SILICON=${siliconRev}
 
     # M7 firmware
     echo "Copying M7 firmware..."