From 23b0b82767525a5584f1819f801a2f065d0c5afb Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sun, 30 Oct 2022 15:27:28 -0500 Subject: firmware-imx: Upgrade 8.16 -> 8.17 New firmware binaries are available from NXP as a part of 5.15.52-2.1.0 release. Fixes: 85e512c 8qxp/qm vpu firmware: decoder 1.8.5 60ea4e7 8qxp/qm vpu firmware: decoder 1.8.4 Signed-off-by: Tom Hochstein (cherry picked from commit 750912fcc07c28041412ca5af0949b509395420e) --- recipes-bsp/firmware-imx/firmware-imx-8.16.inc | 17 --- recipes-bsp/firmware-imx/firmware-imx-8.17.inc | 17 +++ recipes-bsp/firmware-imx/firmware-imx-8_8.16.bb | 23 ---- recipes-bsp/firmware-imx/firmware-imx-8_8.17.bb | 23 ++++ recipes-bsp/firmware-imx/firmware-imx-8m_8.16.bb | 24 ---- recipes-bsp/firmware-imx/firmware-imx-8m_8.17.bb | 24 ++++ recipes-bsp/firmware-imx/firmware-imx_8.16.bb | 156 ----------------------- recipes-bsp/firmware-imx/firmware-imx_8.17.bb | 156 +++++++++++++++++++++++ 8 files changed, 220 insertions(+), 220 deletions(-) delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8.16.inc create mode 100644 recipes-bsp/firmware-imx/firmware-imx-8.17.inc delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8_8.16.bb create mode 100644 recipes-bsp/firmware-imx/firmware-imx-8_8.17.bb delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8m_8.16.bb create mode 100644 recipes-bsp/firmware-imx/firmware-imx-8m_8.17.bb delete mode 100644 recipes-bsp/firmware-imx/firmware-imx_8.16.bb create mode 100644 recipes-bsp/firmware-imx/firmware-imx_8.17.bb diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.16.inc b/recipes-bsp/firmware-imx/firmware-imx-8.16.inc deleted file mode 100644 index 807d2381..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx-8.16.inc +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright (C) 2017-2021 NXP -# Copyright (C) 2018 O.S. Systems Software LTDA. -SECTION = "base" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" - -SRC_URI = " \ - ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ -" - -SRC_URI[md5sum] = "9ed2923c0eb511c7fcf37dd607944124" -SRC_URI[sha256sum] = "65f829a9e2597bffc58a680aaefa638122144a083633d1ae09b3aec1d9f8ab84" - -S = "${WORKDIR}/firmware-imx-${PV}" - -inherit fsl-eula-unpack diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.17.inc b/recipes-bsp/firmware-imx/firmware-imx-8.17.inc new file mode 100644 index 00000000..78f03c25 --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx-8.17.inc @@ -0,0 +1,17 @@ +# Copyright (C) 2012-2016 Freescale Semiconductor +# Copyright (C) 2017-2021 NXP +# Copyright (C) 2018 O.S. Systems Software LTDA. +SECTION = "base" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" + +SRC_URI = " \ + ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ +" + +SRC_URI[md5sum] = "63eac7b400d711c668458ec4bf5d0c60" +SRC_URI[sha256sum] = "1ee3c49ad8749867487f09d6e4472536fb809b667c1bb3c56511175b8974e3c6" + +S = "${WORKDIR}/firmware-imx-${PV}" + +inherit fsl-eula-unpack diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.16.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.16.bb deleted file mode 100644 index 18ce14d3..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.16.bb +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2018-2020 NXP -SUMMARY = "Freescale i.MX firmware for 8 family" -DESCRIPTION = "Freescale i.MX firmware for 8 family" - -require firmware-imx-${PV}.inc - -inherit deploy - -do_install[noexec] = "1" - -do_deploy() { - # 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} -} -addtask deploy after do_install before do_build - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" - -COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" -COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)" -COMPATIBLE_MACHINE:mx8x-nxp-bsp = "(^$)" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.17.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.17.bb new file mode 100644 index 00000000..18ce14d3 --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.17.bb @@ -0,0 +1,23 @@ +# Copyright (C) 2018-2020 NXP +SUMMARY = "Freescale i.MX firmware for 8 family" +DESCRIPTION = "Freescale i.MX firmware for 8 family" + +require firmware-imx-${PV}.inc + +inherit deploy + +do_install[noexec] = "1" + +do_deploy() { + # 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} +} +addtask deploy after do_install before do_build + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" + +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" +COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)" +COMPATIBLE_MACHINE:mx8x-nxp-bsp = "(^$)" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.16.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.16.bb deleted file mode 100644 index 152ef0b5..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.16.bb +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2018-2020 NXP -SUMMARY = "Freescale i.MX firmware for 8M and 8M Mini family" -DESCRIPTION = "Freescale i.MX firmware for 8M and 8M Mini family" - -require firmware-imx-${PV}.inc - -inherit deploy - -do_install[noexec] = "1" - -do_deploy() { - # 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} -} -addtask deploy after do_install before do_build - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" - -COMPATIBLE_MACHINE = "(mx8m-generic-bsp)" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.17.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.17.bb new file mode 100644 index 00000000..152ef0b5 --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.17.bb @@ -0,0 +1,24 @@ +# Copyright (C) 2018-2020 NXP +SUMMARY = "Freescale i.MX firmware for 8M and 8M Mini family" +DESCRIPTION = "Freescale i.MX firmware for 8M and 8M Mini family" + +require firmware-imx-${PV}.inc + +inherit deploy + +do_install[noexec] = "1" + +do_deploy() { + # 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} +} +addtask deploy after do_install before do_build + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" + +COMPATIBLE_MACHINE = "(mx8m-generic-bsp)" diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.16.bb b/recipes-bsp/firmware-imx/firmware-imx_8.16.bb deleted file mode 100644 index f84ea1fa..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx_8.16.bb +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright (C) 2017-2021 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 firmware-imx-${PV}.inc - -PE = "1" - -inherit allarch - -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 - rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin - rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin - - # 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 -} - -# -# 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" - -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 \ -" - -COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.17.bb b/recipes-bsp/firmware-imx/firmware-imx_8.17.bb new file mode 100644 index 00000000..f84ea1fa --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx_8.17.bb @@ -0,0 +1,156 @@ +# Copyright (C) 2012-2016 Freescale Semiconductor +# Copyright (C) 2017-2021 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 firmware-imx-${PV}.inc + +PE = "1" + +inherit allarch + +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 + rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin + rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin + + # 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 +} + +# +# 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" + +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 \ +" + +COMPATIBLE_MACHINE = "(imx-generic-bsp)" -- cgit v1.2.3-54-g00ecf From c9d8096549a8ecc02cae5a00c0c53a844fb2e084 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sun, 30 Oct 2022 15:33:45 -0500 Subject: imx-atf: Update lf-5.15.32-2.0.0 to lf-5.15.52-2.1.0 Commits: ``` 9202efc9a Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 952363526 LF-7033 imx8ulp: Update XRDC for M33 LED demo fdb7c9650 Merge remote-tracking branch 'origin/ls_v2.6' into lf_v2.6 e492f46d0 [LF-7027] fix(nxp-tools): fix coverity issue a5546a2d5 [LF-5882] fix(nxp-ddr): fix coverity issue 8b93a4736 Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 d4dc1ca15 LF-7020-2 imx8ulp: Extend NOBITS region and RWDATA region 0832aaf09 LF-7020-1 imx8ulp: Change DRAM timing address to 0x20055000 ae5e50886 Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 c7803adf5 LF-6898 feat(imx8ulp): add pcc sw_rst workaround for lpav peripherals 1342e77db LF-7012 fix(imx8ulp): add sw workaround for csi/hotplug test hang aa1cf3deb Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 0293fc13f LF-6846-3 imx8ulp: Enable separated NOBITS region and RWDATA region b6c83ff7f LF-6846-2 imx8ulp: Change to not use mailbox for warm boot 8dce222c5 LF-6846-1 bl31: Support to use separated memory for RW DATA 94f4d1024 Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 d95ff4b2b LF-6840 fix(imx8ulp): Assert gpu reset before power up aaad28622 Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 edcb7191d LF-6947 iMX93: wdog: Enable the timeout interrupt 4bc6d005b Merge remote-tracking branch 'origin/ls_v2.6' into lf_v2.6 24498f1ae LF-6774: Coverity Issue fix 54816ac81 MA-20469 Enable suspend/resume when GPC interrupt-controller is disabled in the kernel 9da0b5c06 LF-6773 feat(imx8m): fix coverity out of bound access issue c3cdc6c25 Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 0b84e63ca Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 41473aec1 LF-6731 imx8qm:Fix suspend/resume failure in cockpit case. f95899d59 Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 d007d2e37 LF-6726 feat(imx8mq): make uart base configurable at build time 96d17a6ea Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 ac8ebc85d LF-6720 imx93: allow SoC masters access to system TCM e987e18cf Merge remote-tracking branch 'origin/ls_v2.6' into lf_v2.6 6e3d623db Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 ce00f0255 LF-6699 scmi: sensor: Fix description get message size issue ac9b5a6cb TESTLINK-6167: support new ddr MT40A1G8SA-062E:R for ls1043ardb-pd 647e17008 Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 930692f55 LF-6682 feat(imx8ulp): adjust the voltage when sys dvfs enabled a39bcff2a Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 368887839 LF-6692 imx8ulp: Configure MMU to NS for S4MU, FSB and SEC SIM aa6b3e19f Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 0cf6f1dac LF-6666 feat(imx93): update the ocram trdc config for did10 760a8b1eb LFOPTEE-158 imx93: add OPTEE support 99c408024 Merge remote-tracking branch 'origin/ls_v2.6' into lf_v2.6 a660ad3b7 Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 7051f3e6e MLK-25886-08 feat(imx93): swith the console mode e74fa67a0 MLK-25886-07 feat(imx93): add kick cm33 support 2a64bb65f MLK-25886-06 feat(imx93): update TRDC setting for M33 fd60ac053 MLK-25886-05 feat(imx93): update TRDC setting for first 96KB OCRAM 3e249c60f MLK-25886-04 feat(imx93): enable the trdc init on imx93 cca84d4a0 MLK-25886-03 feat(imx93): assign gpio pins to non-secure world by default b3e756370 MLK-25886-02 feat(imx93): Add the basic support df71cd4cc MLK-25886-01 feat(imx93): add TRDC driver support 7035a6fdf feat(imx8ulp): update the wdog reinit flow 78347b821 LF-6323 secure-boot: fix for sd boot mode failure f2a1bfb95 LF-6323 secure-boot: fix for sd boot mode failure e2bbd4659 Merge remote-tracking branch 'origin/imx_v2.6' into lf_v2.6 1206bb370 MA-20366 imx8ulp: limit non-secure access to xRDC MGR 44c44f0fd Merge remote-tracking branch 'origin/ls_v2.6' into lf_v2.6 fbb01f7b6 feat(lx2): support more variants 6c64a1fee fix(lx2): init global data before using it fb01a7a0d Merge remote-tracking branch 'origin/ls_v2.6' into lf_v2.6 7ec4e9bce Pull request #59: LF-5883 LF-5884 fix(nxp-drviers): fix fspi coverity issue ``` Signed-off-by: Tom Hochstein (cherry picked from commit e51c9e6417a74106b26dc088cee775a18005ed23) Signed-off-by: Oleksandr Suvorov --- recipes-bsp/imx-atf/imx-atf_2.6.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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" -- cgit v1.2.3-54-g00ecf From 0f4d34951aa73e269f7b7ceb1b1782965978b9dd Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sun, 30 Oct 2022 15:50:10 -0500 Subject: imx-lib: Update lf-5.15.32-2.0.0 to lf-5.15.52-2.1.0 No commits. Repo is moved to github. Signed-off-by: Tom Hochstein (cherry picked from commit 622fec2bcc7c1c23545c305be0252ab743bde00e) --- recipes-bsp/imx-lib/imx-lib_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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" -- cgit v1.2.3-54-g00ecf From 7bc92291d038044806048ecec65145d44ab79e25 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sun, 30 Oct 2022 16:08:12 -0500 Subject: imx-mkimage: Update lf-5.15.32-2.0.0 to lf-5.15.52-2.1.0 Fixes: ``` 37648c8 iMX8ULP: update README for A1 silicon 46c0b5c iMX8M: use name mkeficapsule 809e209 iMX8M: use GUID for mkeficapsule c2dfe3e iMX8M: add a delete_capsule_key target 3948fde imx8ulp: Update flash_kernel for A1 part a735d32 Add MX9 autobuild. 96dba6b iMX8M: correct the path of mkimage_uboot 47e6dd4 imx8ulp: Add A1 part image build bd068a5 iMX8M: add capsule support 57a8eda makefile: compile in the specified directory fce2236 iMX93: support flash_lpboot and flash_lpboot_flexspi 400f62b imx9: Add DDR PHY FW to boot image 74b2c48 iMX93: support flash_lpboot_no_ahabfw_flexspi image 9826dea iMX93: support m33 in single boot 58b70e2 mkimage: support an optional m4 load addr option 4ee8733 Container: Update sentinel d6815e4 Container: Add Chinese Algorithm SM3 8acf49b iMX9: Add iMX93 support dc4b1e2 imx8ulp: Update flash_kernel target loading address ``` Signed-off-by: Tom Hochstein (cherry picked from commit 0a90bc6bfdc04a2e570e6f928c78dc3ec534de37) --- ...M-soc.mak-use-native-mkimage-from-sysroot.patch | 25 ++++++++++------------ recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 6 +++--- 2 files changed, 14 insertions(+), 17 deletions(-) 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 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 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" -- cgit v1.2.3-54-g00ecf