From 18ce6e9ce5930780c57da0d0760060ef485008cf Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 12 Jan 2022 10:56:17 -0600 Subject: firmware-imx: Upgrade to 8.14 New firmware binaries are available from NXP as a part of 5.10.72-2.2.0 release. Signed-off-by: Tom Hochstein --- recipes-bsp/firmware-imx/firmware-imx-8.13.inc | 17 --- recipes-bsp/firmware-imx/firmware-imx-8.14.inc | 17 +++ recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb | 23 ---- recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb | 23 ++++ recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb | 24 ----- recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb | 24 +++++ recipes-bsp/firmware-imx/firmware-imx_8.13.bb | 129 ----------------------- recipes-bsp/firmware-imx/firmware-imx_8.14.bb | 129 +++++++++++++++++++++++ 8 files changed, 193 insertions(+), 193 deletions(-) delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8.13.inc create mode 100644 recipes-bsp/firmware-imx/firmware-imx-8.14.inc delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb create mode 100644 recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb create mode 100644 recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb delete mode 100644 recipes-bsp/firmware-imx/firmware-imx_8.13.bb create mode 100644 recipes-bsp/firmware-imx/firmware-imx_8.14.bb diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.13.inc b/recipes-bsp/firmware-imx/firmware-imx-8.13.inc deleted file mode 100644 index ff739c4c..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx-8.13.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=e565271ec9a80ce47abbddc4bffe56fa" - -SRC_URI = " \ - ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ -" - -SRC_URI[md5sum] = "97eb12ba899bc29a5375993889708bfb" -SRC_URI[sha256sum] = "8b7aa9b41a0389e5f40bdf91cb1224f79ea4c2e7fc36292f27ad4bef7044d7f0" - -S = "${WORKDIR}/firmware-imx-${PV}" - -inherit fsl-eula-unpack diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.14.inc b/recipes-bsp/firmware-imx/firmware-imx-8.14.inc new file mode 100644 index 00000000..5af24283 --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx-8.14.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=03bcadc8dc0a788f66ca9e2b89f56c6f" + +SRC_URI = " \ + ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ +" + +SRC_URI[md5sum] = "3357c84e48fdc220984a9642d1e808f6" +SRC_URI[sha256sum] = "bfe9c57857e8442e7eb26ba3e1020733b09a7c9b83952ad4822980546c58a7f4" + +S = "${WORKDIR}/firmware-imx-${PV}" + +inherit fsl-eula-unpack diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb deleted file mode 100644 index 6ea16d5b..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.13.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)" -COMPATIBLE_MACHINE:mx8m = "(^$)" -COMPATIBLE_MACHINE:mx8x = "(^$)" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb new file mode 100644 index 00000000..6ea16d5b --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.14.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)" +COMPATIBLE_MACHINE:mx8m = "(^$)" +COMPATIBLE_MACHINE:mx8x = "(^$)" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb deleted file mode 100644 index a48356ed..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.13.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|imx-boot-container)" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb new file mode 100644 index 00000000..a48356ed --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.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|imx-boot-container)" diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.13.bb b/recipes-bsp/firmware-imx/firmware-imx_8.13.bb deleted file mode 100644 index 68539a61..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx_8.13.bb +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright (C) 2017-2020 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 -d ${D}${nonarch_base_libdir}/firmware/imx/hdmi - install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi - install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi - install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi - - # 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() { - 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]', - 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/imx/hdmi/" - -COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.14.bb b/recipes-bsp/firmware-imx/firmware-imx_8.14.bb new file mode 100644 index 00000000..68539a61 --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-imx_8.14.bb @@ -0,0 +1,129 @@ +# Copyright (C) 2012-2016 Freescale Semiconductor +# Copyright (C) 2017-2020 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 -d ${D}${nonarch_base_libdir}/firmware/imx/hdmi + install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi + install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi + install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi + + # 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() { + 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]', + 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/imx/hdmi/" + +COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" -- cgit v1.2.3-54-g00ecf From cd8925e84e36ee9c62a72b7d70e7f2c5c6b9f11a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 12 Jan 2022 10:58:28 -0600 Subject: firmware-imx: Install HDMI firmware to standard location The HDMI firmware is expected to be loaded by firmwared, but it is not found in the rootfs as shown in systemctl status firmwared: ``` Mar 24 10:25:21 imx8qmmek firmwared[571]: firmware 'hdmitxfw.bin' not found Mar 24 10:25:21 imx8qmmek firmwared[571]: cancel firmware load hdmitxfw.bin ``` Move the firmware from the sub-folder /lib/firmware/imx/hdmi to the standard location /lib/firmware. Signed-off-by: Tom Hochstein --- recipes-bsp/firmware-imx/firmware-imx_8.14.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.14.bb b/recipes-bsp/firmware-imx/firmware-imx_8.14.bb index 68539a61..5628e40b 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.14.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.14.bb @@ -1,5 +1,5 @@ # Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright (C) 2017-2020 NXP +# 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" @@ -43,10 +43,9 @@ do_install() { # 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 -d ${D}${nonarch_base_libdir}/firmware/imx/hdmi - install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi - install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi - install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi + 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: @@ -124,6 +123,10 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi" FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" -FILES:${PN}-hdmi = "${nonarch_base_libdir}/firmware/imx/hdmi/" +FILES:${PN}-hdmi = " \ + ${nonarch_base_libdir}/firmware/hdmitxfw.bin \ + ${nonarch_base_libdir}/firmware/hdmirxfw.bin \ + ${nonarch_base_libdir}/firmware/dpfw.bin \ +" COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" -- cgit v1.2.3-54-g00ecf From 8e14a624fdc8f2b9862c630e05724cfa4500894e Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 13 Jan 2022 12:23:31 -0600 Subject: imx-atf: Upgrade to NXP release 5.10.72-2.2.0 5782363f9 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 7da12d7b1 Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 7db434609 LF-4794 plat: imx8ulp: move OPTEE OS base address to 0xa6000000 0767d16d7 caam: refine code to avoid hang issue for some of toolchain 80f871a4c Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 0a0a737d5 LF-4872 plat: imx8ulp: enable -fno-strict-aliasing b047a7949 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 aeb0eb34d Pull request #40: LF-4660: fix erratum A-009810 a25562ecb Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 e5562d954 plat: ls1088a ls2088a: fix erratum A-009810 d72f464c2 nxp: soc-lx2160: drop erratum A-009810 68a45ce8c plat/nxp/ls1043a: remove confused header file 228c9787f LF-4810 plat: imx8ulp: Fix the tpm5 register restore b185cbae5 Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 2ca00f66a LF-4801 plat: imx8ulp: Enable AFBB by default for APD side active mode 2d8ad1477 Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 617b3ad72 Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 824f660d6 LF-4723-03 plat: imx8ulp: Add system power off support 37f2cbb7c LF-4723-02 plat: imx8ulp: Add APD power down mode(PD) support in system suspend 01901e590 LF-4723-01 plat: imx: Enable 512KB cache after resume on imx8ulp 635780cbb plat: imx8ulp: upower: Fix build by initializing srvgrp and function a05aa7bc7 plat: imx8ulp: upower: Fix build by initializing srvgrp and function 14a860c13 LF-4715-4 imx8ulp: add scmi_sensor support e364ecb82 LF-4715-3 imx8ulp: upower: add read temperature hal function a0e14034a LF-4715-2 imx8ulp: update upower api 504d8b91b LF-4715-1 drivers: scmi-msg: add sensor support a69b7763f Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 f71a2041f Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 2e36dd9be plat: imx8ulp: upower: Fix build by initializing srvgrp and function ded2cd343 LF-4593 plat: imx8ulp: Set cpu reset vector base to rom entry 2f4fa6908 Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 3dcf2c050 Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 a80529a5d LF-4615 plat: imx: Update the license for upower api Signed-off-by: Tom Hochstein --- recipes-bsp/imx-atf/imx-atf_2.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/imx-atf/imx-atf_2.4.bb b/recipes-bsp/imx-atf/imx-atf_2.4.bb index ce30822e..afb31698 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.4.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.4.bb @@ -10,7 +10,7 @@ PV .= "+git${SRCPV}" SRCBRANCH = "lf_v2.4" SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ " -SRCREV = "bb4957067d4b96a6ee197a333425948e409e990d" +SRCREV = "5782363f92a2fdf926784449270433cf3ddf44bd" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 16f2894dc267ab515a0b441f2d5ad0695a2c9f07 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 13 Jan 2022 12:33:35 -0600 Subject: imx-mkimage: Update to 5.10.72-2.2.0 Includes update to patch 0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch which is partially applied by 1527fb9. Fixes in update: --- 7a277c8 LF-4794 iMX8ULP: move OPTEE OS base address to 0xa6000000 9a04474 Update iMX8DXL clean target to remove intermediate files dfe6265 Fix build warning c78d727 Fix iMX8DXL ahab container image extraction 9bd94cc LF-4522 Parse and extract the u-boot-atf container 6cf67ed iMX8QM/QX/DXL/ULP: Add core id to -data option 1527fb9 iMX8M: fix FIT DT node unit address cbf03b6 Fix issue with C0 versus B0 nightly pull for VAL. 7f98709 iMX8M: soc: fix support to override u-boot DTB file name c9cce4f iMX8ULP: support xip for m33 and add README ---- Signed-off-by: Tom Hochstein --- ...age_fit_atf-fix-fit-generator-node-naming.patch | 135 ++------------------- recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 4 +- 2 files changed, 14 insertions(+), 125 deletions(-) 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 index 3c2842af..5a4a895b 100644 --- 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 @@ -1,19 +1,10 @@ -From 9cf936493388897379f33b511ec869c6fa5409ce Mon Sep 17 00:00:00 2001 +From f281b935985f1b592534ee2837ce0d0b28c7dc43 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin -Date: Thu, 22 Apr 2021 12:20:28 +0000 +Date: Tue, 11 Jan 2022 15:32:05 -0600 Subject: [PATCH] mkimage_fit_atf: fix fit generator node naming -Since upstream commit 79af75f777 ("fit: Don't allow verification of images -with @ nodes") [1], unit addresses on the nodes are prohibited and nodes -that do contain those addresses are ignored during the ITS parsing. This -is done in an effort to cover the CVE-2021-27138, where nodes with unit -addresses can be mis-interpreted by libfdt. - -Correct FIT generator script and replace nodes with unit addresses to -plain node names with "-" instead of "@" to create a unique naming. - -In addition, extend sections which contains "firmware" in their types -with "os" parameter to conform to the latest FIT specification. +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. @@ -23,40 +14,13 @@ Link: [1] https://github.com/u-boot/u-boot/commit/79af75f7776fc20b0d7eb6afe1e27c Signed-off-by: Andrey Zhizhikin Cc: Tom Hochstein --- - iMX8M/mkimage_fit_atf.sh | 40 ++++++++++++++++++++++------------------ - 1 file changed, 22 insertions(+), 18 deletions(-) + 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 95749b1..10903ea 100755 +index 4f2b3f3..10903ea 100755 --- a/iMX8M/mkimage_fit_atf.sh +++ b/iMX8M/mkimage_fit_atf.sh -@@ -23,7 +23,7 @@ else - fi - - BL32="tee.bin" --LOADABLES="\"atf@1\"" -+LOADABLES="\"atf-1\"" - - if [ ! -f $BL32 ]; then - BL32=/dev/null -@@ -31,7 +31,7 @@ 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 -- LOADABLES="$LOADABLES, \"tee@1\"" -+ LOADABLES="$LOADABLES, \"tee-1\"" - fi - - BL33="u-boot-nodtb.bin" -@@ -41,7 +41,7 @@ if [ ! -f $DEK_BLOB ]; then - DEK_BLOB=/dev/null - else - echo "Building with encrypted boot support, make sure to replace DEK Blob in final image." >&2 -- LOADABLES="\"dek_blob@1\", $LOADABLES" -+ LOADABLES="\"dek_blob-1\", $LOADABLES" - fi - - if [ ! -f $BL33 ]; then @@ -64,10 +64,12 @@ cat << __HEADER_EOF / { @@ -64,103 +28,28 @@ index 95749b1..10903ea 100755 + #address-cells = <1>; images { -- uboot@1 { -+ uboot-1 { + uboot-1 { description = "U-Boot (64-bit)"; + os = "u-boot"; data = /incbin/("$BL33"); type = "standalone"; arch = "arm64"; -@@ -80,7 +82,7 @@ cnt=1 - for dtname in $* - do - cat << __FDT_IMAGE_EOF -- fdt@$cnt { -+ fdt-$cnt { - description = "$(basename $dtname .dtb)"; - data = /incbin/("$dtname"); - type = "flat_dt"; -@@ -91,8 +93,9 @@ cnt=$((cnt+1)) - done - +@@ -93,6 +95,7 @@ done cat << __HEADER_EOF -- atf@1 { -+ atf-1 { + atf-1 { description = "ARM Trusted Firmware"; + os = "arm-trusted-firmware"; data = /incbin/("$BL31"); type = "firmware"; arch = "arm64"; -@@ -104,8 +107,9 @@ __HEADER_EOF - - if [ -f $BL32 ]; then +@@ -106,6 +109,7 @@ if [ -f $BL32 ]; then cat << __HEADER_EOF -- tee@1 { -+ tee-1 { + tee-1 { description = "TEE firmware"; + os = "op-tee-firmware"; data = /incbin/("$BL32"); type = "firmware"; arch = "arm64"; -@@ -118,7 +122,7 @@ fi - - if [ -f $DEK_BLOB ]; then - cat << __HEADER_EOF -- dek_blob@1 { -+ dek_blob-1 { - description = "dek_blob"; - data = /incbin/("$DEK_BLOB"); - type = "script"; -@@ -131,7 +135,7 @@ fi - cat << __CONF_HEADER_EOF - }; - configurations { -- default = "config@1"; -+ default = "config-1"; - - __CONF_HEADER_EOF - -@@ -141,31 +145,31 @@ do - if [ -f $BL32 ]; then - if [ $ROLLBACK_INDEX_IN_FIT ]; then - cat << __CONF_SECTION_EOF -- config@$cnt { -+ config-$cnt { - description = "$(basename $dtname .dtb)"; -- firmware = "uboot@1"; -+ firmware = "uboot-1"; - loadables = $LOADABLES; -- fdt = "fdt@$cnt"; -+ fdt = "fdt-$cnt"; - rbindex = "$ROLLBACK_INDEX_IN_FIT"; - }; - __CONF_SECTION_EOF - else - cat << __CONF_SECTION_EOF -- config@$cnt { -+ config-$cnt { - description = "$(basename $dtname .dtb)"; -- firmware = "uboot@1"; -+ firmware = "uboot-1"; - loadables = $LOADABLES; -- fdt = "fdt@$cnt"; -+ fdt = "fdt-$cnt"; - }; - __CONF_SECTION_EOF - fi - else - cat << __CONF_SECTION1_EOF -- config@$cnt { -+ config-$cnt { - description = "$(basename $dtname .dtb)"; -- firmware = "uboot@1"; -+ firmware = "uboot-1"; - loadables = $LOADABLES; -- fdt = "fdt@$cnt"; -+ fdt = "fdt-$cnt"; - }; - __CONF_SECTION1_EOF - fi -- 2.17.1 diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index c51c1e08..b4d32a54 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -2,12 +2,12 @@ DEPENDS = "zlib-native openssl-native" -SRCBRANCH = "lf-5.10.52_2.1.0" +SRCBRANCH = "lf-5.10.72_2.2.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 \ " -SRCREV = "1112c88470f339dc631e2a7117087f416af6d6b5" +SRCREV = "7a277c8a1a21ff921d217889dde6a9f84e6d2168" S = "${WORKDIR}/git" BOOT_TOOLS = "imx-boot-tools" -- cgit v1.2.3-54-g00ecf From 1f270dc776dc70856d645da5cdf1096edf2f369e Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 13 Jan 2022 17:53:11 -0600 Subject: u-boot-imx*: Update to 5.10.72-2.2.0 Fixes: ---- 263b27e076 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 fca2f7effd LFU-260: Move OS authentication to separate file 7c4108c79d LFU-260: Add 8ULP secure boot documentation e74e2b3266 LFU-260: Update AHAB introduction with 8ulp 8638693fac Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 300e945534 LFU-263-2 i2c: mxc_i2c: fix i2c recovery issue bf68761d1b LFU-263-1 gpio: add a marco to mask gpio input and output bits c44cb5c20a Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 54654fe63a SSI-118 crypto/fsl: Enable U-boot Command to expose CAAM RNG 3a24267a67 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 ee461bc762 LF-4842-3 imx8ulp: Configure the Watchdog to 32bits command mode 1097b2d662 LF-4842-2 imx: ulp: Fix issue in checking WDOG UNLOCK flag c0f4209640 LF-4842-1 ulp_wdog: Update ulp wdog driver for 32bits command 5604b38bf7 LFU-262 misc: imx8ulp: Add OEM SRK Hash fuse support 00602e19f4 LFU-261 imx8ulp: Set COUNTER_FREQUENCY to 1Mhz cf7217b58c Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 d4acb9e05f MA-19692 Load the avb footer from storage 5421f32712 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 8816d0a532 MA-19663 Configure boot security patch level af0b460ed1 LF-4826 imx8ulp: enable MU0_B clk by default 644b74776d Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 aa83e61757 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 47da90b0b4 LFU-257 tcpc: mask fault status interrupt 83c2ac165d Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 f438a41c53 LFU-255 Fix coverity issue: 17949208 Lossy integer to pointer d50d975e9c Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 2e54fedc14 LFU-256 imx8ulp: cgc: Switch to NICLPAV to FRO192 before PLL4 init 4de62a7f5d LF-4677-4 spi: nxp_fspi: enable octal dtr support and fix odd address issue 19cc4ce35b LF-4677-3 dts: imx8dxl: set tx/rx line and slave line delay 86cd141d73 LF-4677-2 configs: imx8dxl: enable mt35xu512aba octal dtr support 6e84dbbcd3 LF-4677-1 mtd: spi-nor-core: some fixes for the mt35xu512aba chip b49a4a2520 mtd: spi-nor-core: Allow using Micron mt35xu512aba in Octal DTR mode c7bcd9bd5d mtd: spi-nor-core: Add support for Cypress Semper flash 72bbb5c1ec mtd: spi-nor-core: Add non-uniform erase for Spansion/Cypress 5161305dba mtd: spi-nor-core: allow truncated erases a3bd5abf1f mtd: spi-nor-core: Perform a Soft Reset on boot d1e8045c7f mtd: spi-nor-core: Perform a Soft Reset on shutdown 982221a18c mtd: spi-nor-core: Detect Soft Reset sequence support from BFPT 30a8d4329c mtd: spi-nor-core: Do not make invalid quad enable fatal 6a36762098 mtd: spi-nor-core: Enable octal DTR mode when possible ac38926ca8 mtd: spi-nor-core: Prepare Read SR and FSR for Octal DTR mode 17090cab74 mtd: spi-nor-core: Parse xSPI Profile 1.0 table 817c535f11 mtd: spi-nor-core: Get command opcode extension type from BFPT 63fed9cce4 mtd: spi-nor-core: prepare BFPT parsing for JESD216 rev D bcc2c51e72 mtd: spi-nor-core: Add support for DTR protocol 6778b8eb18 mtd: spi-nor-core: Do not set data direction when there is no data 87eedf171e mtd: spi-nor-core: Rework hwcaps selection be9e93d93b mtd: spi-nor-core: Introduce flash-specific fixup hooks ae20033bb4 mtd: spi-nor-core: Move SFDP related declarations to top 3d81385d8c mtd: spi-nor-core: Add a ->setup() hook 0bf516c92d mtd: spi-nor-core: Fix address width on flash chips > 16MB 44afb32ba2 spi: cadence-qspi: Add support for octal DTR flashes ba34935aec spi: cadence-qspi: Add a small delay before indirect writes e67dde63fe spi: cadence-qspi: Do not calibrate when device tree sets read delay c547fd2f42 spi: spi-mem: add spi_mem_dtr_supports_op() 007587896a spi: spi-mem: export spi_mem_default_supports_op() f84891cf89 spi: spi-mem: allow specifying a command's extension 68ca48eb32 spi: spi-mem: allow specifying whether an op is DTR or not 827fe11231 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 030b02d3fd LFU-119 imx8qm/qxp: Fix Unchecked return value 7c17b7c44c Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 2808f71620 LFU-253 video: sec_mipi_dsim: Fix Division or modulo by zero c58f545d85 LFU-254 DTS: imx8mm-evk: Enable I2C1 bus 34710728a8 imx8ulp: add ND/LD clock 7e64f98814 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 9890eb42c6 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 2f2a5a1e2e LFU-251 doc: imx: habv4: Add clarification and updates to HABv4 documentation 76df1d9421 LFU-252 imx8ulp: upower: Enable AFBB for AP domain 2aeeba3613 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 c184579f00 LF-4785-2 imx8ulp: clock: Handle the DDRLOCKED when setting DDR clock 30598b0b69 LF-4785-1 ddr: imx8ulp: Fix DDR frequency request issue 822a21a7e0 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 b4f4659fc2 LF-4724 ddr: saving the dram config timing data into sram on imx8ulp fbf4af9cfb Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 6c3e72953b LFU-250 thermal: imx_pmc_temperature: Fix build warning 0f0034ba49 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 10c3b9375d MA-19553 Guard mppubk extraction function 6c88119259 Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 67e6ee87f8 drivers: ddr: lc_common_dimm_params.c : Fix Divison by zero issue 74223109f9 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 d4cbd6962e LFU-249 imx8mm_evk: Enable USB ethernet support 4fc71a7d4f LFU-248 imx8ulp_evk: Update LPDDR4 PHY settings eb07ea8fbf Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 84b60666a3 board: freescale: lx2160a: fix out of bounds write 6e5264a01d drivers: net: phy: in112525: fix out of bounds write 76dbd11910 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 9f08e16a29 MA-19357 imx8mq: enhance security for android a9bbf7a158 MA-19440 Support boot header v4 1b38984122 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 72c4fff475 LFU-242-2 imx8ulp_evk: fix build warning e82827e401 LFU-242-1 imx8ulp_evk: reset lsm6dsx when uboots boots 6c73e3fee5 LFU-239-4 arm: dts: imx8ulp: add the I3C bus support 7b4f9c1d70 LFU-239-3 imx8ulp_evk_i3c: Add I3C controller support b986805e72 LFU-239-2 imx8ulp: clock: Add clock support for i3c controller beb31e82d7 LFU-239-1 i2c: imx-i3c: add i3c bus support in i2c subsystem a2ca81dc77 LFU-247-2 video: sec_dsim: Update DPHY PLL PMS and DPHY timing settings 2560cd096e LFU-247-1 imx8m: clock: Add function to get DSI PHY reference clock rate 66f8932af0 LFU-246 fastboot: Update fastboot emmc boot part size 396a703614 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 41ca41efcd LFU-238-5 configs: imx8ulp: Enable pmc temperature senor e86825980e LFU-238-4 arm: imx8ulp: implement to obtain the SoC current temperature 07743019ad LFU-238-3 arm: dts: add the PMC node and the ADC1 node 1551d5ac1f LFU-238-2 imx8ulp: measure die temperature using PMC Temperature Sensor c22d6cf6b4 LFU-238-1 imx8ulp: clock: Support to enable/disable the ADC1 clock 8de08ed09c LFU-244 imx8mp: Add SC part (iMX8MP UltraLite) support 8af330f822 LFU-245 imx8ulp: upower: Fix license issue a26f622273 Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 695462db67 board: fsl_validate: Fix Double free Issue 1d6ea40388 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 5569a50da6 LF-4589 crypto/fsl: i.MX8ULP: Fix kick_trng for i.MX8ULP cd3879da56 Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 bca2fff552 pci: layerscape: Fix the LUT and msi-map mismatch issue 1c0116f3da Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 48f7b4ced9 efi_loader: Improve the parameter check for QueryVariableInfo() 4bd16004ba Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 6a18094114 lx2162a : Rename emmc boot command variable ab74b13c41 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 b1f567e7d1 LFU-237-2 imx8ulp: Update ethernet mac to get from fuse 4f425dbb74 LFU-237-1 fuse: imx8ulp: Fix wrong words of bank 5 and 6 b1e985c641 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 4d34e68a4b LFU-236-2 imx: Fix build error and warning in mfgprot 54687c4b42 LFU-236-1 imx: Update FSL_MFGPROT config for iMX8M 5bf76f3224 LF-4375 usb: imx: Fix USB charger detector issue f583f3df1d Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 4fd021a5f7 LFU-230 Fix coverity issue f3047ca7ee Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 d7f3dcb153 MA-19354-2 imx8mn: add mcu rdc config for ddr3l board c7970f2a21 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 924c6a7763 MA-19354 imx8mn: add mcu rdc config for ddr4 board 13ca08d55e Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 b41c0f1c0c configs: ls1046aqds: Configure environment related configs f52937bfd3 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 b240b9f0dc MA-19353 Fix compressed kernel boot issue d95fbbff6a Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 37726b4733 configs: lx2160a: load device-tree in RAM for distro boot 9f232d8d35 Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 81daa5b917 board: freescale: t104xrdb: Set popts->cpo_sample to 0x54 for DDR3 1c64332fcb drivers: ddr: main.c: Fix Bad Shift operator issue ff38405bc7 drivers: ddr: fsl_ddr_gen4.c: Fix divide by zero issue 07d31c49ae drivers: ddr: util.c: Fix divide by zero issue 8c8fc7f338 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 9435b9a123 MA-19340-2 Enable configs for ID attestation 2786fc5754 MA-19340-1 Enable ID attestation for Android12 4fb4b02fb6 MA-19339 Sync keymaster commands c58d8993c6 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 8fdf9c3291 MA-19331 imx8m: skip JR probe for android in uboot 15cb5b1520 Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 966f02d031 configs: Layerscape: Add 'fdt_addr' env with DRAM address 58ea97abaa configs: Layerscape: Remove the 'fdt_addr' env f5837340b5 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 ed618ce6a9 LFU-219 crypto/fsl: iMX8M: Disable CAAM JR0 in SPL and Uboot 67c3bfab61 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 3ae061258f LFU-218 imx8ulp_evk: Remove PMIC Bucks PWM mode settings 1cbec64e04 LF-4277 arm: dts: imx8mn: correct spba bus name d3439c324d LF-4276 arm: dts: imx8mq: add the dwc3 fallback compatible a9e51f0d10 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 f77c39f607 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 9517bc8ac9 LFU-217-2 spi: fsl_lpspi: Fix copyright problem in lpspi driver 926e7ce3a2 LFU-217-1 imx8ulp: upower: Fix license in upower API 8125abbbc7 LFU-216 imx8ulp_evk: Adjust PMIC i2c iomuxc setting order dca650dc08 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 ade91a1b1a Pull request #36: LFU-204 crypto/fsl: Add NULL check for CAAM device 0989c988f7 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 20b57dfbb2 LFU-215-2 video: dcnano: Call reset API before video devices init ca30015402 LFU-215-1 imx8ulp: clock: Support to reset DCNano and MIPI DSI 80fd1f4f99 LFU-214-2 imx8ulp_evk: call the handshake with M33 d1fec2211c LFU-214-1 imx: imx8ulp: Add M33 handshake functions 015094e65e Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 61228b7bd1 LFU-168 imx: Fix coverity issue in HAB event decoding ab2f95e11b LFU-204 crypto/fsl: Add NULL check for CAAM device ec18689b0b Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 ff537efc01 armv8: fsl : create bootcmd and mcinitcmd as per boot source decb3ac9ec Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 03e40d4064 board: fsl_validate: Fix resource leak issue c2a6072d54 board: freescale: t208xrdb: enable Power-On Reset for rev D boards beec8294d1 net: fsl-mc: fix logically dead code 680f757e84 drivers: net: aquantia: fix unsigned compared against 0 e79b3359d9 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 29254186d6 MLK-25462: imx8mp_evk: Add nominal drive mode support for LPDDR4 EVK 869ec8e344 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 d9eccf3de6 MA-19311 imx8ulp: android: Enable power domain driver c1a8697adc MA-19310 imx8ulp: Enable splash screen for android 1a07c7f671 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 bb3255b3e1 LFU-213 imx8ulp_evk: Enable eMMC HS400ES 611bfc2223 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 4e307e4ab7 LFU-211-7: configs: imx8mn ddr3l: ab2: default config 292ab1df29 LFU-211-6: dts: arm: imx8mn: ddr3l ab2 board config support 727c8aad40 LFU-211-5: include: configs: imx8mn ab2: adjust memsize for ddr3l 0e85b585cd LFU-211-4: arm: mach imx: imx8mn: Add ab2 ddr3l target option ab0b2d5df0 LFU-211-3: board: freescale: imx8mn ab2: ddr3l imx8mn som config cc9e3ee85b LFU-211-2: board: freescale: imx8mm ab2: spl use SoC name for target config 595934b5f1 LFU-211-1: board: freescale: imx8mm ab2: use SoC name for target config 69c3cafe9d Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 6ca1ad73ea MA-19305 imx8ulp: Enable config to set env location 2e972e4aa6 MA-19048-1 MCU security enhancement d99a726c46 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 3fd0991551 MLK-25349 imx8mq_evk: Enable PCIE VREG for 3.3v PHY supply b5f6c18daa Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 4475af9bea LFU-209 imx8ulp_evk: Enable multiple env storage devices 13f356fc98 LFU-208 imx8ulp: Update ahab doc for 8ULP secure boot 6a62a223f2 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 ecb2513697 LFU-207 imx8ulp: clock: Reset DDR controller before clock enable b6df87fb32 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 612677d547 HRPN-84 imx8mm_evk: use variable instead of hardcoded dtb name in jh boot command f54879f3eb Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 9e5e79c83b Pull request #29: LFU-192 Uboot: Add command and descriptors to provision ddek 2ad52ac95f LFU-192-6 Uboot: Add command to provision encryption key 4884bf62a7 LFU-192-5 crypto/fsl: Fix warnings in function gen_mppubk. dc3adcc258 LFU-192-4 crypto/fsl: Add support for HW accelerated AES ECB decryption b93255eea9 LFU-192-3 crypto/fsl: Add support to tag a black object b218e498e8 LFU-192-2 crypto/fsl: Add support for black key blob 68652f7e6f LFU-192-1 crypto/fsl: add invalidate_dcache_range for hash output buffer df30e6c07e Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 216aeb6408 LFU-206 imx8ulp: Workaround LPOSC_TRIM fuse load issue 1499d50249 LF-4200 imx8m: soc: drop phy-reset-gpios for fec c95a03993f Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 892528549f Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 12c2cabf67 Pull request #33: LFU-200: board: freescale: imx8mn ab2: fix usb download support 147e681f95 LFU-200: board: freescale: imx8mn ab2: fix usb download support 4fa3480156 LFU-199: configs: imx8mn ddr4: ab2: fix correct pmic 47a081d861 Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 1ff8af0741 configs: ls2080ardb.h: Update mc size in env 2b4e1fb63f configs: ls2080aqds.h: Update mc size in env a82c574f52 configs: ls1088ardb.h: Update mc size in env 0728f1367f configs: ls1088aqds.h: Update mc size in env f028eba755 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 30bbad3df5 LFU-203 imx8ulp_evk: Enable SD/MMC port auto detect 4054f98489 LFU-202 imx8ulp: Remove freescale name from CPU revision 2c44ed2a08 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 f942ee90b3 LFU-198 imx8mq_evk: Increase malloc size to 32MB af7fb0b6b4 LF-4182 imx8m: enable CONFIG_CMD_POWEROFF 1a738c9c1e Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 3d8455c51f Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 f626b544a6 LFU-197 imx8ulp: Fix DCNANO QoS setting 2329de6d4c LFU-196-6 imx8ulp_evk: Enable the power domain driver 4b4708590d LFU-196-5 imx8ulp_evk: Power down the domains may used in u-boot e84571971f LFU-196-4 usb: ci_udc: Check the power domain device before power down it 581efd8784 LFU-196-3 imx8ulp_evk: Remove flexspi2 iomux settings from board file 6b53e4f9b7 LFU-196-2 DTS: Sync imx8ulp and imx8ulp-evk DTS files with kernel 87187c4e96 LFU-196-1 power: domain: Add SCMI based power domain driver 9773095b05 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 c20ff98502 Pull request #27: MLK-20950 Run RNG self test for impacted i.MX chips. 578c36a50b MLK-20950 Run RNG self test for impacted i.MX chips. facee24798 Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 1b787eb011 configs: ls1043aqds: Configure environment related configs 22cc7f886a net: enetc: propagate the return code from phy_startup() to eth_ops::start 62c28862ba net: enetc: force the RGMII MAC speed/duplex instead of using in-band signaling 333eecd52e net: enetc: require a PHY device when probing 80c47060cb arm: dts: ls1028a: disable enetc-2 by default fa212dc62b arm: dts: ls1028a: declare the fixed-link speeds for the internal ENETC ports f2f93c5c6e arm: dts: ls1028a: enable internal RGMII delays for the LS1028A-QDS AR8035 PHY a8c4d18535 arm: dts: ls1028a: enable the switch CPU port for the LS1028A-QDS 245a0e37fa Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 493f71ffd5 LFU-195 imx8ulp: Set DCNANO read QoS on NIC_LPAV to highest 0d1a586e91 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 7985635660 LFU-194-2 DTS: iMX8M: Replace the RM67191 panel with RM67199 2840ef1395 LFU-194-1 video: rm67191: Add new rm67199 panel support 178451775a Merging in latest from upstream (LFAC/uboot-nxp:refs/heads/imx_v2021.04) 98f3d83574 LF-3892-6 imx8mp_evk: update defconfig and code for SR-IR f8cba1b104 LF-3892-5 imx8mn_evk: update defconfig and code for SR-IR 72e61725bf LF-3892-4 imx8mn: sync dts usb with nxp kernel 2d4219e768 LF-3892-3 imx8mp: disable snvs and sdma 5853da1a4d LF-3892-2 imx8mp_evk: enable usb power by default 5ce91d244b LF-3892-1 imx8mq_evk: support SR-IR f0a4853640 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 4e7135ca48 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 66b5e4c0c2 LFU-193-5 DTS: imx8mp: Add the CMA reserved memory 2413d82b74 LFU-193-4 imx8mp_evk: Remove USB2 PWR GPIO control 2fe2bd4d55 LFU-193-3 DTS: imx8mp-evk: Sync the USB nodes with kernel bb7c98bece LFU-193-2 usb: xhci-imx8m: Update iMX8MP XHCI driver to support new DTS node 51fd39bcc0 LFU-193-1 clk: imx8mp: Update clock tree for USB relevant clocks 7ff159f4e0 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 f4676f6bf0 LFU-184-8 imx8ulp_evk: Enable the Splash screen d3e84367dd LFU-184-7 imx8ulp_evk: Control LPI2C0 PCA6416 and TPM0 for display 8a16e4446b LFU-184-6 video: rm68200: Allow no backlight property 27253d0959 LFU-184-5 video: imx: Update MIPI DSI driver for iMX8ULP d2bc3bb11e LFU-184-4 video: imx: Add DCNano display controller driver e4a190a579 LFU-184-3 arm: DTS: Update imx8ulp for MIPI DSI and DCNANO b7ad5bbad0 LFU-184-2 imx8ulp: clock: Add MIPI DSI clock and DCNano clock 634a2bc8c7 LFU-184-1 imx8ulp: clock: Support LPAV clocks in cgc and pcc 3504b2bcc9 MLK-25642: configs: imx8dxl_ddr3_evk: add new config for fspi nor boot e6d89d1cd3 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 04ced23ffa LFU-188-2 imx8mp_evk: Remove reservation for MCU RPMSG buffer 971bae76cc LFU-188-1 imx8m: soc: Relocate u-boot to the top DDR in 4GB space 1d2a230741 LFU-187 misc: imx8ulp: Update fuse driver for bank 25 access 49acceec90 LFU-186 imx8ulp_evk: Enable USB ethernet support 0cf784bea0 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 1e4568fa41 MA-19249-2 imx8ulp: enable more configs 23454b24e6 MA-19249 imx8ulp: fix dual bootloader 45462a6aba Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 bf993cbaf2 MA-19209-3 imx8ulp: add config file to support trusty 99e3b70f57 MA-19209-2 Support trusty for imx8ulp b37fb0306d Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 7eead82bce Pull request #26: Feature/imx v2021.04/LFU-167 74176014f8 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 ff8fc6c391 LFU-183 configs: imx8ulp: add Jailhouse boot command 9dbb3a95ea Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 34d4c41128 LFU-182-5 imx8ulp_evk: Add secure boot environments d75a91e5e9 LFU-182-4 imx8ulp: ahab: Update AHAB codes to support authentication fcf98912a3 LFU-182-3 misc: S400_API: Update S400 API for buffer dump 89797a1eee LFU-182-2 misc: imx8ulp_mu: Update S400 MU driver ff176fa31c LFU-182-1 arm: imx8ulp: Probe the S400 MU after u-boot relocation 9c14458bda LFU-167-6: dts: arm: imx8mn ab2: update for latest som revison bf88d9f87b LFU-167-5: dts: arm: imx8mm ab2: update for latest som revison 9e8dcbb967 LFU-167-4: configs: imx8mn ab2: update config options v2021.04 789944b10b LFU-167-3: configs: imx8mn ab2: update config options v2021.04 bf20bac785 LFU-167-2: board: freescale: imx8mm ab2: spl update v2021.04 93173f62d7 LFU-167-1: arm: mach-imx: imx8m ab2 enable crypto and caam 40588c3c3d MLK-25347-12: configs: imx8mn ddr4 ab2: enable usb support 0a4a20c2d7 MLK-25347-11: configs: imx8mn ab2: enable usb and fasboot support 959116d44c MLK-25347-10: configs: imx8mm ddr4 ab2 nand: enable usb support ef15f380ce MLK-25347-9: configs: imx8mm ddr4 ab2: enable usb and fastboot support fe84f68525 MLK-25347-8: configs: imx8mm ab2 fspi: usb fastboot support 81fd21e0e2 MLK-25347-7: configs: imx8mm ab2: usb and fastboot support 2d3c155d0d MLK-25347-6: dts: arm: imx8mn ab2: enable usbotg1 support 88ddecff80 MLK-25347-5: dts: arm: imx8mm ab2: enable usbotg1 support fea0ecda19 MLK-25347-4: include: configs: imx8mn ab2: enable usb configs 4fa403e521 MLK-25347-3: include: configs: imx8mm ab2: enable usb configs 4e3c799948 MLK-25347-2: board: freescale: imx8mm ab2: spl enable usb boot device 90565cab1d MLK-25347-1: board: freescale: imx8mm ab2: usb support 40ea784dd1 MLK-24868: dts: arm: imx8mn ab2 fix regulator settings bb28778c65 MLK-24510: board: freescale: imx8mm ddr4 audio board 2.0 c0d3a4eada MLK-24509-2: configs: imx8mn ab2: cortex-m7 auxboot support 2b19d51398 MLK-24509-1: configs: imx8mm ab2: cortex-m4 auxboot support fd040130bf MLK-24508: board: freescale: imx8mm ab2: fix regulators build warning 986bba0a00 MLK-24395: dts: arm: imx8mm ab2: add fec phy int gpio pad 236d2569b6 MLK-24394-2: board: freescale: imx8mm ab2: enable fixed regulators 1a2a89a238 MLK-24394-1: dts: arm: imx8mm ab2: fixed regulator support 18817b5f93 MLK-24393: include: configs: imx8mm ab2: m4 boot support a3fad84b45 MLK-24392: dts: arm: imx8mm ab2: fix flexspi flash0 properties abc7a764ed MLK-24069: dts: arm: imx8mm: ab2 fix enet phy addr 14c1a859b0 MLK-24057: configs: imx8mm ab2 increase enet phy timeout b869581390 MLK-23928: board: freescale: imx8mn audio board 2.0 640f60e367 MLK-23927: board: freescale: imx8mm audio board 2.0 0f06048c81 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 210f84da45 LFU-175 i.MX8ULP: Enables CAAM support for i.MX8ULP in SPL and U-Boot. ed9753f415 Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 6c225502b2 net: dsa: felix: propagate the error code from phy_startup() af172d2765 net: dsa: felix: call phy_config at .port_probe() time cbdbfc2522 net: dsa: introduce a .port_probe() method in struct dsa_ops 88f89c7899 net: dsa: refactor the code to set the port MAC address into a dedicated function cf47371ccf net: dsa: use "err" instead of "ret" in dsa_port_probe 049fa15dab net: dsa: felix: felix_init() can be static f7501bdd5e Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 3678f2437e MLK-25623 imx8ulp: upower_hal: fix upower_wait_resp ee4c696409 MA-19209 imx8ulp: reserve tee memory 1dbd8c2a45 MLK-25612 arm: imx: Fix container header checking d14581d3fc MLK-25575 imx8ulp: soc: enable wdog_ad interrupt in CMC1 9c6448eeb7 MLK-25609 arm: imx8ulp: force use general regs eeeffaff4b MLK-25608-2 imx8ulp: clear ddr retention fe102369c8 MLK-25608-1 imx8ulp: upower: include API to support set/clear ddr retention 92af5c7a61 MLK-25576 imx8ulp: soc: correct reset cause afef2b7c86 MLK-25614: dts: imx8ulp: fix uboot usdhc2 dts node mismatch with kernel dts eb375abd0d MA-19091-1 dts: imx8ulp: Add console bootargs 29407a880b LFOPTEE-48 imx8ulp: release CAAM for the Cortex-A35 65d87ea812 LFOPTEE-48 imx8ulp: enabled OPTEE DTB node b42e95713d MLK-25589: dts: imx8ulp-evk: disable usdhc2 which is used by wifi in uboot 2e42aa804c MLK-25586 imx8ulp_evk: Set PMIC Buck3 to 1.1v 20dee6f6a0 MA-19091 android: add android support for 8ulp 72bfc8f166 MA-19118 imx8ulp: support mmc boot in spl 103b94d346 MLK-25560-7 imx8ulp_evk: Enable the flexspi0 NOR support 4a97a49990 MLK-25560-6 arm: dts: Add the flexspi0 node to imx8ulp DTSi f0ec8cc65e MLK-25560-5 imx8ulp: Use DGO_GP5 to get boot config 55456b7bcc MLK-25560-4 imx8ulp: rdc: Add TRDC interface to configure MRC 832fe03097 MLK-25560-3 imx8ulp: Update pins header file for flexspi0 2dbc37340a MLK-25560-2 imx8ulp: Update MMU table for flexspi0 access 514b0c5aad MLK-25560-1 mtd: spi: Add Adesto ATXP032 SPI NOR flash support a56bd8ab60 MLK-25552 imx8ulp: assign PXP/HIFI4/EPDC to APD domain 3c695cf2ce MLK-25536-2 imx8ulp_evk: Update LPDDR4 timing file 1d28ee7c79 MLK-25536-1 imx8ulp: clock: Update PLL4 and DDR clock 807c0e2aa7 MLK-25504-43 imx8ulp: soc: Check the DBD_EN fuse before setting RDC 829e193dfb MLK-25504-42 imx8ulp: Add workaround for eMMC boot 79f3c7fc8c MLK-25504-41 arm: imx: add i.MX8ULP EVK support d661020e5c MLK-25504-40 imx8ulp: rdc: Add functions to init MDA and MRC 110ac95d93 MLK-25504-39 arm: dts: add i.MX8ULP dtsi 157ed3d5ff MLK-25504-38 arm: imx8ulp: Add upower APIs 4cd13b3bbb MLK-25504-37 ddr: Add DDR driver for iMX8ULP e85dab751d MLK-25504-36 arm: iMX8ULP: Add boot device relevant functions 64238d765b MLK-25504-35 arm: imx8ulp: add xrdc support 8f72b77d8b MLK-25504-34 spl: spl_imx_romapi: Fix gd recover issue 627905e2ee MLK-25504-33 mtd: spi-nor: Add new MACRONIX NOR flash ID e16f5da704 MLK-25504-32 fastboot: Add iMX8ULP support for partition offset 65c785802e MLK-25504-31 usb: ci_udc: Update USB gadget driver for iMX8ULP db40a9d563 MLK-25504-30 mx7ulp: clock: Update USB PLL clock function 452c1c105a MLK-25504-29 usb: ehci-imx6: Update USB host driver for iMX8ULP 6f97e6b7d4 MLK-25504-28 driver: misc: imx8ulp: Add fuse driver for imx8ulp 1165f036d0 MLK-25504-27 arm: imx8ulp: add iomuxc support 43b4326384 MLK-25504-26 arm: imx8ulp: add dummy imx_get_mac_from_fuse a56159a944 MLK-25504-25 arm: imx8ulp: Probe the S400 MU device in arch init b2c4a09b9b MLK-25504-24 arm: imx8ulp: Allocate LPAV resources to AP domain 9194f206e8 MLK-25504-23 arm: imx8ulp: Release and configure TRDC for single boot 483fbeddc3 MLK-25504-22 arm: imx8ulp: release and configure XRDC at early phase 423c6933ba MLK-25504-21 imx: AHAB: Update AHAB for iMX8 and iMX8ULP 49b7c3095c MLK-25504-20 spi: nxp_fspi: Update flexspi NOR driver for iMX8ULP 409ef8652f MLK-25504-19 spi: fsl_fspi_nand: Update flexspi nand driver for imx8ulp ba7f875afc MLK-25504-18 mtd: nand-spi: Add micron chip MT29F4G01 f48d411154 MLK-25504-17 ulp_wdog: Update the watchdog driver 1822b965d6 MLK-25504-16 arm: imx8ulp: Update the reset vector in u-boot 0db15a45bf MLK-25504-15 arm: imx8ulp: disable wdog3 98fc0727c8 MLK-25504-14 arm: imx8ulp: Enable full L2 cache in SPL b3fd68bb1b MLK-25504-13 arm: imx8ulp: add clock support 2c23e7c4f0 MLK-25504-12 mmc: fsl_esdhc_imx: support i.MX8ULP 21fbd3e544 MLK-25504-11 serial: fsl_lpuart: support i.MX8ULP 5cb9388310 MLK-25504-10 pinctrl: Add pinctrl driver for imx8ulp f89c3d1fb8 MLK-25504-9 net: fec_mxc: support i.MX8ULP 4966e91c7c MLK-25504-8 misc: Add MU and S400 API to communicate with Sentinel 1f26092892 MLK-25504-7 imx: Support loading container image from RAM device 6e3f58bcba MLK-25504-6 imx: Support container image in ROM API download 54e2702651 MLK-25504-5 imx8: Move container image header file to mach-imx 62d0f9806c MLK-25504-4 arm: imx: move container Kconfig under mach-imx 36762aa9d5 MLK-25504-3 arm: imx8: Move container parser and image to mach-imx common folder af1258e4af MLK-25504-2 arm: imx: add i.MX8ULP basic support f15e54b858 MLK-25504-1 arm: imx: sys_proto: move boot mode define to common header 48c2eeff75 MA-19231 Remove deprecated do_boota() a4a0b8ba78 Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 c434a99216 net: phy: inphi: change dev_err to pr_err 800e17e7b8 board: freescale: lx2160aqds: include the lx2160a.h header 777fcdd078 board: lx2160aqds: add support for SERDES #1 protocol 14 c789aaadc6 board: lx2160aqds: add support for SERDES #1 protocol 13 f923ded1f3 net: ldpaa_eth: connect to multiple PHYs/retimers b87e5508f7 dm: mdio: add dm_eth_phy_connect_index() 3ee4ed7462 Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 ad0ae45a87 configs: ls1046ardb: enable PHY_FIXED 3a1c1143d2 arm: dts: ls1043ardb: configure the RGMII ports with rgmii-id 02f4ac66ad armv8: fsl: fix bootcmd and mcinitcmd default value 617320f3b2 Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04 f7488084bb MA-19176 imx8mm: enlarge early malloc pool size 363f43808b Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04 35b7ddacff board: freescale: t208xrdb: add a config option for rev D dts fixups 7c9972b14b board: freescale: t208xrdb: add Linux fdt fix-ups for rev D f650a4e4c6 board: freescale: t208xrdb: detect the board revision version 1fcfd5f3b5 board: freescale: t208xrdb: remove the legacy non-DM_ETH code ---- Signed-off-by: Tom Hochstein --- recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc index 2abcac9b..f82f7b67 100644 --- a/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc +++ b/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a SRCBRANCH = "lf_v2021.04" SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" -SRCREV = "3463140881c523e248d2fcb6bfc9ed25c0db93bd" +SRCREV = "263b27e076a0f6e5dcc80227a235f0af73718342" +LOCALVERSION ?= "-imx_v2021.04_5.10.72_2.2.0" DEPENDS += "flex-native bison-native bc-native dtc-native" @@ -14,7 +15,4 @@ B = "${WORKDIR}/build" inherit fsl-u-boot-localversion -LOCALVERSION ?= "-imx_v2021.04_5.10.35_2.0.0" - BOOT_TOOLS = "imx-boot-tools" - -- cgit v1.2.3-54-g00ecf From 92acf99a6124df0d2e10bf10f296962ab9383ba1 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 13 Jan 2022 17:56:08 -0600 Subject: imx-boot,u-boot-imx: Add bootloader image size to SD card image Append a tag to the bootloader image used in the SD card image. The tag contains the size of the bootloader image so UUU can easily find the end of the bootloader in the SD card image. Signed-off-by: Tom Hochstein --- classes/uuu_bootloader_tag.bbclass | 11 +++++++++++ recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 10 ++++++---- recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb | 4 ++++ recipes-bsp/u-boot/u-boot-imx_2021.04.bb | 9 +++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 classes/uuu_bootloader_tag.bbclass diff --git a/classes/uuu_bootloader_tag.bbclass b/classes/uuu_bootloader_tag.bbclass new file mode 100644 index 00000000..fb6acd72 --- /dev/null +++ b/classes/uuu_bootloader_tag.bbclass @@ -0,0 +1,11 @@ +# Append a tag to the bootloader image used in the SD card image. The tag +# contains the size of the bootloader image so UUU can easily find the end of +# the bootloader in the SD card image. +do_deploy:append() { + if [ "${UUU_BOOTLOADER}" != "" ]; then + cp ${DEPLOYDIR}/${UUU_BOOTLOADER} ${DEPLOYDIR}/${UUU_BOOTLOADER_TAGGED} + ln -sf ${UUU_BOOTLOADER_TAGGED} ${DEPLOYDIR}/${UUU_BOOTLOADER} + stat -L -cUUUBURNXXOEUZX7+A-XY5601QQWWZ%sEND ${DEPLOYDIR}/${UUU_BOOTLOADER} \ + >> ${DEPLOYDIR}/${UUU_BOOTLOADER} + fi +} diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index f8ebb730..b332e079 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -24,7 +24,10 @@ DEPENDS:append:mx8m = " u-boot-mkimage-native dtc-native" BOOT_NAME = "imx-boot" PROVIDES = "${BOOT_NAME}" -inherit deploy +inherit deploy uuu_bootloader_tag + +UUU_BOOTLOADER = "${BOOT_NAME}" +UUU_BOOTLOADER_TAGGED = "${BOOT_NAME}-tagged" # Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}" @@ -190,9 +193,8 @@ do_deploy() { fi install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${target} ${DEPLOYDIR} done - cd ${DEPLOYDIR} - ln -sf ${BOOT_CONFIG_MACHINE}-${IMAGE_IMXBOOT_TARGET} ${BOOT_NAME} - cd - + + ln -sf ${BOOT_CONFIG_MACHINE}-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME} } addtask deploy before do_build after do_compile diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb index af502889..5443ceac 100644 --- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb @@ -6,3 +6,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-imx:" require u-boot-imx_${PV}.bb require u-boot-mfgtool.inc + +UUU_BOOTLOADER_TAGGED = "" +UUU_BOOTLOADER_TAGGED:mx6 = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER_TAGGED:mx7 = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" diff --git a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb index bb5809e2..96552eef 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb @@ -7,6 +7,15 @@ require u-boot-imx-common_${PV}.inc PROVIDES += "u-boot" +inherit uuu_bootloader_tag + +UUU_BOOTLOADER = "" +UUU_BOOTLOADER:mx6 = "${UBOOT_BINARY}" +UUU_BOOTLOADER:mx7 = "${UBOOT_BINARY}" +UUU_BOOTLOADER_TAGGED = "" +UUU_BOOTLOADER_TAGGED:mx6 = "u-boot-tagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER_TAGGED:mx7 = "u-boot-tagged.${UBOOT_SUFFIX}" + do_deploy:append:mx8m() { # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary if [ -n "${UBOOT_CONFIG}" ] -- cgit v1.2.3-54-g00ecf From 63748616fad1715cc8ce95c1cc776d1841b45a9c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 17 Jan 2022 16:11:09 -0600 Subject: imx-sc-firmware: Upgrade to 1.11.0 Signed-off-by: Tom Hochstein --- .../imx-sc-firmware/imx-sc-firmware_1.10.0.bb | 41 ---------------------- .../imx-sc-firmware/imx-sc-firmware_1.11.0.bb | 41 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb create mode 100644 recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb deleted file mode 100644 index e3dad7da..00000000 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.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=e565271ec9a80ce47abbddc4bffe56fa" -SECTION = "BSP" - -inherit fsl-eula-unpack pkgconfig deploy - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "5c2b9d35e526136042a84e8d8f6c116e" -SRC_URI[sha256sum] = "0adc3d2c2df250a873232f1b62b14674694b50a4e01dd6ceae479e4ff2b2276b" - -BOARD_TYPE ?= "mek" -SC_FIRMWARE_NAME ?= "INVALID" -SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8dx = "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|mx8qxp|mx8dxl|mx8dx)" diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb new file mode 100644 index 00000000..27f7a2a7 --- /dev/null +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.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=03bcadc8dc0a788f66ca9e2b89f56c6f" +SECTION = "BSP" + +inherit fsl-eula-unpack pkgconfig deploy + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "95f1b0a148c323968c0741e807995948" +SRC_URI[sha256sum] = "4ad2999088098c7d95837b7dc88adceda319c2102c8bdf55bf6e9453653fba00" + +BOARD_TYPE ?= "mek" +SC_FIRMWARE_NAME ?= "INVALID" +SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8dx = "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|mx8qxp|mx8dxl|mx8dx)" -- cgit v1.2.3-54-g00ecf From 09a4f2f382aab2ee66d2dd1415b9ed580b9fbef4 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 17 Jan 2022 16:37:47 -0600 Subject: imx-seco: Upgrade to 3.8.4 Signed-off-by: Tom Hochstein --- recipes-bsp/imx-seco/imx-seco_3.8.2.bb | 26 -------------------------- recipes-bsp/imx-seco/imx-seco_3.8.4.bb | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 recipes-bsp/imx-seco/imx-seco_3.8.2.bb create mode 100644 recipes-bsp/imx-seco/imx-seco_3.8.4.bb diff --git a/recipes-bsp/imx-seco/imx-seco_3.8.2.bb b/recipes-bsp/imx-seco/imx-seco_3.8.2.bb deleted file mode 100644 index bd749e4f..00000000 --- a/recipes-bsp/imx-seco/imx-seco_3.8.2.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=e565271ec9a80ce47abbddc4bffe56fa" - -inherit fsl-eula-unpack use-imx-security-controller-firmware deploy - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "92a15f2ffe162374806e2dfe9b0aa2e9" -SRC_URI[sha256sum] = "c543cd3ec4d30c0cf5ee2a2f4dc7efe209363e45087e0b7c380b727b7bcf2c8a" - -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|mx8qxp|mx8dxl|mx8dx)" diff --git a/recipes-bsp/imx-seco/imx-seco_3.8.4.bb b/recipes-bsp/imx-seco/imx-seco_3.8.4.bb new file mode 100644 index 00000000..bd5739cd --- /dev/null +++ b/recipes-bsp/imx-seco/imx-seco_3.8.4.bb @@ -0,0 +1,26 @@ +# 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=03bcadc8dc0a788f66ca9e2b89f56c6f" + +inherit fsl-eula-unpack use-imx-security-controller-firmware deploy + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "38d298cda9ea91db945b266bd6774e07" +SRC_URI[sha256sum] = "ed65381fac7a17a7594099191952821ed3f3f54c944937926dc19f82ecd8fef5" + +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|mx8qxp|mx8dxl|mx8dx)" -- cgit v1.2.3-54-g00ecf From 87f2ac6286cddd8d95de21154363dbfc36a458b1 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 17 Jan 2022 16:37:56 -0600 Subject: imx-seco-libs: Update to 5.10.72-2.2.0 Fixes: 3e8ad6b license update 78d7375 V2XA-732, V2XA-733: update v2x test with SM4 CCM examples cf16424 V2XA-733: hsm lib: key generic crypto service 639a845 V2XA-732, V2XA-733: add SM4 CCM support and generic crypto service faa80e4 HSM-590: license update Signed-off-by: Tom Hochstein --- recipes-bsp/imx-seco/imx-seco-libs_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 41128e28..f8c3c239 100644 --- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -4,14 +4,14 @@ SUMMARY = "NXP i.MX SECO library" DESCRIPTION = "NXP i.MX Security Controller library" SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://EULA.txt;md5=85d06b38f17b935ca11784d67075b846" +LIC_FILES_CHKSUM = "file://EULA.txt;md5=76871788f27c28af824e2ec1ca187832" DEPENDS = "zlib" -SRCBRANCH = "lf-5.10.y_2.0.0" +SRCBRANCH = "lf-5.10.72_2.2.0" SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \ file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch" -SRCREV = "44caf511023012e9eda93f8bf64c90eaff1bade6" +SRCREV = "3e8ad6b168f23a8c6ecd75edabc18d2673403e24" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 77558f93cab8edb9dff14413f1d134159b4074ce Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 17 Jan 2022 17:57:39 -0600 Subject: imx-test: Update to 5.10.72-2.2.0 Fixes: ``` a26b1ee MLK-25735-3: ignore empty v4l2 output buffer 923cf16 MLK-25735-2: rename NV12M_8L128 to NV12MT_8L128 21c89c5 MLK-25735: mxc_v4l2_vpu_test: support display decoded picture using wayland 9d8e867 MLK-25721 mxc_v4l2_vpu_test: support more encoder input format d45624e MLK-25685 mxc_v4l2_vpu_test: avoid repeatedly release pitcher_buffer ``` Signed-off-by: Tom Hochstein --- recipes-bsp/imx-test/imx-test_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index f7ef0348..d33ad18c 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -16,12 +16,12 @@ DEPENDS:append:imxvpu = " virtual/imxvpu" PE = "1" PV = "7.0+${SRCPV}" -SRCBRANCH = "lf-5.10.52_2.1.0" +SRCBRANCH = "lf-5.10.72_2.2.0" SRC_URI = " \ git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ file://memtool_profile \ " -SRCREV = "2dcb987a91183770f328258b424d9ad2fdfdc17a" +SRCREV = "a26b1ee51177e317aa05251d4c8f10c4c68064f6" S = "${WORKDIR}/git" inherit module-base use-imx-headers -- cgit v1.2.3-54-g00ecf From ddbc40ac9cb001f1e16da218a08f3a3a43b29dbb Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 18 Jan 2022 14:30:07 -0600 Subject: imx-vpu-hantro: Upgrade to 1.24.0 Signed-off-by: Tom Hochstein --- .../imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb | 35 ---------------------- .../imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb | 35 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb deleted file mode 100644 index 427dbf92..00000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2017-2020 NXP - -DESCRIPTION = "i.MX Hantro VPU library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" - -PROVIDES = "virtual/imxvpu" - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "3f8d4bb593d851d0523d0146131946ae" -SRC_URI[sha256sum] = "a312a0b6d32ed16527e5bfcff362b231069428362ad5710f816bca019f70c6a2" - -inherit fsl-eula-unpack use-imx-headers - -PARALLEL_MAKE="-j 1" - -PLATFORM:mx8mm = "IMX8MM" -PLATFORM:mx8mq = "IMX8MQ" -PLATFORM:mx8mp = "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" - -COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb new file mode 100644 index 00000000..84c71610 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb @@ -0,0 +1,35 @@ +# Copyright (C) 2017-2020 NXP + +DESCRIPTION = "i.MX Hantro VPU library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" + +PROVIDES = "virtual/imxvpu" + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" +SRC_URI[md5sum] = "1f99c6941b8a51035b52cc5bc72faa3d" +SRC_URI[sha256sum] = "aa9461a152e13a1caa852f29ae18fd33aebd90c8a2b49519003e632687fe89d6" + +inherit fsl-eula-unpack use-imx-headers + +PARALLEL_MAKE="-j 1" + +PLATFORM:mx8mm = "IMX8MM" +PLATFORM:mx8mq = "IMX8MQ" +PLATFORM:mx8mp = "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" + +COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" -- cgit v1.2.3-54-g00ecf From 4d713c80302466a3d4d2b33e071cfeeb866aa548 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 18 Jan 2022 14:30:35 -0600 Subject: imx-vpu-hantro-daemon: Upgrade to 1.1.1 Signed-off-by: Tom Hochstein --- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb | 31 ---------------------- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb | 31 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb deleted file mode 100644 index 25f54c7a..00000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.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 = " imx-vpu-hantro-vc" - -SRC_URI = " \ - ${FSL_MIRROR}/${BP}.tar.gz \ -" -SRC_URI[md5sum] = "980237589af195c2c4b852a7aad175ee" -SRC_URI[sha256sum] = "a5d915fefd3637e68d693638edd1161c30e75011a6312251b914f04546fd0fc9" - -PLATFORM:mx8mm = "IMX8MM" -PLATFORM:mx8mq = "IMX8MQ" -PLATFORM:mx8mp = "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|mx8mm|mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb new file mode 100644 index 00000000..d4a48627 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb @@ -0,0 +1,31 @@ +# 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 = " imx-vpu-hantro-vc" + +SRC_URI = " \ + ${FSL_MIRROR}/${BP}.tar.gz \ +" +SRC_URI[md5sum] = "99e96b2e00516d56a78a95a80851076b" +SRC_URI[sha256sum] = "e7b3d55f72e233179b1b28c03628139b463d1994d140fed3c3e0796c66e917c8" + +PLATFORM:mx8mm = "IMX8MM" +PLATFORM:mx8mq = "IMX8MQ" +PLATFORM:mx8mp = "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|mx8mm|mx8mp)" -- cgit v1.2.3-54-g00ecf From abd318457243df640eaca38507c799825cfb6421 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 18 Jan 2022 15:33:00 -0600 Subject: imx-vpu-hantro-vc: Upgrade to 1.6.0 Signed-off-by: Tom Hochstein --- .../imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb | 35 ---------------------- .../imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb | 35 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb deleted file mode 100644 index e6cffaca..00000000 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2019-2021 NXP - -DESCRIPTION = "i.MX VC8000E Encoder library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "fbd43a100c27abbae301428f1ae2bc64" -SRC_URI[sha256sum] = "e59ac2ded726d722f61793b17fc394ce87b1c5710cb79f0b1d60b87fca5829e1" - -# 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} = "/" - -COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb new file mode 100644 index 00000000..2a17d76f --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb @@ -0,0 +1,35 @@ +# Copyright (C) 2019-2021 NXP + +DESCRIPTION = "i.MX VC8000E Encoder library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" + +S = "${WORKDIR}/${BPN}-${PV}" + +SRC_URI[md5sum] = "c24e2622c522bb4bc2da710c27389ee4" +SRC_URI[sha256sum] = "338eaa313cfa6f93eee5930903386fca922f82fda3617ecb2597cc90ccf8f22d" + +# 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} = "/" + +COMPATIBLE_MACHINE = "(mx8mp)" -- cgit v1.2.3-54-g00ecf From 8b46c3c6ea8a623f8cd9819ddf5e4c7cbe9d5bc9 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 18 Jan 2022 16:38:27 -0600 Subject: isp-imx: Upgrade to 4.2.2.16.0 Drop the upstream patch: 0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch. Signed-off-by: Tom Hochstein --- recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb | 92 ------------------------------- recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb | 91 ++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 92 deletions(-) delete mode 100644 recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb create mode 100644 recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb deleted file mode 100644 index 9ede07bd..00000000 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 2020-2021 NXP - -DESCRIPTION = "i.MX Verisilicon Software ISP" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" -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 \ - file://0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch \ -" - -SRC_URI[md5sum] = "e9e0943b9f4923c767d07901e550c41c" -SRC_URI[sha256sum] = "13274c0fd442da4b3b9900a7568c59872ffa6408f5699d35eebc6760a8e51297" - -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" - -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 ${WORKDIR}/build/generated/release/bin/*_test ${D}/opt/imx8-isp/bin - cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin - cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin - cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin - cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir} - cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} - - cp ${WORKDIR}/${BP}/imx/run.sh ${D}/opt/imx8-isp/bin - cp ${WORKDIR}/${BP}/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 ${WORKDIR}/${BP}/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)" 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 new file mode 100644 index 00000000..4411c351 --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb @@ -0,0 +1,91 @@ +# 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" + +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 ${WORKDIR}/build/generated/release/bin/*_test ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir} + cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} + + cp ${WORKDIR}/${BP}/imx/run.sh ${D}/opt/imx8-isp/bin + cp ${WORKDIR}/${BP}/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 ${WORKDIR}/${BP}/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)" -- cgit v1.2.3-54-g00ecf From 9fa3004dab003fd616fea89c5a0baf6c48ce5a72 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 18 Jan 2022 16:46:22 -0600 Subject: basler-camera: Upgrade to 4.2.2.16.0 Signed-off-by: Tom Hochstein --- recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb | 27 ------------------------- recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb | 27 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb create mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb deleted file mode 100644 index 0122d273..00000000 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.15.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=e565271ec9a80ce47abbddc4bffe56fa" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "963339f568e8b0ba5d67328238284d47" -SRC_URI[sha256sum] = "f4d4aa08103937ddd86b9c0880d07c1e0db1ec7f51a420a8ccc76dcf2fb7dbe6" - -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)" 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 new file mode 100644 index 00000000..e7c8a326 --- /dev/null +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb @@ -0,0 +1,27 @@ +# 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)" -- cgit v1.2.3-54-g00ecf