Merge pull request #1990 from Freescale/backport-1986-to-scarthgap

[Backport scarthgap] Upgrade firmware-imx* to LF6.6.36_2.1.0 BSP

6 files changed, 26 insertions, 20 deletions

diff --git a/EULA b/EULA
index c0273f8e..ac7337fa 100644
--- a/EULA
+++ b/EULA
@@ -1,4 +1,4 @@
-LA_OPT_NXP_Software_License v56 April 2024
+LA_OPT_NXP_Software_License v57 July 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
@@ -767,3 +767,9 @@ upon notice.
 
 Vivante: Distribution of Vivante software must be a part of, or embedded
 within, Authorized Systems that include a Vivante Graphics Processing Unit.
+
+Wittenstein:  Your use of the SafeRTOS v9.x and Networking Stack, in object
+form, is limited to your internal testing, evaluation, feedback and development
+specifically for use with an NXP Product.  Licensee’s license to use and
+supply the software to you expires on June 25, 2026.  Further rights must be
+obtained directly from Wittenstein.
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index 86338259..c170d2e0 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -60,6 +60,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48 = "db4762b09b6bda63da103963
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49 = "2827219e81f28aba7c6a569f7c437fa7"
 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_MD5SUMS = " \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
@@ -116,11 +117,12 @@ FSL_EULA_FILE_MD5SUMS = " \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49} \
     ${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} \
 "
 
 # The checksum for the EULA in the layer
 FSL_EULA_FILE_MD5SUM ?= \
-    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56}"
+    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57}"
 
 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-ele-imx_0.1.2.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.3.bb
index f97d21ad..ea79fed3 100644
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.2.bb
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.3.bb
@@ -1,27 +1,26 @@
-# Copyright 2021-2023 NXP
+# Copyright 2021-2024 NXP
 SUMMARY = "NXP i.MX ELE firmware"
-DESCRIPTION = "EdgeLock Enclave firmware for i.MX series SoCs"
+DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
 
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "4ed450a"
-SRC_URI[md5sum] = "1359bc7d378bddfe1d8479eba05b05ec"
-SRC_URI[sha256sum] = "d858fcbb47482a898a1af5fe5f3f8be53bb21fac793b33e9bcdfd2b4dda79d3c"
+IMX_SRCREV_ABBREV = "4b30ee5"
+SRC_URI[sha256sum] = "fdc9f7571e6cf95e6cd7ee1abb4cb728359e2e9b7e99695d39860034c5ea0ada"
 
 S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
 do_compile[noexec] = "1"
 
 do_install() {
-   install -d ${D}${nonarch_base_libdir}/firmware/imx/ele
-   install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
-   if [ -e ${S}/${SECOEXT_FIRMWARE_NAME} ]; then
-       install -m 0644 ${S}/${SECOEXT_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
-   fi
+    install -d ${D}${nonarch_base_libdir}/firmware/imx/ele
+    install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
+    if [ -e ${S}/${SECOEXT_FIRMWARE_NAME} ]; then
+        install -m 0644 ${S}/${SECOEXT_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
+    fi
 }
 
 do_deploy () {
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.24.inc b/recipes-bsp/firmware-imx/firmware-imx-8.25.inc
index 9e9d10dc..532f4340 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.24.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.25.inc
@@ -1,16 +1,15 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
 
 # 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 = "fbe0a4c"
-SRC_URI[md5sum] = "440b125e897614d77fac663d90bcffc8"
-SRC_URI[sha256sum] = "2e27962332197ebebbb30138f6dfb365361d48d7efa565df97c4f79285b1ca50"
+IMX_SRCREV_ABBREV = "27879f8"
+SRC_URI[sha256sum] = "55766dad38961fde3ed3224ee6a46ab1c5aea62a5b947530228d8fbc4a7d2816"
 
 S = "${WORKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
 
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.24.bb b/recipes-bsp/firmware-imx/firmware-imx_8.25.bb
index 489174d0..a4e17c99 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.24.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.25.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2021,2023 NXP
+# Copyright 2017-2021,2024 NXP
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SUMMARY = "Freescale i.MX firmware"
 DESCRIPTION = "Freescale i.MX firmware such as for the VPU"
diff --git a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.24.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.25.bb
index 24619859..c35e31e0 100644
--- a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.24.bb
+++ b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.25.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2023 NXP
+# Copyright (C) 2018-2024 NXP
 SUMMARY = "Freescale i.MX Firmware files used for boot"
 
 require firmware-imx-${PV}.inc