From f1b2f71c86a5b1941d20608db0b1e88a07d31303 Mon Sep 17 00:00:00 2001
From: Ganga Ram <Ganga.Ram@tii.ae>
Date: Tue, 13 Feb 2024 17:05:03 +0400
Subject: [PATCH] Update repository path for nxp/imx

Signed-off-by: Ganga Ram <Ganga.Ram@tii.ae>
---
 nxp/common/bsp/imx-atf.nix      |  2 +-
 nxp/common/bsp/imx-mkimage.nix  | 11 ++++++++---
 nxp/common/bsp/imx-optee-os.nix |  2 +-
 nxp/common/bsp/imx-uboot.nix    |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/nxp/common/bsp/imx-atf.nix b/nxp/common/bsp/imx-atf.nix
index ec2c751..efd8c43 100644
--- a/nxp/common/bsp/imx-atf.nix
+++ b/nxp/common/bsp/imx-atf.nix
@@ -7,7 +7,7 @@
 {
   armTrustedFirmwareiMX8 = buildArmTrustedFirmware rec {
     src = fetchgit {
-      url = "https://source.codeaurora.org/external/imx/imx-atf";
+      url = "https://github.com/nxp-imx/imx-atf.git";
       # tag: "lf_v2.6"
       rev = "c6a19b1a351308cc73443283f6aa56b2eff791b8";
       sha256 = "sha256-C046MrZBDFuzBdnjuPC2fAGtXzZjTWRrO8nYTf1rjeg=";
diff --git a/nxp/common/bsp/imx-mkimage.nix b/nxp/common/bsp/imx-mkimage.nix
index 94877ce..a928b92 100644
--- a/nxp/common/bsp/imx-mkimage.nix
+++ b/nxp/common/bsp/imx-mkimage.nix
@@ -4,15 +4,20 @@ with pkgs;
 pkgs.stdenv.mkDerivation rec {
   pname = "imx-mkimage";
   version = "lf-5.15.32-2.0.0";
-
   src = fetchgit {
-    url = "https://source.codeaurora.org/external/imx/imx-mkimage.git";
+    url = "https://github.com/nxp-imx/imx-mkimage.git";
     rev = version;
-    sha256 = "sha256-31pib5DTDPVfiAAoOSzK8HWUlnuiNnfXQIsxbjneMCc=";
+    sha256 = "sha256-vJuWK2GOAtps798QY1I6xIcixgenJmntrh24s9KtsKU=";
     leaveDotGit = true;
   };
 
+  postPatch = ''
+    substituteInPlace Makefile \
+        --replace 'CC = gcc' 'CC = clang'
+  '';
+
   nativeBuildInputs = [
+    clang
     git
   ];
 
diff --git a/nxp/common/bsp/imx-optee-os.nix b/nxp/common/bsp/imx-optee-os.nix
index 2ec0e3b..eeef5a8 100644
--- a/nxp/common/bsp/imx-optee-os.nix
+++ b/nxp/common/bsp/imx-optee-os.nix
@@ -35,7 +35,7 @@ pkgs.stdenv.mkDerivation rec {
   ];
 
   src = fetchGit {
-    url = "https://source.codeaurora.org/external/imx/imx-optee-os.git";
+    url = "https://github.com/nxp-imx/imx-optee-os.git";
     ref = "lf-5.15.32_2.0.0";
   };
 
diff --git a/nxp/common/bsp/imx-uboot.nix b/nxp/common/bsp/imx-uboot.nix
index a92a6e4..25cca39 100644
--- a/nxp/common/bsp/imx-uboot.nix
+++ b/nxp/common/bsp/imx-uboot.nix
@@ -32,7 +32,7 @@ in {
   ubootImx8 = buildUBoot {
     version = "2022.04";
     src = fetchgit {
-      url = "https://source.codeaurora.org/external/imx/uboot-imx.git";
+      url = "https://github.com/nxp-imx/uboot-imx.git";
       # tag: "lf_v2022.04"
       rev = "1c881f4da83cc05bee50f352fa183263d7e2622b";
       sha256 = "sha256-0TS6VH6wq6PwZUq6ekbuLaisZ9LrE0/haU9nseGdiE0=";