From 1df2950cb14625ee9348075beb04348a762e7d25 Mon Sep 17 00:00:00 2001
From: Benjamin Szőke <egyszeregy@freemail.hu>
Date: Sun, 1 Dec 2024 01:45:54 +0100
Subject: firmware-imx: Upgrade to LF6.6.52_2.2.0

---
 recipes-bsp/firmware-imx/firmware-ele-imx_0.1.3.bb |  42 -----
 recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb |  42 +++++
 recipes-bsp/firmware-imx/firmware-imx-8.25.inc     |  16 --
 recipes-bsp/firmware-imx/firmware-imx-8.26.inc     |  16 ++
 recipes-bsp/firmware-imx/firmware-imx_8.25.bb      | 171 ---------------------
 recipes-bsp/firmware-imx/firmware-imx_8.26.bb      | 171 +++++++++++++++++++++
 .../firmware-imx/imx-boot-firmware-files_8.25.bb   |  61 --------
 .../firmware-imx/imx-boot-firmware-files_8.26.bb   |  61 ++++++++
 8 files changed, 290 insertions(+), 290 deletions(-)
 delete mode 100644 recipes-bsp/firmware-imx/firmware-ele-imx_0.1.3.bb
 create mode 100644 recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb
 delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8.25.inc
 create mode 100644 recipes-bsp/firmware-imx/firmware-imx-8.26.inc
 delete mode 100644 recipes-bsp/firmware-imx/firmware-imx_8.25.bb
 create mode 100644 recipes-bsp/firmware-imx/firmware-imx_8.26.bb
 delete mode 100644 recipes-bsp/firmware-imx/imx-boot-firmware-files_8.25.bb
 create mode 100644 recipes-bsp/firmware-imx/imx-boot-firmware-files_8.26.bb

diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.3.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.3.bb
deleted file mode 100644
index ea79fed35..000000000
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.3.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2024 NXP
-SUMMARY = "NXP i.MX ELE firmware"
-DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs"
-SECTION = "base"
-LICENSE = "Proprietary"
-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 = "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
-}
-
-do_deploy () {
-    # Deploy the related firmware to be package by imx-boot
-    install -m 0644 ${S}/${SECO_FIRMWARE_NAME}  ${DEPLOYDIR}
-}
-addtask deploy after do_install before do_build
-
-PACKAGES += "${PN}-ext"
-
-ALLOW_EMPTY:${PN}-ext = "1"
-
-FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}"
-FILES:${PN}-ext += "${nonarch_base_libdir}/firmware/imx/ele/${SECOEXT_FIRMWARE_NAME}"
-
-RREPLACES:${PN} = "firmware-sentinel"
-RPROVIDES:${PN} = "firmware-sentinel"
-
-COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb
new file mode 100644
index 000000000..760b68ae4
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb
@@ -0,0 +1,42 @@
+# Copyright 2021-2024 NXP
+SUMMARY = "NXP i.MX ELE firmware"
+DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs"
+SECTION = "base"
+LICENSE = "Proprietary"
+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 = "17945fc"
+SRC_URI[sha256sum] = "8791109824767346237e53ac2c712824e54608e2092859161e6bb3e5385a7595"
+
+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
+}
+
+do_deploy () {
+    # Deploy the related firmware to be package by imx-boot
+    install -m 0644 ${S}/${SECO_FIRMWARE_NAME}  ${DEPLOYDIR}
+}
+addtask deploy after do_install before do_build
+
+PACKAGES += "${PN}-ext"
+
+ALLOW_EMPTY:${PN}-ext = "1"
+
+FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}"
+FILES:${PN}-ext += "${nonarch_base_libdir}/firmware/imx/ele/${SECOEXT_FIRMWARE_NAME}"
+
+RREPLACES:${PN} = "firmware-sentinel"
+RPROVIDES:${PN} = "firmware-sentinel"
+
+COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.25.inc b/recipes-bsp/firmware-imx/firmware-imx-8.25.inc
deleted file mode 100644
index 532f4340c..000000000
--- a/recipes-bsp/firmware-imx/firmware-imx-8.25.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017-2024 NXP
-# Copyright (C) 2018 O.S. Systems Software LTDA.
-SECTION = "base"
-LICENSE = "Proprietary"
-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 = "27879f8"
-SRC_URI[sha256sum] = "55766dad38961fde3ed3224ee6a46ab1c5aea62a5b947530228d8fbc4a7d2816"
-
-S = "${WORKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
-
-inherit fsl-eula-unpack
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.26.inc b/recipes-bsp/firmware-imx/firmware-imx-8.26.inc
new file mode 100644
index 000000000..0da88f472
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.26.inc
@@ -0,0 +1,16 @@
+# Copyright (C) 2012-2016 Freescale Semiconductor
+# Copyright 2017-2024 NXP
+# Copyright (C) 2018 O.S. Systems Software LTDA.
+SECTION = "base"
+LICENSE = "Proprietary"
+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 = "d4c33ab"
+SRC_URI[sha256sum] = "b2fcf84a0417678aa441b1bcde9ece467f8bd063a63d8390684f8e37768d84cf"
+
+S = "${WORKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
+
+inherit fsl-eula-unpack
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.25.bb b/recipes-bsp/firmware-imx/firmware-imx_8.25.bb
deleted file mode 100644
index a4e17c990..000000000
--- a/recipes-bsp/firmware-imx/firmware-imx_8.25.bb
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# 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"
-
-require ${BP}.inc
-
-PE = "1"
-
-inherit allarch
-
-IMX_USE_LINUX_FIRMWARE_SDMA ?= "1"
-
-do_install() {
-    install -d ${D}${nonarch_base_libdir}/firmware/imx
-
-    # SDMA Firmware section
-    install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma
-    install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma
-    # Define IMX_USE_LINUX_FIRMWARE_SDMA = "0" in layer.conf, machine.conf, local.conf
-    # or in .bbappend to use sdma-imx6q/7d.bin from here and not linux-firmware
-    if [ ${IMX_USE_LINUX_FIRMWARE_SDMA} -gt 0 ]
-    then
-        rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin
-        rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin
-    fi
-
-    # EASRC Firmware section
-    install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc
-    install -m 0644 ${S}/firmware/easrc/* ${D}${nonarch_base_libdir}/firmware/imx/easrc/
-
-    # XCVR Firmware section
-    install -d ${D}${nonarch_base_libdir}/firmware/imx/xcvr
-    install -m 0644 ${S}/firmware/xcvr/* ${D}${nonarch_base_libdir}/firmware/imx/xcvr/
-
-    # XUVI Firmware section
-    install -d ${D}${nonarch_base_libdir}/firmware/imx/xuvi
-    install -m 0644 ${S}/firmware/xuvi/* ${D}${nonarch_base_libdir}/firmware/imx/xuvi/
-
-    # EPDC Firmware section
-    # NOTE:
-    # epdc_ED060XH2C1.fw file has .nonrestricted suffix in the source archive, hence it should
-    # be installed with a different name
-    install -d ${D}${nonarch_base_libdir}/firmware/imx/epdc
-    install -m 0644 ${S}/firmware/epdc/*.fw ${D}${nonarch_base_libdir}/firmware/imx/epdc/
-    install -m 0644 ${S}/firmware/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}${nonarch_base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw
-
-    # HDMI Firmware section
-    # NOTE:
-    # Only install pre-defined list of firmware files, since the source archive contains
-    # also HDMI binary files for imx8m derivatives, which are taken care of by another recipe
-    install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${nonarch_base_libdir}/firmware
-    install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${nonarch_base_libdir}/firmware
-    install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}${nonarch_base_libdir}/firmware
-
-    # VPU Firmware section
-    # NOTE:
-    # Do the same thing as above for HDMI - only install a pre-defined list of firmware files,
-    # as some of other files are provided by packages from other recipes.
-    install -d ${D}${nonarch_base_libdir}/firmware/vpu
-    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx*.bin ${D}${nonarch_base_libdir}/firmware/vpu
-    # Update i.MX8 vpu firmware path to align with kernel6.5+
-    install -d ${D}${nonarch_base_libdir}/firmware/amphion/vpu/
-    mv ${D}${nonarch_base_libdir}/firmware/vpu/vpu_fw_imx8* ${D}${nonarch_base_libdir}/firmware/amphion/vpu/
-    # Install i.MX 95 VPU firmware
-    install -m 0644 ${S}/firmware/vpu/wave633c_codec_fw.bin ${D}${nonarch_base_libdir}/firmware
-}
-
-#
-# This prepend is here to produce separate packages containing firmware,
-# which could be included separately based on the machine definition.
-#
-# It operates similar to the FILES mechanism by travesing through
-# ${D} + folder supplied as a first parameter, matches the regexp supplied
-# as second one, and for every file match - it creates a separate package,
-# which contains only files that matches the pattern.
-#
-python populate_packages:prepend() {
-    # CODA driver tries to locate VPU firmwares directly in ${nonarch_base_libdir}/firmware, to
-    # avoid fallback loading which is usually 40-60 seconds later after system boots up, let's
-    # create symbolic links in ${nonarch_base_libdir}/firmware for VPU firmwares.
-    def coda_vpu_links(file, pkg, pattern, format, basename):
-        # Only CODA VPU firmwares need this procedure
-        if 'imx8' in basename:
-            return
-
-        dir = os.path.dirname(file)
-        dir = os.path.abspath(os.path.join(dir, os.pardir))
-        cwd = os.getcwd()
-
-        os.chdir(dir)
-
-        name = os.path.basename(file)
-        os.symlink(os.path.join("vpu", name), name)
-
-        oldfiles = d.getVar('FILES:' + pkg)
-        newfile = os.path.join(d.getVar('nonarch_base_libdir'), "firmware", name)
-        d.setVar('FILES:' + pkg, oldfiles + " " + newfile)
-
-        os.chdir(cwd)
-
-
-    easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d)
-    do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin',
-                      output_pattern='firmware-imx-easrc-%s',
-                      description='Freescale IMX EASRC Firmware [%s]',
-                      extra_depends='',
-                      prepend=True)
-
-    vpudir = bb.data.expand('${nonarch_base_libdir}/firmware/vpu', d)
-    do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin',
-                      output_pattern='firmware-imx-vpu-%s',
-                      description='Freescale IMX VPU Firmware [%s]',
-                      hook=coda_vpu_links,
-                      extra_depends='',
-                      prepend=True)
-
-    sdmadir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/sdma', d)
-    do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
-                      output_pattern='firmware-imx-sdma-%s',
-                      description='Freescale IMX SDMA Firmware [%s]',
-                      extra_depends='',
-                      prepend=True)
-
-    xcvrdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/xcvr', d)
-    do_split_packages(d, xcvrdir, '^xcvr-([^_]*).*\.bin',
-                      output_pattern='firmware-imx-xcvr-%s',
-                      description='Freescale IMX XCVR Firmware [%s]',
-                      extra_depends='',
-                      prepend=True)
-
-    xuvidir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/xuvi', d)
-    do_split_packages(d, xuvidir, '^vpu_fw_([^_]*).*\.bin',
-                      output_pattern='firmware-imx-xuvi-%s',
-                      description='Freescale IMX XUVI Firmware [%s]',
-                      extra_depends='',
-                      prepend=True)
-}
-
-# Declare a contract that we would provide packages produced by prepend above
-PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xuvi-*"
-
-#
-# Deal with the rest of Firmware packages here
-#
-# Provide EPDC and HDMI Firmware in common packages as they tend to be special in
-# terms of the content.
-#
-# NOTE: PACKAGES are defined explicitly here in order to remove the auto-generated
-# complimentary packages (-dev and -dbg).
-# This is done in order to be able to keep the main package empty and fail when
-# somebody tries to install it in the image.
-# If -dev package is present in that setup, and dev-pkgs is enabled in
-# IMAGE_FEATURES - this leads to a failure during do_rootfs() while all -dev
-# packages would be installed, and -dev package would fail because the main one
-# is empty.
-# Therefore, we opt-out from producing -dev package here, since also for firmware
-# files it makes no sense.
-PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-amphion ${PN}-vpu-wave"
-
-FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/"
-FILES:${PN}-hdmi = " \
-    ${nonarch_base_libdir}/firmware/hdmitxfw.bin \
-    ${nonarch_base_libdir}/firmware/hdmirxfw.bin \
-    ${nonarch_base_libdir}/firmware/dpfw.bin \
-"
-FILES:${PN}-vpu-amphion = "${nonarch_base_libdir}/firmware/amphion/vpu/*"
-FILES:${PN}-vpu-wave = "${nonarch_base_libdir}/firmware/wave633c_codec_fw.bin"
-
-COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.26.bb b/recipes-bsp/firmware-imx/firmware-imx_8.26.bb
new file mode 100644
index 000000000..a4e17c990
--- /dev/null
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.26.bb
@@ -0,0 +1,171 @@
+# Copyright (C) 2012-2016 Freescale Semiconductor
+# 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"
+
+require ${BP}.inc
+
+PE = "1"
+
+inherit allarch
+
+IMX_USE_LINUX_FIRMWARE_SDMA ?= "1"
+
+do_install() {
+    install -d ${D}${nonarch_base_libdir}/firmware/imx
+
+    # SDMA Firmware section
+    install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma
+    install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma
+    # Define IMX_USE_LINUX_FIRMWARE_SDMA = "0" in layer.conf, machine.conf, local.conf
+    # or in .bbappend to use sdma-imx6q/7d.bin from here and not linux-firmware
+    if [ ${IMX_USE_LINUX_FIRMWARE_SDMA} -gt 0 ]
+    then
+        rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin
+        rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin
+    fi
+
+    # EASRC Firmware section
+    install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc
+    install -m 0644 ${S}/firmware/easrc/* ${D}${nonarch_base_libdir}/firmware/imx/easrc/
+
+    # XCVR Firmware section
+    install -d ${D}${nonarch_base_libdir}/firmware/imx/xcvr
+    install -m 0644 ${S}/firmware/xcvr/* ${D}${nonarch_base_libdir}/firmware/imx/xcvr/
+
+    # XUVI Firmware section
+    install -d ${D}${nonarch_base_libdir}/firmware/imx/xuvi
+    install -m 0644 ${S}/firmware/xuvi/* ${D}${nonarch_base_libdir}/firmware/imx/xuvi/
+
+    # EPDC Firmware section
+    # NOTE:
+    # epdc_ED060XH2C1.fw file has .nonrestricted suffix in the source archive, hence it should
+    # be installed with a different name
+    install -d ${D}${nonarch_base_libdir}/firmware/imx/epdc
+    install -m 0644 ${S}/firmware/epdc/*.fw ${D}${nonarch_base_libdir}/firmware/imx/epdc/
+    install -m 0644 ${S}/firmware/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}${nonarch_base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw
+
+    # HDMI Firmware section
+    # NOTE:
+    # Only install pre-defined list of firmware files, since the source archive contains
+    # also HDMI binary files for imx8m derivatives, which are taken care of by another recipe
+    install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${nonarch_base_libdir}/firmware
+    install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${nonarch_base_libdir}/firmware
+    install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}${nonarch_base_libdir}/firmware
+
+    # VPU Firmware section
+    # NOTE:
+    # Do the same thing as above for HDMI - only install a pre-defined list of firmware files,
+    # as some of other files are provided by packages from other recipes.
+    install -d ${D}${nonarch_base_libdir}/firmware/vpu
+    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx*.bin ${D}${nonarch_base_libdir}/firmware/vpu
+    # Update i.MX8 vpu firmware path to align with kernel6.5+
+    install -d ${D}${nonarch_base_libdir}/firmware/amphion/vpu/
+    mv ${D}${nonarch_base_libdir}/firmware/vpu/vpu_fw_imx8* ${D}${nonarch_base_libdir}/firmware/amphion/vpu/
+    # Install i.MX 95 VPU firmware
+    install -m 0644 ${S}/firmware/vpu/wave633c_codec_fw.bin ${D}${nonarch_base_libdir}/firmware
+}
+
+#
+# This prepend is here to produce separate packages containing firmware,
+# which could be included separately based on the machine definition.
+#
+# It operates similar to the FILES mechanism by travesing through
+# ${D} + folder supplied as a first parameter, matches the regexp supplied
+# as second one, and for every file match - it creates a separate package,
+# which contains only files that matches the pattern.
+#
+python populate_packages:prepend() {
+    # CODA driver tries to locate VPU firmwares directly in ${nonarch_base_libdir}/firmware, to
+    # avoid fallback loading which is usually 40-60 seconds later after system boots up, let's
+    # create symbolic links in ${nonarch_base_libdir}/firmware for VPU firmwares.
+    def coda_vpu_links(file, pkg, pattern, format, basename):
+        # Only CODA VPU firmwares need this procedure
+        if 'imx8' in basename:
+            return
+
+        dir = os.path.dirname(file)
+        dir = os.path.abspath(os.path.join(dir, os.pardir))
+        cwd = os.getcwd()
+
+        os.chdir(dir)
+
+        name = os.path.basename(file)
+        os.symlink(os.path.join("vpu", name), name)
+
+        oldfiles = d.getVar('FILES:' + pkg)
+        newfile = os.path.join(d.getVar('nonarch_base_libdir'), "firmware", name)
+        d.setVar('FILES:' + pkg, oldfiles + " " + newfile)
+
+        os.chdir(cwd)
+
+
+    easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d)
+    do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin',
+                      output_pattern='firmware-imx-easrc-%s',
+                      description='Freescale IMX EASRC Firmware [%s]',
+                      extra_depends='',
+                      prepend=True)
+
+    vpudir = bb.data.expand('${nonarch_base_libdir}/firmware/vpu', d)
+    do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin',
+                      output_pattern='firmware-imx-vpu-%s',
+                      description='Freescale IMX VPU Firmware [%s]',
+                      hook=coda_vpu_links,
+                      extra_depends='',
+                      prepend=True)
+
+    sdmadir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/sdma', d)
+    do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
+                      output_pattern='firmware-imx-sdma-%s',
+                      description='Freescale IMX SDMA Firmware [%s]',
+                      extra_depends='',
+                      prepend=True)
+
+    xcvrdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/xcvr', d)
+    do_split_packages(d, xcvrdir, '^xcvr-([^_]*).*\.bin',
+                      output_pattern='firmware-imx-xcvr-%s',
+                      description='Freescale IMX XCVR Firmware [%s]',
+                      extra_depends='',
+                      prepend=True)
+
+    xuvidir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/xuvi', d)
+    do_split_packages(d, xuvidir, '^vpu_fw_([^_]*).*\.bin',
+                      output_pattern='firmware-imx-xuvi-%s',
+                      description='Freescale IMX XUVI Firmware [%s]',
+                      extra_depends='',
+                      prepend=True)
+}
+
+# Declare a contract that we would provide packages produced by prepend above
+PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xuvi-*"
+
+#
+# Deal with the rest of Firmware packages here
+#
+# Provide EPDC and HDMI Firmware in common packages as they tend to be special in
+# terms of the content.
+#
+# NOTE: PACKAGES are defined explicitly here in order to remove the auto-generated
+# complimentary packages (-dev and -dbg).
+# This is done in order to be able to keep the main package empty and fail when
+# somebody tries to install it in the image.
+# If -dev package is present in that setup, and dev-pkgs is enabled in
+# IMAGE_FEATURES - this leads to a failure during do_rootfs() while all -dev
+# packages would be installed, and -dev package would fail because the main one
+# is empty.
+# Therefore, we opt-out from producing -dev package here, since also for firmware
+# files it makes no sense.
+PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-amphion ${PN}-vpu-wave"
+
+FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/"
+FILES:${PN}-hdmi = " \
+    ${nonarch_base_libdir}/firmware/hdmitxfw.bin \
+    ${nonarch_base_libdir}/firmware/hdmirxfw.bin \
+    ${nonarch_base_libdir}/firmware/dpfw.bin \
+"
+FILES:${PN}-vpu-amphion = "${nonarch_base_libdir}/firmware/amphion/vpu/*"
+FILES:${PN}-vpu-wave = "${nonarch_base_libdir}/firmware/wave633c_codec_fw.bin"
+
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.25.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.25.bb
deleted file mode 100644
index c35e31e07..000000000
--- a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.25.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (C) 2018-2024 NXP
-SUMMARY = "Freescale i.MX Firmware files used for boot"
-
-require firmware-imx-${PV}.inc
-
-inherit deploy nopackages
-
-do_install[noexec] = "1"
-
-DEPLOY_FOR                  = ""
-DEPLOY_FOR:mx8-generic-bsp  = "mx8"
-DEPLOY_FOR:mx8m-generic-bsp = "mx8m"
-DEPLOY_FOR:mx9-generic-bsp  = "mx9"
-
-deploy_for_mx8() {
-    # Cadence HDMI
-    install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${DEPLOYDIR}
-    install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${DEPLOYDIR}
-    install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${DEPLOYDIR}
-}
-
-deploy_for_mx8m() {
-    # Synopsys DDR
-    for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
-        install -m 0644 ${S}/firmware/ddr/synopsys/${ddr_firmware} ${DEPLOYDIR}
-    done
-
-    # Cadence DP and HDMI
-    install -m 0644 ${S}/firmware/hdmi/cadence/signed_dp_imx8m.bin ${DEPLOYDIR}
-    install -m 0644 ${S}/firmware/hdmi/cadence/signed_hdmi_imx8m.bin ${DEPLOYDIR}
-}
-
-
-deploy_for_mx9() {
-    # Synopsys DDR
-    for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
-        install -m 0644 ${S}/firmware/ddr/synopsys/${ddr_firmware} ${DEPLOYDIR}
-    done
-}
-
-python () {
-    # Manually add the required functions as dependencies otherwise they won't be included in the
-    # final run script.
-    deploy_for = d.getVar('DEPLOY_FOR', True).split()
-    for soc in deploy_for:
-        d.appendVarFlag('do_deploy', 'vardeps', ' deploy_for_%s' % soc)
-}
-
-do_deploy () {
-    for soc in ${DEPLOY_FOR}; do
-        bbnote "Running deploy for $soc"
-        deploy_for_$soc
-    done
-}
-
-addtask deploy after do_install before do_build
-
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-
-COMPATIBLE_MACHINE                  = "(mx8-generic-bsp|mx9-generic-bsp)"
-COMPATIBLE_MACHINE:mx8x-generic-bsp = "(^$)"
diff --git a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.26.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.26.bb
new file mode 100644
index 000000000..c35e31e07
--- /dev/null
+++ b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.26.bb
@@ -0,0 +1,61 @@
+# Copyright (C) 2018-2024 NXP
+SUMMARY = "Freescale i.MX Firmware files used for boot"
+
+require firmware-imx-${PV}.inc
+
+inherit deploy nopackages
+
+do_install[noexec] = "1"
+
+DEPLOY_FOR                  = ""
+DEPLOY_FOR:mx8-generic-bsp  = "mx8"
+DEPLOY_FOR:mx8m-generic-bsp = "mx8m"
+DEPLOY_FOR:mx9-generic-bsp  = "mx9"
+
+deploy_for_mx8() {
+    # Cadence HDMI
+    install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${DEPLOYDIR}
+    install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${DEPLOYDIR}
+    install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${DEPLOYDIR}
+}
+
+deploy_for_mx8m() {
+    # Synopsys DDR
+    for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
+        install -m 0644 ${S}/firmware/ddr/synopsys/${ddr_firmware} ${DEPLOYDIR}
+    done
+
+    # Cadence DP and HDMI
+    install -m 0644 ${S}/firmware/hdmi/cadence/signed_dp_imx8m.bin ${DEPLOYDIR}
+    install -m 0644 ${S}/firmware/hdmi/cadence/signed_hdmi_imx8m.bin ${DEPLOYDIR}
+}
+
+
+deploy_for_mx9() {
+    # Synopsys DDR
+    for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
+        install -m 0644 ${S}/firmware/ddr/synopsys/${ddr_firmware} ${DEPLOYDIR}
+    done
+}
+
+python () {
+    # Manually add the required functions as dependencies otherwise they won't be included in the
+    # final run script.
+    deploy_for = d.getVar('DEPLOY_FOR', True).split()
+    for soc in deploy_for:
+        d.appendVarFlag('do_deploy', 'vardeps', ' deploy_for_%s' % soc)
+}
+
+do_deploy () {
+    for soc in ${DEPLOY_FOR}; do
+        bbnote "Running deploy for $soc"
+        deploy_for_$soc
+    done
+}
+
+addtask deploy after do_install before do_build
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+
+COMPATIBLE_MACHINE                  = "(mx8-generic-bsp|mx9-generic-bsp)"
+COMPATIBLE_MACHINE:mx8x-generic-bsp = "(^$)"
-- 
cgit v1.2.3-54-g00ecf