10 files changed, 68 insertions, 32 deletions

diff --git a/EULA b/EULA
index ac7337fa..5f5cc2f9 100644
--- a/EULA
+++ b/EULA
@@ -1,4 +1,4 @@
-LA_OPT_NXP_Software_License v57 July 2024
+LA_OPT_NXP_Software_License v58 November 2024
 IMPORTANT.  Read the following NXP Software License Agreement ("Agreement")
 completely. By selecting the "I Accept" button at the end of this page, or by
 downloading, installing, or using the Licensed Software, you indicate that you
@@ -242,21 +242,51 @@ COSTS, DAMAGES, CLAIMS, OR LOSSES WHATSOEVER ARISING OUT OF OR IN CONNECTION
 WITH THIS AGREEMENT OR PRODUCT(S) SUPPLIED UNDER THIS AGREEMENT IS LIMITED TO
 THE AGGREGATE AMOUNT PAID BY YOU TO NXP IN CONNECTION WITH THE LICENSED
 SOFTWARE PROVIDED UNDER THIS AGREEMENT TO WHICH LOSSES OR DAMAGES ARE CLAIMED.
-12.        EXPORT COMPLIANCE. Each party shall comply with all applicable
-export and import control laws and regulations including but not limited to the
-US Export Administration Regulation (including restrictions on certain military
-end uses and military end users as specified in Section 15 C.F.R. § 744.21 and
-prohibited party lists issued by other federal governments), Catch-all
-regulations and all national and international embargoes. Each party further
-agrees that it will not knowingly transfer, divert, export or re-export,
-directly or indirectly, any product, software, including software source code,
-or technology restricted by such regulations or by other applicable national
-regulations, received from the other party under this Agreement, or any direct
-product of such software or technical data to any person, firm, entity, country
-or destination to which such transfer, diversion, export or re-export is
-restricted or prohibited, without obtaining prior written authorization from
-the applicable competent government authorities to the extent required by those
-laws.
+12.        EXPORT COMPLIANCE.
+12.1    Each party shall comply with all applicable export and import control
+laws and regulations including but not limited to the US Export Administration
+Regulation (including restrictions on certain military end uses and military
+end users as specified in Section 15 C.F.R. § 744.21 and prohibited party
+lists issued by other federal governments), Catch-all regulations and all
+national and international embargoes. Each party further agrees that it will
+not knowingly transfer, divert, export or re-export, directly or indirectly,
+any product, software, including software source code, or technology restricted
+by such regulations or by other applicable national regulations, received from
+the other party under this Agreement, or any direct product of such software or
+technical data to any person, firm, entity, country or destination to which
+such transfer, diversion, export or re-export is restricted or prohibited,
+without obtaining prior written authorization from the applicable competent
+government authorities to the extent required by those laws.
+12.2    Prohibition of Export to Russian Federation
+
+(a)     With respect to activitit that falls under the scope of Article 12g,
+12ga of Council Regulation (EU) No 833/2014, or Council Regulation (EU) No
+765/2006 (as the case requires), you (a) will not sell, export or re-export,
+directly or indirectly any item, and (b) will not sell, license or sublicense
+any intellectual property rights or trade secrets, to the Russian Federation or
+Belarus, or for use in the Russian Federation or Belarus.
+
+(b)     You will ensure that the purpose of paragraph (a) above is not
+frustrated by any third parties further down the commercial chain, including by
+either resellers, sublicensees, or both.
+
+(c)     You will set up and maintain an adequate monitoring mechanism to detect
+conduct by any third parties further down the commercial chain, including by
+either resellers, sublicensees, or both, that would frustrate the purpose of
+paragraph (a).
+
+(d)     Any violation of paragraphs (a), (b) or (c) will constitute a material
+breach of this Agreement, and NXP will be entitled to seek appropriate
+remedies, including, but not limited to: (i) termination of these Terms; (ii)
+suspension of any of its business relationships with you, youraffiliates or
+both, until the breach of paragraph (a) above is remedied, and (iii) a plan to
+remedy the breach.
+
+(e)     You will immediately inform NXP about any problems in applying
+paragraphs (a), (b) or (c), above, including any relevant activities by third
+parties that could frustrate the purpose of paragraph (a). You will make
+available to NXPinformation concerning compliance with the obligations under
+paragraphs (a), (b) and (c) within 2 weeks of the request for information.
 13.   GOVERNMENT CONTRACT COMPLIANCE
 13.1.      If you sell Authorized Systems directly to any government or public
 entity, including U.S., state, local, foreign or international governments or
@@ -403,7 +433,7 @@ directly from AGGIOS, Inc.
 
 Airbiquity Inc.: The Airbiquity software may only be used in object code and
 Licensee may not sublicense the Airbiquity software to any third party.
-Licensee’s license to use the Airbiquity software expires on June 30, 2024.
+Licensee’s license to use the Airbiquity software expires on June 30, 2026.
 
 Amazon: Use of the Amazon software constitutes your acceptance of the terms of
 the Amazon Program Materials License Agreement (including the AVS Component
diff --git a/LICENSE b/LICENSE
index 40447070..68e1a348 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-bsp/ddr-phy/ddr-phy_git.bb: LICENSE = "NXP-Binary-EULA"
 ./recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb: LICENSE = "Proprietary"
 ./recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb: LICENSE = "Proprietary"
-./recipes-bsp/firmware-imx/firmware-imx-8.26.inc: LICENSE = "Proprietary"
+./recipes-bsp/firmware-imx/firmware-imx-8.27.inc: LICENSE = "Proprietary"
 ./recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb: LICENSE = "Proprietary"
 ./recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb: LICENSE = "BSD-3-Clause"
 ./recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb: LICENSE = "Proprietary"
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index c170d2e0..5b165e48 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -61,6 +61,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49 = "2827219e81f28aba7c6a569f
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V53 = "44a8052c384584ba09077e85a3d1654f"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56 = "10c0fda810c63b052409b15a5445671a"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57 = "ca53281cc0caa7e320d4945a896fb837"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58 = "c0fb372b5d7f12181de23ef480f225f3"
 
 FSL_EULA_FILE_MD5SUMS = " \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
@@ -118,11 +119,12 @@ FSL_EULA_FILE_MD5SUMS = " \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V53} \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56} \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57} \
+    ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58} \
 "
 
 # The checksum for the EULA in the layer
 FSL_EULA_FILE_MD5SUM ?= \
-    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57}"
+    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58}"
 
 LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
 LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE"
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.26.inc b/recipes-bsp/firmware-imx/firmware-imx-8.27.inc
index 0da88f47..022289d3 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.26.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.27.inc
@@ -3,13 +3,13 @@
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 
 # Note: This .inc file is used from differently named recipes, so the package
 # name must be hard-coded, i.e., ${BPN} cannot be used.
 SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "d4c33ab"
-SRC_URI[sha256sum] = "b2fcf84a0417678aa441b1bcde9ece467f8bd063a63d8390684f8e37768d84cf"
+IMX_SRCREV_ABBREV = "5af0ceb"
+SRC_URI[sha256sum] = "61f925e606ab020b1a36f3f7f7e459c6847f5b9dbc79421f9ef86e8fc124eb2f"
 
 S = "${WORKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
 
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.26.bb b/recipes-bsp/firmware-imx/firmware-imx_8.27.bb
index 7bac8106..7bac8106 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.26.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.27.bb
diff --git a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.26.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.27.bb
index c35e31e0..c35e31e0 100644
--- a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.26.bb
+++ b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.27.bb
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
index 39ac4135..01e3bbca 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
@@ -3,11 +3,11 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}"
+UBOOT_SRC ?= "git://github.com/nxp-imx/uboot-imx.git;protocol=https"
 SRCBRANCH = "lf_v2024.04"
-LOCALVERSION ?= "-imx_v2024.04_6.6.52-2.2.0"
-SRCREV = "6c4545203d123c246c5d7995f2893959506d28e0"
-CVE_PRODUCT = "nxp:uboot_secondary_program_loader denx:u-boot"
+LOCALVERSION ?= "-${SRCBRANCH}"
+SRCREV = "e3219a5a73445219df605d1492687918d488055c"
 
 DEPENDS += " \
     bc-native \
diff --git a/recipes-bsp/u-boot/u-boot-imx_2024.04.bb b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
index 29d83527..69598780 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
@@ -1,6 +1,6 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
 # Copyright 2018 (C) O.S. Systems Software LTDA.
-# Copyright (C) 2017-2024 NXP
+# Copyright 2017-2024 NXP
 
 require recipes-bsp/u-boot/u-boot.inc
 require u-boot-imx-common_${PV}.inc
@@ -14,6 +14,8 @@ inherit uuu_bootloader_tag
 UUU_BOOTLOADER:mx8-generic-bsp = ""
 UUU_BOOTLOADER:mx9-generic-bsp = ""
 
+TOOLCHAIN_OPTIONS:append = " -Wno-error=implicit-function-declaration"
+
 do_deploy:append:mx8m-generic-bsp() {
     # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
     if [ -n "${UBOOT_CONFIG}" ]
diff --git a/recipes-graphics/mesa/mesa.bbappend b/recipes-graphics/mesa/mesa.bbappend
index 7c2e08fb..120561d1 100644
--- a/recipes-graphics/mesa/mesa.bbappend
+++ b/recipes-graphics/mesa/mesa.bbappend
@@ -19,7 +19,7 @@ python () {
 }
 
 # Enable Etnaviv and Freedreno support
-PACKAGECONFIG:append:use-mainline-bsp = " gallium etnaviv kmsro freedreno"
+PACKAGECONFIG:append:use-mainline-bsp = " gallium etnaviv freedreno"
 
 # For NXP BSP, GPU drivers don't support dri
 PACKAGECONFIG:remove:imxgpu:use-nxp-bsp = "dri"
diff --git a/recipes-support/opencv/opencv_4.6.0.imx.bb b/recipes-support/opencv/opencv_4.6.0.imx.bb
index da5752d2..43d65113 100644
--- a/recipes-support/opencv/opencv_4.6.0.imx.bb
+++ b/recipes-support/opencv/opencv_4.6.0.imx.bb
@@ -302,10 +302,12 @@ EXTRA_OECMAKE:append = " -DBUILD_opencv_cvv=OFF"
 
 do_install:append() {
     ln -sf opencv4/opencv2 ${D}${includedir}/opencv2
-    install -d ${D}${datadir}/OpenCV/samples/data
-    cp -r ${S}/samples/data/* ${D}${datadir}/OpenCV/samples/data
-    install -d ${D}${datadir}/OpenCV/samples/bin/
-    cp -f bin/example_* ${D}${datadir}/OpenCV/samples/bin/
+    if ${@bb.utils.contains('PACKAGECONFIG', 'samples', 'true', 'false', d)}; then
+        install -d ${D}${datadir}/OpenCV/samples/data
+        cp -r ${S}/samples/data/* ${D}${datadir}/OpenCV/samples/data
+        install -d ${D}${datadir}/OpenCV/samples/bin/
+        cp -f bin/example_* ${D}${datadir}/OpenCV/samples/bin/
+    fi
     if ${@bb.utils.contains('PACKAGECONFIG', 'tests-imx', 'true', 'false', d)}; then
         cp -r share/opencv4/testdata/cv/face/* ${D}${datadir}/opencv4/testdata/cv/face/
     fi