Merge pull request #1286 from MrCry0/backport-1283-to-kirkstone

[Backport Kirkstone] recipes-bsp 5.15.52-2.1.0

8 files changed, 25 insertions, 26 deletions

diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.16.inc b/recipes-bsp/firmware-imx/firmware-imx-8.17.inc
index 807d2381..78f03c25 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.16.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.17.inc
@@ -3,14 +3,14 @@
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 
 SRC_URI = " \
     ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
 "
 
-SRC_URI[md5sum] = "9ed2923c0eb511c7fcf37dd607944124"
-SRC_URI[sha256sum] = "65f829a9e2597bffc58a680aaefa638122144a083633d1ae09b3aec1d9f8ab84"
+SRC_URI[md5sum] = "63eac7b400d711c668458ec4bf5d0c60"
+SRC_URI[sha256sum] = "1ee3c49ad8749867487f09d6e4472536fb809b667c1bb3c56511175b8974e3c6"
 
 S = "${WORKDIR}/firmware-imx-${PV}"
 
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.16.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.17.bb
index 18ce14d3..18ce14d3 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8_8.16.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.17.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.16.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.17.bb
index 152ef0b5..152ef0b5 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.16.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.17.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.16.bb b/recipes-bsp/firmware-imx/firmware-imx_8.17.bb
index f84ea1fa..f84ea1fa 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.16.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.17.bb
diff --git a/recipes-bsp/imx-atf/imx-atf_2.6.bb b/recipes-bsp/imx-atf/imx-atf_2.6.bb
index ec943fa5..2e9bc089 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.6.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.6.bb
@@ -7,10 +7,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m
 
 PV .= "+git${SRCPV}"
 
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
-           file://0001-Makefile-Suppress-array-bounds-error.patch"
+SRC_URI = " \
+    git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
+    file://0001-Makefile-Suppress-array-bounds-error.patch \
+"
+
 SRCBRANCH = "lf_v2.6"
-SRCREV = "c6a19b1a351308cc73443283f6aa56b2eff791b8"
+SRCREV = "9202efc9aaf65085def9a747ee32aed628449901"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 99a156a5..6d7f1579 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -12,9 +12,8 @@ PE = "1"
 
 PV = "5.9+${SRCPV}"
 
-SRCBRANCH = "lf-5.10.52_2.1.0"
-
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf-5.15.52_2.1.0"
 SRCREV = "87ddd80953835eb29027d1d5a12044a08e809e40"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
index e82b6bee..a8b0332d 100644
--- a/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
+++ b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
@@ -1,4 +1,4 @@
-From 2734c670dc4062015d05559a94fa988da5d705e6 Mon Sep 17 00:00:00 2001
+From 70b7d067ca0f6659e4f842f8d841714a26bf9d8c Mon Sep 17 00:00:00 2001
 From: Andrey Zhizhikin <andrey.z@gmail.com>
 Date: Thu, 21 Oct 2021 08:53:38 +0000
 Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot
@@ -20,14 +20,14 @@ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
  iMX8M/soc.mak | 11 +++++------
  1 file changed, 5 insertions(+), 6 deletions(-)
 
-diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
-index a98195e..60502d8 100644
---- a/iMX8M/soc.mak
-+++ b/iMX8M/soc.mak
+Index: git/iMX8M/soc.mak
+===================================================================
+--- git.orig/iMX8M/soc.mak
++++ git/iMX8M/soc.mak
 @@ -149,7 +149,7 @@ u-boot.itb: $(dtb)
         ./$(PAD_IMAGE) bl31.bin
         ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb)
-        BL32=$(TEE) DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb) > u-boot.its
+        BL32=$(TEE) DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb) > u-boot.its
 -       ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb
 +       mkimage -E -p 0x3000 -f u-boot.its u-boot.itb
         @rm -f u-boot.its $(dtb)
@@ -36,7 +36,7 @@ index a98195e..60502d8 100644
 @@ -161,7 +161,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l)
         ./$(PAD_IMAGE) bl31.bin
         ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l)
-        DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr3l) > u-boot-ddr3l.its
+        DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr3l) > u-boot-ddr3l.its
 -       ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb
 +       mkimage -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb
         @rm -f u-boot.its $(dtb_ddr3l)
@@ -45,7 +45,7 @@ index a98195e..60502d8 100644
 @@ -173,7 +173,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk)
         ./$(PAD_IMAGE) bl31.bin
         ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk)
-        DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr3l_evk) > u-boot-ddr3l-evk.its
+        DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr3l_evk) > u-boot-ddr3l-evk.its
 -       ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb
 +       mkimage -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb
         @rm -f u-boot.its $(dtb_ddr3l_evk)
@@ -54,7 +54,7 @@ index a98195e..60502d8 100644
 @@ -185,7 +185,7 @@ u-boot-ddr4.itb: $(dtb_ddr4)
         ./$(PAD_IMAGE) bl31.bin
         ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4)
-        DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr4) > u-boot-ddr4.its
+        DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr4) > u-boot-ddr4.its
 -       ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb
 +       mkimage -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb
         @rm -f u-boot.its $(dtb_ddr4)
@@ -63,13 +63,13 @@ index a98195e..60502d8 100644
 @@ -197,7 +197,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk)
         ./$(PAD_IMAGE) bl31.bin
         ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk)
-        DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr4_evk) > u-boot-ddr4-evk.its
+        DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr4_evk) > u-boot-ddr4-evk.its
 -       ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb
 +       mkimage -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb
         @rm -f u-boot.its $(dtb_ddr4_evk)
  
  ifeq ($(HDMI),yes)
-@@ -318,7 +318,6 @@ nightly :
+@@ -343,7 +343,6 @@ nightly :
         @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/fsl-$(PLAT)-evk.dtb -O fsl-$(PLAT)-evk.dtb
         @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_hdmi_imx8m.bin -O signed_hdmi_imx8m.bin
         @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_dp_imx8m.bin -O signed_dp_imx8m.bin
@@ -77,6 +77,3 @@ index a98195e..60502d8 100644
  
  archive :
         git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME)
--- 
-2.17.1
-
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index 6db6a883..453ef0ed 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -2,11 +2,11 @@
 
 DEPENDS = "zlib-native openssl-native"
 
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-5.15.32_2.0.0"
-SRCREV = "a8bb8edb45492ac70b33734122a57aa8e38a20bd"
+SRCBRANCH = "lf-5.15.52_2.1.0"
+SRCREV = "37648c8ba5094420faa8206d8cb8e0c6f17d72fc"
 
 S = "${WORKDIR}/git"