From 08910ab89415baed5406364c969e3fe4527a09f8 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 15 Aug 2022 17:25:36 -0500 Subject: firmware-imx: Upgrade 8.15 -> 8.16 New firmware binaries are available from NXP as a part of 5.15.32-2.0.0 release. Fixes: c36813e 8qxp/qm vpu firmware: decoder 1.8.3 61e619f 8qxp/qm vpu firmware: decoder 1.8.2 6eb058b 8qxp/qm vpu firmware: decoder 1.8.1 517f4da 8qxp/qm vpu firmware: decoder 1.8.0 2f0b14c Rename dp_imx8m.bin to dp_lsl028a.bin 4216a1b 8qxp/qm vpu firmware: decoder 1.7.5 d710230 imx93: Add DDR PHY FW for LPDDR4/4X 5f439fb Updating iMX8M DP firmware to version 1.0.65 0b82970 Updating iMX8M and iMX8QM HDMI and DP TX firmware to version 1.0.64 Signed-off-by: Tom Hochstein (cherry picked from commit 1f90a641be12e1a52605a880e0779c93e6177ad7) --- recipes-bsp/firmware-imx/firmware-imx-8.15.inc | 17 --- recipes-bsp/firmware-imx/firmware-imx-8.16.inc | 17 +++ recipes-bsp/firmware-imx/firmware-imx-8_8.15.bb | 23 ---- recipes-bsp/firmware-imx/firmware-imx-8_8.16.bb | 23 ++++ recipes-bsp/firmware-imx/firmware-imx-8m_8.15.bb | 24 ---- recipes-bsp/firmware-imx/firmware-imx-8m_8.16.bb | 24 ++++ recipes-bsp/firmware-imx/firmware-imx_8.15.bb | 156 ----------------------- recipes-bsp/firmware-imx/firmware-imx_8.16.bb | 156 +++++++++++++++++++++++ 8 files changed, 220 insertions(+), 220 deletions(-) delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8.15.inc create mode 100644 recipes-bsp/firmware-imx/firmware-imx-8.16.inc delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8_8.15.bb create mode 100644 recipes-bsp/firmware-imx/firmware-imx-8_8.16.bb delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8m_8.15.bb create mode 100644 recipes-bsp/firmware-imx/firmware-imx-8m_8.16.bb delete mode 100644 recipes-bsp/firmware-imx/firmware-imx_8.15.bb create mode 100644 recipes-bsp/firmware-imx/firmware-imx_8.16.bb diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.15.inc b/recipes-bsp/firmware-imx/firmware-imx-8.15.inc deleted file mode 100644 index 73f627fb..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx-8.15.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=be5ff43682ed6c57dfcbeb97651c2829" - -SRC_URI = " \ - ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ -" - -SRC_URI[md5sum] = "ef91390da6c8a6a48c8121a5dd667de8" -SRC_URI[sha256sum] = "937e196476b8e95b4b7f2501a14c8326d8a0649f8a3f9228b72373770a08deb3" - -S = "${WORKDIR}/firmware-imx-${PV}" - -inherit fsl-eula-unpack diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.16.inc b/recipes-bsp/firmware-imx/firmware-imx-8.16.inc new file mode 100644 index 00000000..807d2381 --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx-8.16.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=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_8.15.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.15.bb deleted file mode 100644 index 18ce14d3..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.15.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.16.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.16.bb new file mode 100644 index 00000000..18ce14d3 --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.16.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.15.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.15.bb deleted file mode 100644 index 152ef0b5..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.15.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.16.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.16.bb new file mode 100644 index 00000000..152ef0b5 --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.16.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.15.bb b/recipes-bsp/firmware-imx/firmware-imx_8.15.bb deleted file mode 100644 index f84ea1fa..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx_8.15.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.16.bb b/recipes-bsp/firmware-imx/firmware-imx_8.16.bb new file mode 100644 index 00000000..f84ea1fa --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx_8.16.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 b32e4728603af5be76cfb361833302ac11bbf80f Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 15 Aug 2022 17:42:01 -0500 Subject: alsa-state: Fix comment The comment for FILESEXTRAPATHS had migrated away. Improve the content as well. Signed-off-by: Tom Hochstein (cherry picked from commit 9a488d5c31184db58c46bb08cc2b46544edf7ecd) --- recipes-bsp/alsa-state/alsa-state.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend index b4b1eddf..1b05b7bd 100644 --- a/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,4 +1,4 @@ +# Prepend path to override files from upstream recipe FILESEXTRAPATHS:prepend:imx-generic-bsp := "${THISDIR}/${PN}/imx-generic-bsp:" -# Append path for freescale layer PACKAGE_ARCH:imx-generic-bsp = "${MACHINE_ARCH}" -- cgit v1.2.3-54-g00ecf From 448a800e7f6e0237d085b9466296dbe145e67925 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 16 Aug 2022 13:06:08 -0500 Subject: imx-atf: Cleanup Signed-off-by: Tom Hochstein (cherry picked from commit 9080ae88a08de2cfe6b3709f331020ec4a0c2f4c) --- recipes-bsp/imx-atf/imx-atf_2.6.bb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/recipes-bsp/imx-atf/imx-atf_2.6.bb b/recipes-bsp/imx-atf/imx-atf_2.6.bb index 194ef935..b0426f0b 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.6.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.6.bb @@ -1,28 +1,26 @@ -# Copyright (C) 2017-2021 NXP +# Copyright (C) 2017-2022 NXP DESCRIPTION = "i.MX ARM Trusted Firmware" SECTION = "BSP" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - PV .= "+git${SRCPV}" -SRCBRANCH = "lf_v2.6" SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ file://0001-Makefile-Suppress-array-bounds-error.patch" +SRCBRANCH = "lf_v2.6" SRCREV = "c6a19b1a351308cc73443283f6aa56b2eff791b8" S = "${WORKDIR}/git" inherit deploy -ATF_PLATFORM ??= "INVALID" +ATF_PLATFORM ??= "INVALID" # FIXME: We should return INVALID here but currently only i.MX8M has support to override the UART # base address in source code. -ATF_BOOT_UART_BASE ?= "" +ATF_BOOT_UART_BASE ?= "" EXTRA_OEMAKE += " \ CROSS_COMPILE="${TARGET_PREFIX}" \ @@ -61,20 +59,20 @@ do_compile() { # Clear LDFLAGS to avoid the option -Wl recognize issue oe_runmake bl31 if ${BUILD_OPTEE}; then - oe_runmake clean BUILD_BASE=build-optee - oe_runmake BUILD_BASE=build-optee SPD=opteed bl31 + oe_runmake clean BUILD_BASE=build-optee + oe_runmake BUILD_BASE=build-optee SPD=opteed bl31 fi } do_install[noexec] = "1" +addtask deploy after do_compile do_deploy() { install -Dm 0644 ${S}/build/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin if ${BUILD_OPTEE}; then - install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin-optee + install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin-optee fi } -addtask deploy after do_compile PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(mx8-generic-bsp)" -- cgit v1.2.3-54-g00ecf From 6134e06afe69013176bc29d585d16ee45c8a2b53 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 16 Aug 2022 13:12:24 -0500 Subject: imx-mkimage: Update to 5.15.32_2.0.0 Drop patches incorporated in the new version: - 0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch - 0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch - 0001-Add-LDFLAGS-to-link-step.patch - 0001-Add-support-for-overriding-BL31-BL32-and-BL33.patch Signed-off-by: Tom Hochstein (cherry picked from commit ca7d70516fb7855a1e84aebf8b9b1e19ae784385) --- .../files/0001-Add-LDFLAGS-to-link-step.patch | 28 --------- ...support-for-overriding-BL31-BL32-and-BL33.patch | 62 ------------------- ...-for-overriding-BL32-and-BL33-not-only-BL.patch | 71 ---------------------- ...M-soc.mak-use-native-mkimage-from-sysroot.patch | 18 +++--- ...age_fit_atf-fix-fit-generator-node-naming.patch | 55 ----------------- recipes-bsp/imx-mkimage/imx-mkimage_git.bb | 2 +- recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 11 ++-- 7 files changed, 14 insertions(+), 233 deletions(-) delete mode 100644 recipes-bsp/imx-mkimage/files/0001-Add-LDFLAGS-to-link-step.patch delete mode 100644 recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL31-BL32-and-BL33.patch delete mode 100644 recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch delete mode 100644 recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch diff --git a/recipes-bsp/imx-mkimage/files/0001-Add-LDFLAGS-to-link-step.patch b/recipes-bsp/imx-mkimage/files/0001-Add-LDFLAGS-to-link-step.patch deleted file mode 100644 index f8c68d45..00000000 --- a/recipes-bsp/imx-mkimage/files/0001-Add-LDFLAGS-to-link-step.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2a6e2d40a4af78d4a0824e384c3aec55db758fee Mon Sep 17 00:00:00 2001 -From: Erik Larsson -Date: Tue, 6 Mar 2018 12:28:39 +0100 -Subject: [PATCH] Add LDFLAGS to link step - -Upstream-Status: Pending - -Signed-off-by: Erik Larsson ---- - iMX8M/soc.mak | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak -index 03b05f7aafeb..4d5df0777704 100644 ---- a/iMX8M/soc.mak -+++ b/iMX8M/soc.mak -@@ -84,7 +84,7 @@ FW_DIR = imx-boot/imx-boot-tools/$(PLAT) - $(MKIMG): mkimage_imx8.c - @echo "PLAT="$(PLAT) "HDMI="$(HDMI) - @echo "Compiling mkimage_imx8" -- $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) -lz -+ $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) $(BUILD_LDFLAGS) -lz - - lpddr4_imem_1d = lpddr4_pmu_train_1d_imem$(LPDDR_FW_VERSION).bin - lpddr4_dmem_1d = lpddr4_pmu_train_1d_dmem$(LPDDR_FW_VERSION).bin --- -2.35.1 - diff --git a/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL31-BL32-and-BL33.patch b/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL31-BL32-and-BL33.patch deleted file mode 100644 index 4e0d954a..00000000 --- a/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL31-BL32-and-BL33.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8fc8fc3dfce7533b9c965185277d34e27055cc8f Mon Sep 17 00:00:00 2001 -From: Thomas Perrot -Date: Tue, 26 Apr 2022 15:10:04 +0200 -Subject: [PATCH] Add support for overriding BL31, BL32 and BL33 - -Upstream-Status: Pending - -Signed-off-by: Thomas Perrot ---- - iMX8M/print_fit_hab.sh | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/iMX8M/print_fit_hab.sh b/iMX8M/print_fit_hab.sh -index b915115d1ecc..dbc28f2d9af5 100755 ---- a/iMX8M/print_fit_hab.sh -+++ b/iMX8M/print_fit_hab.sh -@@ -1,12 +1,16 @@ - #!/bin/bash - --BL32="tee.bin" -- - let fit_off=$1 - - # keep backward compatibility - [ -z "$TEE_LOAD_ADDR" ] && TEE_LOAD_ADDR="0xfe000000" - -+[ -z "$BL31" ] && BL31="bl31.bin" -+ -+[ -z "$BL32" ] && BL32="tee.bin" -+ -+[ -z "$BL33" ] && BL33="u-boot-nodtb.bin" -+ - if [ -z "$ATF_LOAD_ADDR" ]; then - echo "ERROR: BL31 load address is not set" >&2 - exit 0 -@@ -26,7 +30,7 @@ else - let uboot_sign_off=$((fit_off - 0x8000 - ivt_off + 0x3000)) - fi - --let uboot_size=$(ls -lct u-boot-nodtb.bin | awk '{print $5}') -+let uboot_size=$(ls -lct $BL33 | awk '{print $5}') - let uboot_load_addr=0x40200000 - - let last_sign_off=$(((uboot_sign_off + uboot_size + 3) & ~3)) -@@ -64,13 +68,13 @@ done - - let atf_sign_off=$((last_sign_off)) - let atf_load_addr=$ATF_LOAD_ADDR --let atf_size=$(ls -lct bl31.bin | awk '{print $5}') -+let atf_size=$(ls -lct $BL31 | awk '{print $5}') - - if [ ! -f $BL32 ]; then - let tee_size=0x0 - let tee_sign_off=$((atf_sign_off + atf_size)) - else -- let tee_size=$(ls -lct tee.bin | awk '{print $5}') -+ let tee_size=$(ls -lct $BL32 | awk '{print $5}') - - let tee_sign_off=$(((atf_sign_off + atf_size + 3) & ~3)) - let tee_load_addr=$TEE_LOAD_ADDR --- -2.35.1 diff --git a/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch b/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch deleted file mode 100644 index 72d83e63..00000000 --- a/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch +++ /dev/null @@ -1,71 +0,0 @@ -From ef28030129a04b1d70dbca3f2236fe7b1c67b4ed Mon Sep 17 00:00:00 2001 -From: Erik Larsson -Date: Thu, 8 Mar 2018 19:04:37 +0100 -Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31 - -Upstream-Status: Pending - -Signed-off-by: Erik Larsson -Signed-off-by: Christopher Dahlberg -Signed-off-by: Marcus Folkesson -Signed-off-by: Thomas Perrot ---- - iMX8M/mkimage_fit_atf.sh | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh -index 10903ea3bbf5..341a4b3da1ef 100755 ---- a/iMX8M/mkimage_fit_atf.sh -+++ b/iMX8M/mkimage_fit_atf.sh -@@ -6,6 +6,7 @@ - # usage: $0 [ [&2 - exit 0 - else -- echo "bl31.bin size: " >&2 -- ls -lct bl31.bin | awk '{print $5}' >&2 -+ echo "$BL31 size: " >&2 -+ ls -lct $BL31 | awk '{print $5}' >&2 - fi - --BL32="tee.bin" -+[ -z "$BL32" ] && BL32="tee.bin" - LOADABLES="\"atf-1\"" - - if [ ! -f $BL32 ]; then - BL32=/dev/null - else -- echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2 -- echo "tee.bin size: " >&2 -- ls -lct tee.bin | awk '{print $5}' >&2 -+ echo "Building with TEE support, make sure $BL31 is compiled with spd. If you do not want tee, please delete $BL32" >&2 -+ echo "$BL32 size: " >&2 -+ ls -lct $BL32 | awk '{print $5}' >&2 - LOADABLES="$LOADABLES, \"tee-1\"" - fi - --BL33="u-boot-nodtb.bin" -+[ -z "$BL33" ] && BL33="u-boot-nodtb.bin" - DEK_BLOB="dek_blob_fit_dummy.bin" - - if [ ! -f $DEK_BLOB ]; then -@@ -49,8 +50,8 @@ if [ ! -f $BL33 ]; then - exit 0 - else - -- echo "u-boot-nodtb.bin size: " >&2 -- ls -lct u-boot-nodtb.bin | awk '{print $5}' >&2 -+ echo "$BL33 size: " >&2 -+ ls -lct $BL33 | awk '{print $5}' >&2 - fi - - for dtname in $* --- -2.35.1 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 a879208c..e82b6bee 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 a4af3747abd88247bf4498ec0cf67a4151e64d41 Mon Sep 17 00:00:00 2001 +From 2734c670dc4062015d05559a94fa988da5d705e6 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 @@ -21,19 +21,19 @@ Signed-off-by: Andrey Zhizhikin 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak -index 4bfdc37..03b05f7 100644 +index a98195e..60502d8 100644 --- a/iMX8M/soc.mak +++ b/iMX8M/soc.mak -@@ -148,7 +148,7 @@ u-boot.itb: $(dtb) +@@ -149,7 +149,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 + 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 - ./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) +@@ -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 @@ -42,7 +42,7 @@ index 4bfdc37..03b05f7 100644 @rm -f u-boot.its $(dtb_ddr3l) dtb_ddr3l_evk = evkddr3l.dtb -@@ -172,7 +172,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) +@@ -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 @@ -51,7 +51,7 @@ index 4bfdc37..03b05f7 100644 @rm -f u-boot.its $(dtb_ddr3l_evk) dtb_ddr4 = valddr4.dtb -@@ -184,7 +184,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) +@@ -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 @@ -60,7 +60,7 @@ index 4bfdc37..03b05f7 100644 @rm -f u-boot.its $(dtb_ddr4) dtb_ddr4_evk = evkddr4.dtb -@@ -196,7 +196,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) +@@ -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 @@ -69,7 +69,7 @@ index 4bfdc37..03b05f7 100644 @rm -f u-boot.its $(dtb_ddr4_evk) ifeq ($(HDMI),yes) -@@ -312,7 +312,6 @@ nightly : +@@ -318,7 +318,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 diff --git a/recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch b/recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch deleted file mode 100644 index 5a4a895b..00000000 --- a/recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch +++ /dev/null @@ -1,55 +0,0 @@ -From f281b935985f1b592534ee2837ce0d0b28c7dc43 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin -Date: Tue, 11 Jan 2022 15:32:05 -0600 -Subject: [PATCH] mkimage_fit_atf: fix fit generator node naming - -Extend sections which contains "firmware" in their types with "os" -parameter to conform to the latest FIT specification. - -Indicate that load and entry addresses are covered by one 32-bit value -by adding "address-cells" in the root node of the generated ITS. - -Upstream-Status: Inappropriate [script is imx-boot specific] -Link: [1] https://github.com/u-boot/u-boot/commit/79af75f7776fc20b0d7eb6afe1e27c00fdb4b9b4 -Signed-off-by: Andrey Zhizhikin -Cc: Tom Hochstein ---- - iMX8M/mkimage_fit_atf.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh -index 4f2b3f3..10903ea 100755 ---- a/iMX8M/mkimage_fit_atf.sh -+++ b/iMX8M/mkimage_fit_atf.sh -@@ -64,10 +64,12 @@ cat << __HEADER_EOF - - / { - description = "Configuration to load ATF before U-Boot"; -+ #address-cells = <1>; - - images { - uboot-1 { - description = "U-Boot (64-bit)"; -+ os = "u-boot"; - data = /incbin/("$BL33"); - type = "standalone"; - arch = "arm64"; -@@ -93,6 +95,7 @@ done - cat << __HEADER_EOF - atf-1 { - description = "ARM Trusted Firmware"; -+ os = "arm-trusted-firmware"; - data = /incbin/("$BL31"); - type = "firmware"; - arch = "arm64"; -@@ -106,6 +109,7 @@ if [ -f $BL32 ]; then - cat << __HEADER_EOF - tee-1 { - description = "TEE firmware"; -+ os = "op-tee-firmware"; - data = /incbin/("$BL32"); - type = "firmware"; - arch = "arm64"; --- -2.17.1 - diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb index 4906121f..0add1c92 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb @@ -1,5 +1,5 @@ # Copyright (C) 2016 Freescale Semiconductor -# Copyright (C) 2017-2021 NXP +# Copyright (C) 2017-2022 NXP require imx-mkimage_git.inc diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index 165ba64e..6db6a883 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -1,16 +1,13 @@ -# Copyright 2017-2021 NXP +# Copyright 2017-2022 NXP DEPENDS = "zlib-native openssl-native" -SRCBRANCH = "lf-5.15.5_1.0.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 \ - file://0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch \ - file://0001-Add-LDFLAGS-to-link-step.patch \ - file://0001-Add-support-for-overriding-BL31-BL32-and-BL33.patch \ " -SRCREV = "22346a32a88aa752d4bad8f2ed1eb641e18849dc" +SRCBRANCH = "lf-5.15.32_2.0.0" +SRCREV = "a8bb8edb45492ac70b33734122a57aa8e38a20bd" + S = "${WORKDIR}/git" BOOT_TOOLS = "imx-boot-tools" -- cgit v1.2.3-54-g00ecf From 243b6a0f75d9e3953a5cb829aa035437582e4664 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 16 Aug 2022 20:53:56 -0500 Subject: imx-test: Upgrade for NXP release 5.15.32-2.0.0 Signed-off-by: Tom Hochstein (cherry picked from commit b3f65a6cdfb6cb9505f5d4ac52b0a08a05babf5e) --- recipes-bsp/imx-test/imx-test_git.bb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index b5ee124e..fc4f110c 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -1,6 +1,6 @@ # Copyright (C) 2012-2016 O.S. Systems Software LTDA. # Copyright (C) 2013-2016 Freescale Semiconductor -# Copyright (C) 2017-2021 NXP +# Copyright (C) 2017-2022 NXP SUMMARY = "Test programs for i.MX BSP" DESCRIPTION = "Unit tests for the i.MX BSP" @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" -DEPENDS = "alsa-lib libdrm" +DEPENDS = "alsa-lib freetype libdrm" DEPENDS:append:mx6-nxp-bsp = " imx-lib" DEPENDS:append:mx7-nxp-bsp = " imx-lib" DEPENDS:append:imxvpu = " virtual/imxvpu" @@ -16,12 +16,11 @@ DEPENDS:append:imxvpu = " virtual/imxvpu" PE = "1" PV = "7.0+${SRCPV}" -SRCBRANCH = "lf-5.15.5_1.0.0" -SRC_URI = " \ - git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ - file://memtool_profile \ -" -SRCREV = "b364c1aacc72a63290106ae065bb2f6a8c365ec6" +SRC_URI = "git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ + file://memtool_profile" +SRCBRANCH = "lf-5.15.32_2.0.0" +SRCREV = "c640c7e8456b0516851e76adb2acce6b3866b1fb" + S = "${WORKDIR}/git" inherit module-base use-imx-headers -- cgit v1.2.3-54-g00ecf From 5ef2e1390e03a7fe730fe1bd78047f3755b13d2b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 17 Aug 2022 11:36:08 -0500 Subject: imx-sc-firmware: Upgrade 1.12.1 -> 1.13.0 Fixes: 8172eaea4 SCF-105: Update EULA. 093f2aeb1 SCF-105: Add dox for system-level power management 2221c23c7 SCF-105: Make RN more clear on FW versions. a764aa21b SCF-105: More RN changes. 614759d5b SCF-105: Update RN. 60d86cbf9 SCF-105: Update RN. 3db0966d7 SCF-105: Update yb2 info. a0a3763bc SCF-820: Fix printf output in monitor seco commit command. 0f1d3df24 SCF-799 Ensure bypass clocks are reset on power off 1c90b3846 SCF-105: Update dox on SCU WDOG configuration 4cdacdeda SCF-105: Update dox on FIPS mode reduced features. e07994f63 SCF-105: Update dox on reset causes. 0054fbf12 SCF-105: Update RN. 6fade97b4 Revert "SCF-816: Enable NO FIELD RETURN." 798a1ee79 SCF-105: Update RN. 2d755c539 SCF-819: Update MU driver to version 2.1.0. Fixes LSIO MU reset issue. 0d69ccecd SCF-817: Fix the SNVS ON_TIME defines. d6b3223d2 SCF-816: Enable NO FIELD RETURN. 4dc872512 SCF-813 MISRA fix 69e900b25 SCF-105: Support 1.4.x Linux versions. 26acdc9e1 SCF-105: Update RN. 13bfb9857 SCF-798: Support DXL B0 SECO FW v3.8.6 and V2X FW v1.1.5. 5b27069c9 SCF-105: Fix linux versions. 1cfe97b4a SCF-814: Improvement to MX8QXP and MX8DX DDR3L DCDs to align with latest RPAs 91ffad9de SCF-814: Improvement to MX8DXL DDR3L DCD to align with latest RPA aca3a590c SCF-105: Update RN. 39265d065 SCF-105: Fix Linux version. 713ce8bad SCF-105: Add PLL lock test (via monitor debug pll command). 80a46a6a9 SCF-105: Update RN. 5f7d1210d SCF-105: Remove DXL B0. ef109d8da SCF-813 Optimize analog module power for SCFW-only images 1608e2399 SCF-797: Disable serious error on abort. ba4d4c636 SCF-105: Update RN. 16ff6930b SCF-812: Fix dox. 7fc276789 SCF-105: Add comment on monitor and timeouts. 05d9dcfe3 SCF-105: Support release state on legacy bamboo server. 063ba00a8 SCF-797: Update self-test command. ac5d184f6 SCF-789 Fix ON->STBY->LP transition issue e8d2f7c71 SCF-812: Add custom monitor command. d262c5d30 SCF-105: Fix 1.2/1.3 info issues. aa3f98ee1 SCF-105: Update dev guide. fbf073a83 SCF-105: Show not found if dir missing on yb2. 30287599f SCF-105: Fix perl errors. 5947065b6 SCF-105: Update RN. e82da9950 SCF-105: Add shlinux22 server to dashboard. 6e38157b5 SCF-797: Return status from FIPS degrade function. 16d9f4d5b SCF-797: Add API for V2X FIPS degrade. dea6dd9e3 SCF-105: Update dox on IPC timeout. 72b8444f0 SCF-797: Add FIPS API. 4fba28d38 SCF-105: Fix the make rule for rpc.d 3554608f4 SCF-105: Pull more commits. 13e13875b SCF-797: Fix issue with erorlog when SECO in abort. 8ce75cf11 SCF-797: SECO lockup treated as abort. 16f8b8717 SCF-797: MISRA fix. Allow errorlog while in abort. 9a06e9470 SCF-797: Changes to better support SECO abort. 14fde1b35 SCF-796: Move to SECO FW v0.8.5 for DXL B0. ef84c36c8 SCF-105: minor dash status update. cb2e0905a SCF-748: Ping detect V2X abort. 45de9746f SCF-796: Use V2X FW 0.1.4. 8e74fdf5e SCF-105: Pass parms to mkimage. Allows REV=b0. 9b94bf71a SCF-105: Add build to release status. 794dfca01 SCF-105: Add tag to release status dashboard. baf9157c3 SCF-105: Update cockpit dox. 6930f5d7e SCF-105: Add details to SC_PM_WAKE_SRC_SCU for early wake source handling da6da031c SCF-105: Update cockpit dox. d4cd5e9ed SCF-105: Update guide with cockpit info. 2f5cbe1e3 SCF-105: Update EULA to v34. 3a2bf330b SCF-105: Update fnc password. 49d86eea5 SCF-105: Add QXP C0 SIMU test. 7c7eb4a12 SCF-748: Add SIMU build for DXL B0 (and QXP C0). 64a26ad71 SCF-748: Add bamboo var to test DXL B0. 5a9356485 SCF-105: Initial bamboo variable file. 36517591d SCF-797: Fix FIPS command. MISRA fix. a0e2038d3 SCF-808: Add version test. 0ac47f262 SCF-105: Update release info. f5a1a76f3 SCF-797: Add support for 0.8.5 FIPS commands. 42ff9f85f SCF-105: Update monitor docs. 9c67844e9 SCF-105: Add info on FIPS feature removal. 2637361da SCF-105: REmove some i.MX85 docs. 4adf74c70 SCF-105: Update RN. 90e6060f8 SCF-105: Doc updates. ccc32dcad SCF-748: Fix V2X FIPS fuse word. Fix test_seco for FIPS mode. 2b6bd120a SCF-105: Add dash heading. c538e444e SCF-105: Update dash. 224fbfc60 SCF-105: Update RN. 928ca1151 SCF-794: Support SECO FW v3.8.5 and V2X FW v1.1.4. 1ff9c0767 SCF-805: Prevent V2X in LP mode. Causes serious error. Will also cause issue with DXL B0 freq detect. a94c6b9cc SCF-105: Update EULA to v33. 9a15e26c1 SCF-105: Update RN. d2a0105a9 SCF-748: Support DXL DL3. a3dbb627f SCF-804: Support DDR ECC for DXL SOC 9aa4fbbe7 SCF-748: Support extended industrial. 44ec06bc0 SCF-748: Support partial closed parts. 0d60d44e3 SCF-105: Update RN. f017c7f3a SCF-105: Update EULA to v32. dacb2c18f SCF-803: Eliminate duplicate call to start the SECO RNG. d3414df1f SCF-802: On partition free, move memory beofre resources. 573c24c30 SCF-801: Fix typo. 879a89a96 SCF-801: Support FlexSPI0/OCRAM use of IEE. 897ea4b74 SCF-105 Doxygen updates 4d1f50367 SCF-105: Dox updates. 1d56d29ce SCF-105: Move to cdc02 bitbucket. 5cd433eca SCF-105: Fix typo in dox. 41f52ecde SCF-60: MISRA fixes. 44c3562a5 SCF-60: MISRA issues. b18366b23 SCF-60: MISRA fixes. a392bfaf1 SCF-105: Disable proxy for coverity commit. cd1f252f6 SCF-105: Use url instead of hostname. dd89de276 SCF-105: Update misra config. cf55c2f23 SCF-105: Switch to 2021.03 Coverity. add15bd0f SCF-105: Disable HTTP proxy. f6bae5a88 SCF-105: Move to 2021 coverity reports app. c79fce8c2 SCF-748: Update monitor checksum label. fa3bb26a4 SCF-105: Add docs on V2X FW power and FW load. 91e45220d SCF-748 Fix flexspi boot issue when V2X is disabled. 1502ea0d5 SCF-799 Fix issue while enabling auto clocks c20df5c25 SCF-105: Fix dashboard issue. 65755879b SCF-748: Support DXL B0 versions. 926b5c5f1 SCF-748: Add monitor dumps of SECO/V2X patches and V2X FW address. 61d07dc3e SCF-748: Conditionalize workaround for ERR051079. 30540ee6a SCF-748: Support seco=0 option to disable comms to SECO/V2X. c90c0a40d SCF-105: Update dox on reset. e9d346806 SCF-748: Skip V2X FW copy for B0. 31ae9f6d4 SCF-800: Optimize LSIO power for V2X=NO. 1ff699e20 SCF-799 Optimize clock code 8f0233f68 SCF-105: Add default Linux for 2022 RC1. f378df07d SCF-105: Update EULA to v31. f3dda0c61 SCF-105: Update dashboard. e568f7063 SCF-105: Update RN. 01b7414e1 SCF-748: Update list of parts to include DXL B0. 787546672 SCF-105: Move to 2022 Q2. 76a1186df SCF-795: Fix issues with V2X clock and reset when V2X=NO. db64c25cc SCF-789: Fix MISRA issue. 5b323a8e5 SCF-105: Support RN with no details. Signed-off-by: Tom Hochstein (cherry picked from commit 34617272feefcf0998283cb6265f5f29b8d13e8e) --- .../imx-sc-firmware/imx-sc-firmware_1.12.1.bb | 41 ---------------------- .../imx-sc-firmware/imx-sc-firmware_1.13.0.bb | 41 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.12.1.bb create mode 100644 recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.13.0.bb diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.12.1.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.12.1.bb deleted file mode 100644 index 919a474e..00000000 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.12.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright (C) 2017-2021 NXP - -DESCRIPTION = "i.MX System Controller Firmware" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=be5ff43682ed6c57dfcbeb97651c2829" -SECTION = "BSP" - -inherit fsl-eula-unpack pkgconfig deploy - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "ebe1cd97369e08709594b72b065cea3d" -SRC_URI[sha256sum] = "5ab47143623003cbe151b39a5ffcb7ea0dd5587a776e040453884e9608634b0e" - -BOARD_TYPE ?= "mek" -SC_FIRMWARE_NAME ?= "INVALID" -SC_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8qxp-nxp-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8dx-nxp-bsp = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" - -symlink_name = "scfw_tcm.bin" - -BOOT_TOOLS = "imx-boot-tools" - -do_compile[noexec] = "1" - -do_install[noexec] = "1" - -do_deploy() { - install -Dm 0644 ${S}/${SC_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} - ln -sf ${SC_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${symlink_name} -} -addtask deploy after do_install - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.13.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.13.0.bb new file mode 100644 index 00000000..04d7a11b --- /dev/null +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.13.0.bb @@ -0,0 +1,41 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright (C) 2017-2021 NXP + +DESCRIPTION = "i.MX System Controller Firmware" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" +SECTION = "BSP" + +inherit fsl-eula-unpack pkgconfig deploy + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "49fc847391edd9b7aef482fcab4f556f" +SRC_URI[sha256sum] = "98da4fa8e119553f5d5defaecbcd3ee026fe27656ce19a93f912132ab07205dc" + +BOARD_TYPE ?= "mek" +SC_FIRMWARE_NAME ?= "INVALID" +SC_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8qxp-nxp-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8dx-nxp-bsp = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" + +symlink_name = "scfw_tcm.bin" + +BOOT_TOOLS = "imx-boot-tools" + +do_compile[noexec] = "1" + +do_install[noexec] = "1" + +do_deploy() { + install -Dm 0644 ${S}/${SC_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} + ln -sf ${SC_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${symlink_name} +} +addtask deploy after do_install + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From ff630134d8e5c0fae5e712f4e7d2e848d505b0bd Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 17 Aug 2022 11:56:42 -0500 Subject: imx-seco: Upgrade 3.8.5 -> 3.8.6 Fixes: b0fca0e i.MX8 DXL B0 SECO FW 3.8.6 V2X FW 1.1.5 42e1d58 i.MX8 DXL B0 SECO FW 0.8.5 V2X FW 0.1.4 Signed-off-by: Tom Hochstein (cherry picked from commit e89cd876bf942cdaa2e3ad5965e0f0f1fb909a83) --- recipes-bsp/imx-seco/imx-seco-libs_git.bb | 2 +- recipes-bsp/imx-seco/imx-seco_3.8.5.bb | 26 -------------------------- recipes-bsp/imx-seco/imx-seco_3.8.6.bb | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 recipes-bsp/imx-seco/imx-seco_3.8.5.bb create mode 100644 recipes-bsp/imx-seco/imx-seco_3.8.6.bb diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 2f59f214..35b46ca3 100644 --- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -1,7 +1,7 @@ # Copyright (C) 2019-2021 NXP SUMMARY = "NXP i.MX SECO library" -DESCRIPTION = "NXP i.MX Security Controller library" +DESCRIPTION = "Library for NXP i.MX Security Controller Subsystem" SECTION = "base" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://EULA.txt;md5=76871788f27c28af824e2ec1ca187832" diff --git a/recipes-bsp/imx-seco/imx-seco_3.8.5.bb b/recipes-bsp/imx-seco/imx-seco_3.8.5.bb deleted file mode 100644 index fbd72cd0..00000000 --- a/recipes-bsp/imx-seco/imx-seco_3.8.5.bb +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2019-2021 NXP - -SUMMARY = "NXP i.MX SECO firmware" -DESCRIPTION = "NXP i.MX Security Controller firmware" -SECTION = "base" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e4098ac4459cb81b07d3f0c22b3e8370" - -inherit fsl-eula-unpack use-imx-security-controller-firmware deploy - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "c1797407517b0499f6d5151c1e62e78f" -SRC_URI[sha256sum] = "b8731c626139c9bd1d530f243c2131c031a523f1428c6a40b017e5352b1da656" - -do_compile[noexec] = "1" - -do_install[noexec] = "1" - -addtask deploy after do_install -do_deploy () { - # Deploy i.MX8 SECO firmware files - install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} -} - -COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" diff --git a/recipes-bsp/imx-seco/imx-seco_3.8.6.bb b/recipes-bsp/imx-seco/imx-seco_3.8.6.bb new file mode 100644 index 00000000..bcc4dd3f --- /dev/null +++ b/recipes-bsp/imx-seco/imx-seco_3.8.6.bb @@ -0,0 +1,27 @@ +# Copyright (C) 2019-2022 NXP + +SUMMARY = "NXP i.MX SECO firmware" +DESCRIPTION = "Firmware for i.MX Security Controller Subsystem" +SECTION = "base" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=be5ff43682ed6c57dfcbeb97651c2829" + +inherit fsl-eula-unpack use-imx-security-controller-firmware deploy + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "2427a45069a89bb9b9b470642ce17f18" +SRC_URI[sha256sum] = "3bf3f4ae69f77fd8fe28a216f3927fb84e75461364ad332dd9b4605beadae59a" + + +do_compile[noexec] = "1" + +do_install[noexec] = "1" + +addtask deploy after do_install +do_deploy () { + # Deploy i.MX8 SECO firmware files + install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} +} + +COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 2a8c5624134e916aae3ba0c7cc18b5c507c4b56c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 17 Aug 2022 12:02:50 -0500 Subject: imx-vpu-hantro: Upgrade 1.26.0 -> 1.26.0 Fixes: 574ccc1 M865SW-952-3: [VPU/V4L2] decoder H264: report drop frames in ctrlsw c312783 M865SW-952-2: [VPU/V4L2] decoder H264: report drop frames in ctrlsw 7c49f12 M865SW-952: [VPU/V4L2] decoder H264: report drop frames in ctrlsw 43e4b11 M865SW-957: [VPU/V4L2] no time stamp reported for vp8 format 2ddd9fe LF-5631 [VPU/H1]: release encoder if try to start encode fail c3274bd M865SW-932 [VPU/H1]: export API to set chromaQpIndexOffset ccfe18a MA-20111 android12: deprecate DMA_BUF_IOCTL_PHYS 3f53902 M865SW-917-6 [VPU/G1] RV: notify client resolution change correctly 60eae86 M865SW-917-5 [VPU/G1] VP8: notify client resolution change correctly 40c4a0a M865SW-917-4 [VPU/G1] AVS: notify client resolution change correctly 4cee63d M865SW-917-3 [VPU/G1] VC1: notify client resolution change correctly 8266291 M865SW-917-2 [VPU/G1] MPEG4: notify client resolution change correctly 10d0dab M865SW-917-1 [VPU/G1] MPEG2: notify client resolution change correctly f6ee4e3 M865SW-915 [VPU/G1] H264: return H264DEC_PIC_CONSUMED if drop frame due to openB_flag f84e808 M865SW-888[VPU/G1] vp9: width align to 8 for DEC_OUT_FRM_RASTER_SCAN Signed-off-by: Tom Hochstein (cherry picked from commit cf30c22594126252feeff2bf830d58973b860840) --- .../imx-vpu-hantro/imx-vpu-hantro_1.25.0.bb | 36 ---------------------- .../imx-vpu-hantro/imx-vpu-hantro_1.26.0.bb | 36 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.25.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.26.0.bb diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.25.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.25.0.bb deleted file mode 100644 index f2381d43..00000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.25.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2017-2020 NXP - -DESCRIPTION = "i.MX Hantro VPU library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=be5ff43682ed6c57dfcbeb97651c2829" - -PROVIDES = "virtual/imxvpu" - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "6d84b9eecc2f6027f9dbe1c875a4e7b5" -SRC_URI[sha256sum] = "dd812b92b302bcfb92c10e937d9cad9224edf1593e9e4691d539ab4e190583f0" - -inherit fsl-eula-unpack use-imx-headers - -PARALLEL_MAKE="-j 1" - -PLATFORM:mx8mm-nxp-bsp = "IMX8MM" -PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" -PLATFORM:mx8mp-nxp-bsp = "IMX8MP" - -EXTRA_OEMAKE = " \ - CROSS_COMPILE="${HOST_PREFIX}" \ - SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ - PLATFORM="${PLATFORM}" \ -" - -do_install () { - oe_runmake install DEST_DIR="${D}" -} - -FILES:${PN} += "/unit_tests" - -RDEPENDS:${PN} += "imx-vpu-hantro-daemon" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.26.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.26.0.bb new file mode 100644 index 00000000..ac30b60f --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.26.0.bb @@ -0,0 +1,36 @@ +# Copyright (C) 2017-2020 NXP + +DESCRIPTION = "i.MX Hantro VPU library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" + +PROVIDES = "virtual/imxvpu" + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" +SRC_URI[md5sum] = "8d06cdacd7700e9e4c32644bf9804cdd" +SRC_URI[sha256sum] = "0cf9193923e110d2d9e6576e2c632f1675f0751b4c3de9ef54f32813f442540a" + +inherit fsl-eula-unpack use-imx-headers + +PARALLEL_MAKE="-j 1" + +PLATFORM:mx8mm-nxp-bsp = "IMX8MM" +PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" +PLATFORM:mx8mp-nxp-bsp = "IMX8MP" + +EXTRA_OEMAKE = " \ + CROSS_COMPILE="${HOST_PREFIX}" \ + SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ + PLATFORM="${PLATFORM}" \ +" + +do_install () { + oe_runmake install DEST_DIR="${D}" +} + +FILES:${PN} += "/unit_tests" + +RDEPENDS:${PN} += "imx-vpu-hantro-daemon" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 1bfd63c212f32a7d663ec8418f675bc8485871e9 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 17 Aug 2022 12:14:49 -0500 Subject: imx-vpu-hantro-daemon: Upgrade 1.1.2 -> 1.1.3 Fixes: 51e495b M865SW-952: [VPU/V4L2] decoder H264: report drop frames in ctrlsw de263f3 M865SW-958: [VPU/V4L2] no time stamp reported for mjpeg format 97b6fb2 Pull request #12: M865SW-964: [VPU/V4L2] NXP timestamp manager issue for rv format 1c7084b M865SW-964: [VPU/V4L2] NXP timestamp manager issue for rv format ce989aa M865SW-949-2:[VPU/V4L2] Update android makefile 8466d41 M865SW-949:[VPU/V4L2] decoder: implement timestamp mode of copy input buffer ts to correponding output dbada2f M865SW-942 [VPU/V4L2] decoder: use output buffer error flag and capture buffer sequence replace skip event ea2a8d3 M865SW-930 [VPU/V4L2] h1 encoder: set 'chroma_qp_offset' param 4ce2ff3 M865SW-919 [VPU/V4L2] decoder: unify use DEC_DECODING_ERROR_EVENT to present decode error 323a90c M865SW-933 [VPU/V4L2] decoder H264: Do not increase 'dec_pic_id' for 'H264DEC_FIELD_DECODED' event 947280e M865SW-919 [VPU/V4L2] decoder: drop coresponding timestamp if return DEC_BUF_EMPTY and consume all data 021c645 M865-903 [VPU/V4L2] encoder: update h26x_cmd.cpbSize check 69b12de M865SW-897 [VPU/V4L2] decoder: timestamp incorrect caused by consumed_len not be accumulated Signed-off-by: Tom Hochstein (cherry picked from commit 96187ebf51ed6f0ec7758c626df78433b31cc2d3) --- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.2.bb | 31 ---------------------- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.3.bb | 29 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.2.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.3.bb diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.2.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.2.bb deleted file mode 100644 index 25cd931e..00000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2021 NXP -DESCRIPTION = "i.MX Hantro V4L2 Daemon" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" - -DEPENDS = "imx-vpu-hantro" -DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" - -SRC_URI = " \ - ${FSL_MIRROR}/${BP}.tar.gz \ -" -SRC_URI[md5sum] = "f30942393a9093388adf91edb458f7a6" -SRC_URI[sha256sum] = "77e25ad1e1860f0a3983f07d6beb9a04ff32763bacf26db9aefd16559e6eea9b" - -PLATFORM:mx8mm-nxp-bsp = "IMX8MM" -PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" -PLATFORM:mx8mp-nxp-bsp = "IMX8MP" - -EXTRA_OEMAKE = " \ - CROSS_COMPILE="${HOST_PREFIX}" \ - SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ - CTRLSW_HDRPATH="${STAGING_INCDIR}" \ - PLATFORM="${PLATFORM}" \ -" - -do_install () { - oe_runmake install DEST_DIR="${D}" -} - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.3.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.3.bb new file mode 100644 index 00000000..30c31a2e --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.3.bb @@ -0,0 +1,29 @@ +# Copyright 2021 NXP +DESCRIPTION = "i.MX Hantro V4L2 Daemon" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" + +DEPENDS = "imx-vpu-hantro" +DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" + +SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz" +SRC_URI[md5sum] = "657af53a73fa9898ef7725dd26934079" +SRC_URI[sha256sum] = "75f857ddfc53341c425d6dac0e6eb9b5c0281b90b6f6de3ff1b64962d52399c5" + +PLATFORM:mx8mm-nxp-bsp = "IMX8MM" +PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" +PLATFORM:mx8mp-nxp-bsp = "IMX8MP" + +EXTRA_OEMAKE = " \ + CROSS_COMPILE="${HOST_PREFIX}" \ + SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ + CTRLSW_HDRPATH="${STAGING_INCDIR}" \ + PLATFORM="${PLATFORM}" \ +" + +do_install () { + oe_runmake install DEST_DIR="${D}" +} + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From aa9633d7490f813c90bc4725d4e862de783df778 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 17 Aug 2022 12:17:11 -0500 Subject: imx-vpu-hantro-vc: Upgrade 1.7.0 -> 1.8.0 Fixes: 7fb79ee [Android] Update library to latest commit 74119bc M865SW-945 [VPU/VC8000E] return error if client set 10-bit output encoding d56835b [Android] Update library to latest commit a515451 MA-20111 android12: deprecate DMA_BUF_IOCTL_PHYS Signed-off-by: Tom Hochstein (cherry picked from commit 9657edbc39c1f7cb0086c2f1b5c2d750199c089d) --- .../imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.7.0.bb | 36 ---------------------- .../imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.8.0.bb | 36 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.7.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.8.0.bb diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.7.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.7.0.bb deleted file mode 100644 index 96c0c589..00000000 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.7.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2019-2021 NXP - -DESCRIPTION = "i.MX VC8000E Encoder library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=be5ff43682ed6c57dfcbeb97651c2829" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "2dbcd9a71d53b86654704932798f263e" -SRC_URI[sha256sum] = "8af665f8e06e0e467f563e372f43583d94128f0d37f75321965bc26bd4404b2b" - -# SCR is the location and name of the Software Content Register file -# relative to ${D}${D_SUBDIR}. -SCR = "SCR.txt" - -do_install () { - install -d ${D}${D_SUBDIR} - cp -r ${S}/* ${D}${D_SUBDIR} - if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then - mv ${D}/usr/lib ${D}${libdir} - fi - rm ${D}${D_SUBDIR}/COPYING - if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then - bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\"" - fi - rm ${D}${D_SUBDIR}/${SCR} -} - -FILES:${PN} = "/" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.8.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.8.0.bb new file mode 100644 index 00000000..dc5a0e5c --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.8.0.bb @@ -0,0 +1,36 @@ +# Copyright (C) 2019-2021 NXP + +DESCRIPTION = "i.MX VC8000E Encoder library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" + +S = "${WORKDIR}/${BPN}-${PV}" + +SRC_URI[md5sum] = "228b06302ad0f0da13a160573c06bbf4" +SRC_URI[sha256sum] = "537fdbc20fbd1fb561b9a0d01ad843ea25c46e5a5cd184960fc9f1074674ddce" + +# SCR is the location and name of the Software Content Register file +# relative to ${D}${D_SUBDIR}. +SCR = "SCR.txt" + +do_install () { + install -d ${D}${D_SUBDIR} + cp -r ${S}/* ${D}${D_SUBDIR} + if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then + mv ${D}/usr/lib ${D}${libdir} + fi + rm ${D}${D_SUBDIR}/COPYING + if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then + bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\"" + fi + rm ${D}${D_SUBDIR}/${SCR} +} + +FILES:${PN} = "/" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 18b08de21316cdd9ecb2ebf9cd931e4bfc3b6071 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 17 Aug 2022 12:25:27 -0500 Subject: isp-imx: Upgrade 4.2.2.16.0 -> 4.2.2.18.0 - Drop the dependency on Python - Incorporate the patch 0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch (ca1cc9966) - Update to libtinyxml2 9 Fixes: ca1cc9966 LF-6283: Fix isp startup is incorrect for third-party boards f20917e56 LF-6262-2: Delete nodes in os08a20 4k xml files that lead android crash 44e4e5486 LF-6262-1: Fix the os08a20 4k work abnormally dfa4b6671 LF-5970: Add the support for sensor os08a20 in the i.mx865 b92bd279e LF-6200: isp: remove isp-imx includes 4 GPL files 5501b5a2e remove the mode 4 for basler camera b07f11f7c M865SW-978: media-server stop need sync 3fb6a58ff New partial build partial_release_20220408_4.2.2_p18 197077ee7 Update Release P18 from Verisilicon e116968e3 update the build script to include OS08A20 things ea5f3e9a3 update calibration XML file for OS08A20 0f8e04791 remove drm_test and isp_tpg_test from the isp build a7740c028 update the xml file name as basler updates Signed-off-by: Tom Hochstein (cherry picked from commit 76b1f6d21c4e7593ce848641a37d179d5f3d6979) --- ...isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch | 28 ------- recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb | 94 ---------------------- recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb | 88 ++++++++++++++++++++ recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb | 22 ----- 4 files changed, 88 insertions(+), 144 deletions(-) delete mode 100644 recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch delete mode 100644 recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb create mode 100644 recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb delete mode 100644 recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb diff --git a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch deleted file mode 100644 index bfea33a7..00000000 --- a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a48c605b9f3860ee7abaca1a37add444a1b4001a Mon Sep 17 00:00:00 2001 -From: Chris Dimich -Date: Tue, 8 Mar 2022 14:45:28 -0800 -Subject: [PATCH 1/1] start_isp.sh: fix NR_DEVICE_TREE_BASLER variable - -The NR_DEVICE_TREE_BASLER variable has the wrong path. - -Signed-off-by: Chris Dimich ---- - imx/start_isp.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/imx/start_isp.sh b/imx/start_isp.sh -index 6daabc59c..8a07acfed 100755 ---- a/imx/start_isp.sh -+++ b/imx/start_isp.sh -@@ -7,7 +7,7 @@ - # - - RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" --NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null) -+NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam `find /sys/firmware/devicetree/base/soc@0/ -name compatible | grep i2c` -l | wc -l 2> /dev/null) - NR_DEVICE_TREE_OV5640=$(grep ov5640 /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null) - - # check if the basler device has been enabled in the device tree --- -2.31.1 - diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb deleted file mode 100644 index 2d99496e..00000000 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 2020-2021 NXP - -DESCRIPTION = "i.MX Verisilicon Software ISP" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" -DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2-8" - -SRC_URI = " \ - ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ - file://0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch \ -" - -SRC_URI[md5sum] = "f490153dbec234a04416ad41834806b2" -SRC_URI[sha256sum] = "83b24b9d1f7a40a506a45a1c5c2ef2ca2313fe9b23fde591e3b7dce77ea359ca" - -inherit fsl-eula-unpack cmake systemd use-imx-headers - -# Build the sub-folder appshell -OECMAKE_SOURCEPATH = "${S}/appshell" - -# Use make instead of ninja -OECMAKE_GENERATOR = "Unix Makefiles" - -# Workaround for linking issues seen with gold linker -LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -SYSTEMD_SERVICE:${PN} = "imx8-isp.service" - -EXTRA_OECMAKE += " \ - -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \ - -DCMAKE_BUILD_TYPE=release \ - -DISP_VERSION=ISP8000NANO_V1802 \ - -DPLATFORM=ARM64 \ - -DAPPMODE=V4L2 \ - -DQTLESS=1 \ - -DFULL_SRC_COMPILE=1 \ - -DWITH_DRM=1 \ - -DWITH_DWE=1 \ - -DSERVER_LESS=1 \ - -DSUBDEV_V4L2=1 \ - -DENABLE_IRQ=1 \ - -DPARTITION_BUILD=0 \ - -D3A_SRC_BUILD=0 \ - -DIMX_G2D=ON \ - -Wno-dev \ -" - -do_configure:prepend() { - export SDKTARGETSYSROOT=${STAGING_DIR_HOST} -} - -do_compile:prepend() { - ln -sf ${RECIPE_SYSROOT}/${libdir}/libtinyxml2.so.?.?.? ${RECIPE_SYSROOT}/${libdir}/libtinyxml2.so -} - -do_install() { - install -d ${D}/${libdir} - install -d ${D}/${includedir} - install -d ${D}/opt/imx8-isp/bin - - cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin - cp -r ${B}/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin - cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin - cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin - cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} - cp -r ${B}/generated/release/include/* ${D}/${includedir} - - cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin - cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin - - chmod +x ${D}/opt/imx8-isp/bin/run.sh - chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir} - fi -} - -# The build contains a mix of versioned and unversioned libraries, so -# the default packaging configuration needs some modifications -FILES_SOLIBSDEV = "" -FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" -FILES:${PN}-dev += " \ - ${libdir}/libjsoncpp.so \ - ${libdir}/libos08a20.so \ - ${libdir}/libov2775.so \ -" - -INSANE_SKIP:${PN} = "rpaths" - -RDEPENDS:${PN} = "libdrm libpython3" - -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb new file mode 100644 index 00000000..177caa14 --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb @@ -0,0 +1,88 @@ +# Copyright 2020-2022 NXP + +DESCRIPTION = "i.MX Verisilicon Software ISP" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" +DEPENDS = "libdrm virtual/libg2d libtinyxml2" + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" +SRC_URI[md5sum] = "a20171db4bf2be423a587f3b610f0a69" +SRC_URI[sha256sum] = "468ae51223d1873a1a756a1e64a53c0c61ebd640b3810f3a9e912b6a0de6c3c8" + +inherit fsl-eula-unpack cmake systemd use-imx-headers + +# Build the sub-folder appshell +OECMAKE_SOURCEPATH = "${S}/appshell" + +# Use make instead of ninja +OECMAKE_GENERATOR = "Unix Makefiles" + +# Workaround for linking issues seen with gold linker +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +SYSTEMD_SERVICE:${PN} = "imx8-isp.service" + +EXTRA_OECMAKE += " \ + -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \ + -DCMAKE_BUILD_TYPE=release \ + -DISP_VERSION=ISP8000NANO_V1802 \ + -DPLATFORM=ARM64 \ + -DAPPMODE=V4L2 \ + -DQTLESS=1 \ + -DFULL_SRC_COMPILE=1 \ + -DWITH_DRM=1 \ + -DWITH_DWE=1 \ + -DSERVER_LESS=1 \ + -DSUBDEV_V4L2=1 \ + -DENABLE_IRQ=1 \ + -DPARTITION_BUILD=0 \ + -D3A_SRC_BUILD=0 \ + -DIMX_G2D=ON \ + -Wno-dev \ +" + +do_install() { + install -d ${D}/${libdir} + install -d ${D}/${includedir} + install -d ${D}/opt/imx8-isp/bin + + cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} + cp -r ${B}/generated/release/include/* ${D}/${includedir} + + cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin + cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin + + chmod +x ${D}/opt/imx8-isp/bin/run.sh + chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir} + fi +} + +# The build contains a mix of versioned and unversioned libraries, so +# the default packaging configuration needs some modification so that +# unversioned .so libraries go to the main package and versioned .so +# symlinks go to -dev. +FILES_SOLIBSDEV = "" +FILES_SOLIBS_VERSIONED = " \ + ${libdir}/libar1335.so \ + ${libdir}/libjsoncpp.so \ + ${libdir}/libos08a20.so \ + ${libdir}/libov2775.so \ +" +FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" +FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}" + +INSANE_SKIP:${PN} = "rpaths" + +RDEPENDS:${PN} = "libdrm" + +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb b/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb deleted file mode 100644 index 07d52355..00000000 --- a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" -HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" - -SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https" - -SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb" - -S = "${WORKDIR}/git" - -inherit cmake - -# make sure we don't provide files which are also present in the -# current libtinyxml2 version's -dev package. -do_install:append() { - rm -rf ${D}/${includedir} - rm -rf ${D}/${libdir}/cmake - rm -rf ${D}/${libdir}/libtinyxml2.so - rm -rf ${D}/${libdir}/pkgconfig -} -- cgit v1.2.3-54-g00ecf From 1f76bddcc9fdbb00b3293caac917a5ca85fe437b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 17 Aug 2022 13:00:07 -0500 Subject: basler-camera: Upgrade 4.2.2.16.0 -> 4.2.2.18.0 Includes a missing runtime dependency on isp-imx. Fixes: 724d343 MA-19817 On Android, align isp-4.2.2p16 with Linux 9445d63 Update Release from Basler p18 v5.1.0 based on VSI p18 999478f Update Release from Basler P17 v5.0.2 based on VSI P17 temp e3dc9c5 modify the README.TXT 9f29687 Update Release from Basler P17 temp based on VSI P17 temp Signed-off-by: Tom Hochstein (cherry picked from commit fa714a93f00351c20cc0d70e8108a0fead1bf5de) --- recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb | 27 ------------------------ recipes-bsp/isp-imx/basler-camera_4.2.2.18.0.bb | 28 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb create mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.18.0.bb diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb deleted file mode 100644 index 5b53068c..00000000 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2020-2021 NXP - -DESCRIPTION = "Basler camera binary drivers" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "489763169857773bade28611e649172e" -SRC_URI[sha256sum] = "3d4ae594659a697eef7479ca2480cc53f1d460f22bcc1c58104cff63bc6705fe" - -do_install() { - dest_dir=${D}/opt/imx8-isp/bin - install -d ${D}/${libdir} - install -d $dest_dir - cp -r ${S}/opt/imx8-isp/bin/* $dest_dir - cp -r ${S}/usr/lib/* ${D}/${libdir} -} - -SYSTEMD_AUTO_ENABLE = "enable" - -FILES:${PN} = "${libdir} /opt" -INSANE_SKIP:${PN} = "file-rdeps already-stripped" - -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.18.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.18.0.bb new file mode 100644 index 00000000..41e59fc9 --- /dev/null +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.18.0.bb @@ -0,0 +1,28 @@ +# Copyright 2020-2022 NXP + +DESCRIPTION = "Basler camera binary drivers" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "4bc72b07f608cbe13d318a63adb8f9dc" +SRC_URI[sha256sum] = "62393bcc11b6e8bb9918a29240fb57057870ec0cefff00042ee65d8a1fde081a" + +do_install() { + dest_dir=${D}/opt/imx8-isp/bin + install -d ${D}/${libdir} + install -d $dest_dir + cp -r ${S}/opt/imx8-isp/bin/* $dest_dir + cp -r ${S}/usr/lib/* ${D}/${libdir} +} + +SYSTEMD_AUTO_ENABLE = "enable" + +FILES:${PN} = "${libdir} /opt" +INSANE_SKIP:${PN} = "already-stripped" +RDEPENDS:${PN} += "isp-imx" + +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf