19 files changed, 121 insertions, 72 deletions

diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.12.inc b/recipes-bsp/firmware-imx/firmware-imx-8.13.inc
index b9699a86..ff739c4c 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.12.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.13.inc
@@ -3,14 +3,14 @@
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
 
 SRC_URI = " \
     ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
 "
 
-SRC_URI[md5sum] = "6062247e9f12f3ec27247079e59fb935"
-SRC_URI[sha256sum] = "6b6747bf36ecc53e385234afdce01f69c5775adf0d6685c885281ca6e4e322ef"
+SRC_URI[md5sum] = "97eb12ba899bc29a5375993889708bfb"
+SRC_URI[sha256sum] = "8b7aa9b41a0389e5f40bdf91cb1224f79ea4c2e7fc36292f27ad4bef7044d7f0"
 
 S = "${WORKDIR}/firmware-imx-${PV}"
 
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb
index 6ea16d5b..6ea16d5b 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.12.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb
index a48356ed..a48356ed 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.12.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.12.bb b/recipes-bsp/firmware-imx/firmware-imx_8.13.bb
index 68539a61..68539a61 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.12.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.13.bb
diff --git a/recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-3.bb b/recipes-bsp/firmware-imx/firmware-sof-imx_1.9.0-1.bb
index 2ce98344..d0a497b8 100644
--- a/recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-3.bb
+++ b/recipes-bsp/firmware-imx/firmware-sof-imx_1.9.0-1.bb
@@ -8,8 +8,8 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=0f00d99239d922ffd13cabef83b33444"
 
 SRC_URI = "${FSL_MIRROR}/sof-imx-${PV}.tar.gz"
-SRC_URI[md5sum] = "4deaf1bc81238ef57be29cec3cf5f636"
-SRC_URI[sha256sum] = "14394ffcf145536569bcc20910cda7c8b58a99fdb3a04b125453146739541da9"
+SRC_URI[md5sum] = "7560d41c3be0a97c744874b531649326"
+SRC_URI[sha256sum] = "106cfb3da27867520d86649cde98256217829c97f41984e10161c1e2707e2c4e"
 
 S = "${WORKDIR}/sof-imx-${PV}"
 
diff --git a/recipes-bsp/imx-atf/imx-atf_2.4.bb b/recipes-bsp/imx-atf/imx-atf_2.4.bb
index 536a0a73..8360bfa8 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.4.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.4.bb
@@ -10,7 +10,7 @@ PV .= "+git${SRCPV}"
 SRCBRANCH = "lf_v2.4"
 SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
 "
-SRCREV = "ec35fef92b71a79075f214f8cff0738cd4482ed0"
+SRCREV = "bb4957067d4b96a6ee197a333425948e409e990d"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index a296b185..fd912ca1 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -10,11 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24
 
 PE = "1"
 
-PV = "5.8+${SRCPV}"
+PV = "5.9+${SRCPV}"
+
+SRCBRANCH = "lf-5.10.52_2.1.0"
 
-SRCBRANCH = "master"
 SRC_URI = "git://source.codeaurora.org/external/imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "3f777974c0c146817e2ff5cb0340ca66a1f99e57"
+SRCREV = "87ddd80953835eb29027d1d5a12044a08e809e40"
 
 S = "${WORKDIR}/git"
 
@@ -29,6 +30,7 @@ PLATFORM:mx6ul = "IMX6UL"
 PLATFORM:mx6ull = "IMX6UL"
 PLATFORM:mx7d  = "IMX7"
 PLATFORM:mx7ulp = "IMX7"
+PLATFORM:mx8ulp = "IMX8ULP"
 
 PARALLEL_MAKE="-j 1"
 EXTRA_OEMAKE = ""
@@ -42,4 +44,4 @@ do_install () {
     oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install
 }
 
-COMPATIBLE_MACHINE = "(mx6|mx7)"
+COMPATIBLE_MACHINE = "(mx6|mx7|mx8ulp)"
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
new file mode 100644
index 00000000..a879208c
--- /dev/null
+++ b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
@@ -0,0 +1,82 @@
+From a4af3747abd88247bf4498ec0cf67a4151e64d41 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
+
+mkimage tool is provided as a part of sysroot from Yocto build. Current
+implementation on the imx-mkimge on the other hand copies it locally in
+order to invoke it from within the build folder.
+
+Since recent updates, mkimage requires openssl.so to be installed, which
+when local copy is used causes the tool not to operate and fails the
+build.
+
+Use it from the build sysroot, and do not pull the local version of it.
+
+Upstream-Status: Inappropriate [OE-specific]
+
+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 4bfdc37..03b05f7 100644
+--- a/iMX8M/soc.mak
++++ b/iMX8M/soc.mak
+@@ -148,7 +148,7 @@ u-boot.itb: $(dtb)
+        ./$(PAD_IMAGE) bl31.bin
+        ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb)
+        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
+-       ./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)
+ 
+ dtb_ddr3l = valddr3l.dtb
+@@ -160,7 +160,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
+-       ./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)
+ 
+ dtb_ddr3l_evk = evkddr3l.dtb
+@@ -172,7 +172,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
+-       ./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)
+ 
+ dtb_ddr4 = valddr4.dtb
+@@ -184,7 +184,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
+-       ./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)
+ 
+ dtb_ddr4_evk = evkddr4.dtb
+@@ -196,7 +196,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
+-       ./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)
+@@ -312,7 +312,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
+-       @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/mkimage_uboot -O mkimage_uboot
+ 
+ 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-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 1425c5a3..f8ebb730 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -84,7 +84,6 @@ compile_mx8m() {
     cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME}   ${BOOT_STAGING}
     cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} \
                                                              ${BOOT_STAGING}/u-boot-nodtb.bin
-    cp ${STAGING_DIR_NATIVE}/${bindir}/mkimage               ${BOOT_STAGING}/mkimage_uboot
     cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin
     cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}                     ${BOOT_STAGING}/u-boot.bin
 }
@@ -151,7 +150,6 @@ deploy_mx8m() {
     install -m 0644 ${BOOT_STAGING}/signed_hdmi_imx8m.bin    ${DEPLOYDIR}/${BOOT_TOOLS}
     install -m 0755 ${BOOT_STAGING}/${TOOLS_NAME}            ${DEPLOYDIR}/${BOOT_TOOLS}
     install -m 0755 ${BOOT_STAGING}/mkimage_fit_atf.sh       ${DEPLOYDIR}/${BOOT_TOOLS}
-    install -m 0755 ${BOOT_STAGING}/mkimage_uboot            ${DEPLOYDIR}/${BOOT_TOOLS}
 }
 deploy_mx8() {
     install -d ${DEPLOYDIR}/${BOOT_TOOLS}
@@ -173,7 +171,7 @@ deploy_mx8x() {
 }
 do_deploy() {
     deploy_${SOC_FAMILY}
-    # copy the tool mkimage to deploy path and sc fw, dcd and uboot
+    # copy the sc fw, dcd and uboot to deploy path
     install -m 0644 ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}        ${DEPLOYDIR}/${BOOT_TOOLS}
 
     # copy tee.bin to deploy path
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index 1288d877..c51c1e08 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -2,11 +2,12 @@
 
 DEPENDS = "zlib-native openssl-native"
 
-SRCBRANCH = "lf-5.10.y_2.0.0"
+SRCBRANCH = "lf-5.10.52_2.1.0"
 SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch \
+           file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCREV = "5138add7602a50d1730a54d0b67219f0ce0666b4"
+SRCREV = "1112c88470f339dc631e2a7117087f416af6d6b5"
 S = "${WORKDIR}/git"
 
 BOOT_TOOLS = "imx-boot-tools"
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb
index 6eb65b81..e3dad7da 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb
@@ -3,15 +3,15 @@
 
 DESCRIPTION = "i.MX System Controller Firmware"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
 SECTION = "BSP"
 
 inherit fsl-eula-unpack pkgconfig deploy
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "5fb6fd285b18717614b5ba67f023e51c"
-SRC_URI[sha256sum] = "df0fe17c93e4c2835542d6b1b2557524f034e378b643100cd838225e82336158"
+SRC_URI[md5sum] = "5c2b9d35e526136042a84e8d8f6c116e"
+SRC_URI[sha256sum] = "0adc3d2c2df250a873232f1b62b14674694b50a4e01dd6ceae479e4ff2b2276b"
 
 BOARD_TYPE ?= "mek"
 SC_FIRMWARE_NAME ?= "INVALID"
diff --git a/recipes-bsp/imx-seco/imx-seco_3.8.1.bb b/recipes-bsp/imx-seco/imx-seco_3.8.2.bb
index adbb81c4..bd749e4f 100644
--- a/recipes-bsp/imx-seco/imx-seco_3.8.1.bb
+++ b/recipes-bsp/imx-seco/imx-seco_3.8.2.bb
@@ -4,14 +4,14 @@ SUMMARY = "NXP i.MX SECO firmware"
 DESCRIPTION = "NXP i.MX Security Controller firmware"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
 
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "3043817d797fbd7417442ef3709d69b3"
-SRC_URI[sha256sum] = "fe6cff8ee0b66cc4e048ad4ad17e663867c5509809a436a3da62a73a80c1140f"
+SRC_URI[md5sum] = "92a15f2ffe162374806e2dfe9b0aa2e9"
+SRC_URI[sha256sum] = "c543cd3ec4d30c0cf5ee2a2f4dc7efe209363e45087e0b7c380b727b7bcf2c8a"
 
 do_compile[noexec] = "1"
 
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index a5f33d83..f7ef0348 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -16,12 +16,12 @@ DEPENDS:append:imxvpu = " virtual/imxvpu"
 PE = "1"
 PV = "7.0+${SRCPV}"
 
-SRCBRANCH = "lf-5.10.y_2.0.0"
+SRCBRANCH = "lf-5.10.52_2.1.0"
 SRC_URI = " \
     git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
     file://memtool_profile \
 "
-SRCREV = "e55c83b939dbb1989181f48b2b3f3e32f7b5b380"
+SRCREV = "2dcb987a91183770f328258b424d9ad2fdfdc17a"
 S = "${WORKDIR}/git"
 
 inherit module-base use-imx-headers
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb
index 33208bdf..e6cffaca 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb
@@ -2,7 +2,7 @@
 
 DESCRIPTION = "i.MX VC8000E Encoder library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
 
 inherit fsl-eula-unpack
 
@@ -10,8 +10,8 @@ SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
 S = "${WORKDIR}/${BPN}-${PV}"
 
-SRC_URI[md5sum] = "b5270450ba2da5b7468b67ae8c0bcdca"
-SRC_URI[sha256sum] = "d5efae484c4271c098286d007590d6bf40c272d4f35702ff65625f2362715ab3"
+SRC_URI[md5sum] = "fbd43a100c27abbae301428f1ae2bc64"
+SRC_URI[sha256sum] = "e59ac2ded726d722f61793b17fc394ce87b1c5710cb79f0b1d60b87fca5829e1"
 
 # SCR is the location and name of the Software Content Register file
 # relative to ${D}${D_SUBDIR}.
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch
deleted file mode 100644
index dff2fb8f..00000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 94ae72948f1ed1a8bad1c13b4edc4b9189207e35 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Mon, 26 Jul 2021 09:06:26 -0500
-Subject: [PATCH] Makefile: Honor LDFLAGS from toolchain
-
-The LDFLAGS variable is standard from the toolchain and should be
-honored. Yocto detects the problem with a QA check:
-
-ERROR: imx-vpu-hantro-daemon-1.1.0-r0 do_package_qa: QA Issue: File /usr/bin/vsidaemon in package imx-vpu-hantro-daemon doesn't have GNU_HASH (didn't pass LDFLAGS?) [ldflags]
-
-Upstream-Status: Pending
-
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 9a775b0..e73ff47 100755
---- a/Makefile
-+++ b/Makefile
-@@ -22,7 +22,7 @@ OUT_FILE = vsidaemon
- DEC = nxp_enc_hw
- ENC = nxp_dec_hw
- LIBFILES = 
--LD_FLAGS = -lpthread -lm
-+LD_FLAGS = $(LDFLAGS) -lpthread -lm
- 
- PLATFORM ?= IMX8MP
- 
--- 
-2.17.1
-
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb
index d362fce3..25f54c7a 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb
@@ -8,10 +8,9 @@ DEPENDS:append:mx8mp = " imx-vpu-hantro-vc"
 
 SRC_URI = " \
     ${FSL_MIRROR}/${BP}.tar.gz \
-    file://0001-Makefile-Honor-LDFLAGS-from-toolchain.patch \
 "
-SRC_URI[md5sum] = "65417710ef22214523c37f50f34b6ab2"
-SRC_URI[sha256sum] = "897d174c4c0818f31012d8a60ed51fc83fdfc55fca2d2b0fc24a0db3e9f3b6e8"
+SRC_URI[md5sum] = "980237589af195c2c4b852a7aad175ee"
+SRC_URI[sha256sum] = "a5d915fefd3637e68d693638edd1161c30e75011a6312251b914f04546fd0fc9"
 
 PLATFORM:mx8mm = "IMX8MM"
 PLATFORM:mx8mq = "IMX8MQ"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb
index 2ecb1e4b..427dbf92 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb
@@ -2,13 +2,13 @@
 
 DESCRIPTION = "i.MX Hantro VPU library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
 
 PROVIDES = "virtual/imxvpu"
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "b65b49eadb6463b784e1a9e44a94fca1"
-SRC_URI[sha256sum] = "03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00"
+SRC_URI[md5sum] = "3f8d4bb593d851d0523d0146131946ae"
+SRC_URI[sha256sum] = "a312a0b6d32ed16527e5bfcff362b231069428362ad5710f816bca019f70c6a2"
 
 inherit fsl-eula-unpack use-imx-headers
 
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb
index dc6e2d7e..0122d273 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb
@@ -2,14 +2,14 @@
 
 DESCRIPTION = "Basler camera binary drivers"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
 
 inherit fsl-eula-unpack
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "8d99375cc9e7f1573d984c6a989655b1"
-SRC_URI[sha256sum] = "3f09f7a2de290b0580faee9e180a78a322144d316fbbbc80b8a36fb83ab538b1"
+SRC_URI[md5sum] = "963339f568e8b0ba5d67328238284d47"
+SRC_URI[sha256sum] = "f4d4aa08103937ddd86b9c0880d07c1e0db1ec7f51a420a8ccc76dcf2fb7dbe6"
 
 do_install() {
     dest_dir=${D}/opt/imx8-isp/bin
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb
index b15d0b9e..9f975511 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb
@@ -2,8 +2,8 @@
 
 DESCRIPTION = "i.MX Verisilicon Software ISP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
-DEPENDS = "python3 libdrm virtual/libg2d"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" 
+DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2"
 
 SRC_URI = " \
     ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
@@ -11,8 +11,8 @@ SRC_URI = " \
     file://0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch \
 "
 
-SRC_URI[md5sum] = "123feed48302fea2a1be8572e913ae47"
-SRC_URI[sha256sum] = "e775975684aab4211f0bf8c5e2c6604ba46b83c5586937000675e044a50d77b8"
+SRC_URI[md5sum] = "e9e0943b9f4923c767d07901e550c41c"
+SRC_URI[sha256sum] = "13274c0fd442da4b3b9900a7568c59872ffa6408f5699d35eebc6760a8e51297"
 
 inherit fsl-eula-unpack cmake systemd use-imx-headers