aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--EULA15
-rw-r--r--SCR/SCR-5.10.72-2.2.0.txt (renamed from SCR/SCR-5.10.52-2.1.0.txt)365
-rw-r--r--classes/fsl-eula-unpack.bbclass6
-rw-r--r--classes/fsl-vivante-kernel-driver-handler.bbclass6
-rw-r--r--classes/imx-boot-container.bbclass2
-rw-r--r--classes/uuu_bootloader_tag.bbclass11
-rw-r--r--conf/machine/imx8mq-evk.conf34
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx-8.14.inc (renamed from recipes-bsp/firmware-imx/firmware-imx-8.13.inc)6
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb (renamed from recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb)0
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb (renamed from recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb)0
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx_8.14.bb (renamed from recipes-bsp/firmware-imx/firmware-imx_8.13.bb)15
-rw-r--r--recipes-bsp/imx-atf/imx-atf_2.4.bb23
-rw-r--r--recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch135
-rw-r--r--recipes-bsp/imx-mkimage/imx-boot_1.0.bb10
-rw-r--r--recipes-bsp/imx-mkimage/imx-mkimage_git.inc4
-rw-r--r--recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb (renamed from recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb)6
-rw-r--r--recipes-bsp/imx-seco/imx-seco-libs_git.bb6
-rw-r--r--recipes-bsp/imx-seco/imx-seco_3.8.4.bb (renamed from recipes-bsp/imx-seco/imx-seco_3.8.2.bb)6
-rw-r--r--recipes-bsp/imx-test/imx-test_git.bb4
-rw-r--r--recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb (renamed from recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb)6
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb (renamed from recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb)4
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb (renamed from recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb)6
-rw-r--r--recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb (renamed from recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb)6
-rw-r--r--recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb (renamed from recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb)7
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc (renamed from recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc)6
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb (renamed from recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb)0
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb (renamed from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb)0
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc_2022.01.bb (renamed from recipes-bsp/u-boot/u-boot-fslc_2021.07.bb)0
-rw-r--r--recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc6
-rw-r--r--recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb4
-rw-r--r--recipes-bsp/u-boot/u-boot-imx_2021.04.bb9
-rw-r--r--recipes-graphics/libsdl2/libsdl2_%.bbappend2
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_5.10.bb10
-rw-r--r--recipes-kernel/linux/linux-fslc-lts_5.10.bb4
-rw-r--r--recipes-kernel/linux/linux-fslc_5.15.bb4
-rw-r--r--recipes-kernel/linux/linux-imx-headers_5.10.bb4
-rw-r--r--recipes-kernel/linux/linux-imx/imx/defconfig2
-rw-r--r--recipes-kernel/linux/linux-imx/mx8/defconfig41
-rw-r--r--recipes-kernel/linux/linux-imx_5.10.bb6
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb2
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb2
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb2
-rw-r--r--recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb4
-rw-r--r--recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb21
-rw-r--r--recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb45
-rw-r--r--recipes-support/opencv/opencv_4.5.2.imx.bb12
-rw-r--r--wic/imx-boot-container-bootpart.wks.in13
47 files changed, 513 insertions, 369 deletions
diff --git a/EULA b/EULA
index 44db0d25..1779a870 100644
--- a/EULA
+++ b/EULA
@@ -1,4 +1,4 @@
-LA_OPT_NXP_Software_License v27 July 2021
+LA_OPT_NXP_Software_License v30 October 2021
IMPORTANT. Read the following NXP Software License Agreement ("Agreement")
completely. By selecting the "I Accept" button at the end of this page, or by
@@ -409,7 +409,6 @@ following addresses:
High Tech Campus 60
5656 AG Eindhoven
The Netherlands
-
ATTN: Legal Department
You: The address provided at registration will be used.
@@ -446,6 +445,10 @@ Party Software or specific components of the NXP proprietary software, the
following terms apply to the extent they deviate from the terms in the
Agreement:
+Airbiquity Inc.: The Airbiquity software may only be used in object code and
+Licensee may not sublicense the Airbiquity software to any third party.
+Licensee’s license to use the Airbiquity software expires on June 30, 2023.
+
Amazon: Use of the Amazon software constitutes your acceptance of the terms of
the Amazon Program Materials License Agreement (including the AVS Component
Schedule, if applicable), located at
@@ -472,6 +475,10 @@ assert claims in small claims court if your claims qualify.
Amphion Semiconductor Ltd.: Distribution of Amphion software must be a part of,
or embedded within, Authorized Systems that include an Amphion Video Decoder.
+Apple MFi Software Development Kit: Use of Apple MFi Software and associated
+documentation is restricted to current Apple MFi licensees in accordance with
+the terms of their own valid and in-effect license from Apple.
+
Aquantia Corp.: You may use Aquantia's API binaries solely to flash the API
software to an NXP Product which mates with an Aquantia device.
@@ -555,6 +562,10 @@ software product be used in any way that would compete with any product from
Fenopix. License to the CanvasJS software will terminate immediately without
notice if Licensee fail to comply with any provision of this Agreement.
+Fraunhofer IIS: Fraunhofer MPEG Audio Decoder (Fraunhofer copyright) - If you
+are provided MPEG-H decoding functionality, you understand that NXP will
+provide Fraunhofer your name and contact information.
+
Future Technology Devices International Ltd.: Future Technology Devices
International software must be used consistent with the terms found here:
http://www.ftdichip.com/Drivers/FTDriverLicenceTerms.htm
diff --git a/SCR/SCR-5.10.52-2.1.0.txt b/SCR/SCR-5.10.72-2.2.0.txt
index 5a911cd8..2c5209b6 100644
--- a/SCR/SCR-5.10.52-2.1.0.txt
+++ b/SCR/SCR-5.10.72-2.2.0.txt
@@ -1,15 +1,15 @@
NXP Software Content Register
-Release - Linux 5.10.52-2.1.0
- September 2021
+Release - Linux 5.10.72-2.2.0
+ December 2021
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Yocto Project recipe manifest:
-repo init -u https://source.codeaurora.org/external/imx/imx-manifest -b imx-linux-hardknott -m imx-5.10.52-2.1.0.xml
+repo init -u https://source.codeaurora.org/external/imx/imx-manifest -b imx-linux-hardknott -m imx_5.10.72-2.2.0.xml
-Release tag: lf-5.10.52-2.1.0
+Release tag: rel_imx_5.10.72-2.2.0
--------------------------------------------
BSP Packages
@@ -22,7 +22,7 @@ License File: COPYING
Package Category: BSP
Type of Content: source
Description and comments: The Linux kernel with i.MX-specific drivers
-Release Location: https://source.codeaurora.org/external/imx/linux-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/linux-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (GPL-2.0)
kernel.org (GPL-2.0) - https://www.kernel.org/
@@ -35,7 +35,7 @@ License File: Licenses/gpl-2.0.txt
Package Category: BSP
Type of Content: source
Description and comments: Bootloader with i.MX-specific capabilities
-Release Location: https://source.codeaurora.org/external/imx/uboot-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/uboot-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (GPL-2.0)
Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome
Android Open Source Project (BSD-2-Clause) - https://source.android.com/
@@ -50,15 +50,15 @@ License File: docs/license.rst
Package Category: BSP
Type of Content: source
Description and comments: ARM Trusted Firmware
-Release Location: https://source.codeaurora.org/external/imx/imx-atf -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-atf -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-3-clause)
arm-trusted-firmware - ARM Limited (BSD-3-clause) - http://github.com/ARM-software/arm-trusted-firmware/
--------------------------------------------
-Package: imx-sc-firmware-1.10.0.bin
-Version: 1.10.0
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-sc-firmware-1.11.0.bin
+Version: 1.11.0
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: BSP
Type of Content: binary
@@ -69,9 +69,9 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: firmware-imx-8.13.bin
-Version: 8.13
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: firmware-imx-8.14.bin
+Version: 8.14
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: BSP
Type of Content: binary
@@ -80,7 +80,7 @@ Release Location: Mirror
Origin: NXP (proprietary)
In addition, these components contain code from the companies listed below.
- DDR: origin: Synopsys (proprietary)
+ DDR: origin: Synopsys DDR (proprietary)
EASRC: origin: NXP (proprietary)
EPDC: origin: E Ink Corporation (proprietary)
HDMI: origin: Cadence Design Systems, Inc. (proprietary)
@@ -113,9 +113,9 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: firmware-upower-0.1.bin
-Version: 0.1
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: firmware-upower-0.1.1.bin
+Version: 0.1.1
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: BSP
Type of Content: binary
@@ -132,7 +132,7 @@ License File: COPYING
Package Category: BSP
Type of Content: source
Description and comments: Make Image BootLoader
-Release Location: https://source.codeaurora.org/external/imx/imx-mkimage -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-mkimage -b rel_imx_5.10.72-2.2.0
Origin: NXP (GPL-2.0)
Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome
@@ -157,7 +157,7 @@ License File: COPYING
Package Category: BSP
Type of Content: source
Description and comments: Linux unit test applications
-Release Location: https://source.codeaurora.org/external/imx/imx-test -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-test -b rel_imx_5.10.72-2.2.0
Origin: NXP (GPL-2.0)
module_test: NXP (GPL-2.0+)
Hantro Products Oy. (GPL-2.0+)
@@ -242,14 +242,14 @@ License File: mxm_wifiex/wlan_src/gpl-2.0.txt
Package Category: BSP
Type of Content: source
Description and comments: NXP Wi-Fi linux SDK
-Release Location: https://source.codeaurora.org/external/imx/mwifiex -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/mwifiex -b rel_imx_5.10.72-2.2.0
Origin: NXP (GPL-2.0)
--------------------------------------------
-Package: imx-seco-3.8.2.bin
-Version: 3.8.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-seco-3.8.4.bin
+Version: 3.8.4
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: BSP
Type of Content: binary
@@ -261,18 +261,30 @@ Origin: NXP (proprietary)
Package: imx-seco-libs.git
Version:
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Outgoing License: LA_OPT_NXP_Software_License v29 August 2021 - Additional distribution license granted - Section 2.3 applies
License File: EULA.txt
Package Category: BSP
Type of Content: source
Description and comments: BSP source - SECO
-Release Location: https://github.com/NXP/imx-seco-libs.git -b lf-5.10.52-2.1.0
+Release Location: https://github.com/NXP/imx-seco-libs.git -b rel_imx_5.10.72-2.2.0
+Origin: NXP (proprietary)
+
+--------------------------------------------
+
+Package: imx-secure-enclave.git
+Version:
+Outgoing License: LA_OPT_NXP_Software_License v29 August 2021 - Additional distribution license granted - Section 2.3 applies
+License File: EULA.txt
+Package Category: BSP
+Type of Content: source
+Description and comments: NXP IMX SECURE ENCLAVE library
+Release Location: https://github.com/NXP/imx-secure-enclave.git -b rel_imx_5.10.72-2.2.0
Origin: NXP (proprietary)
--------------------------------------------
-Package: sof-imx-1.9.0-1
-Version: 1.9.0-1
+Package: sof-imx-1.9.0-2
+Version: 1.9.0-2
Outgoing License: BSD-3-Clause
License File: LICENCE
Package Category: BSP
@@ -330,26 +342,26 @@ Origin: NXP (GPL-2.0)
--------------------------------------------
Package: imx-optee-client.git
-Version: 3.13.0.imx
+Version: 3.15.0.imx
Outgoing License: BSD-2-Clause
License File: LICENSE
Package Category: BSP
Type of Content: source
Description and comments: Open Portable Trusted Execution Environment for TEE Client library
-Release Location: https://source.codeaurora.org/external/imx/imx-optee-client -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-optee-client -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-2-Clause)
optee_client (BSD-2-Clause) - https://github.com/OP-TEE/optee_client
--------------------------------------------
Package: imx-optee-os.git
-Version: 3.13.0.imx
+Version: 3.15.0.imx
Outgoing License: BSD-2-Clause
License File: LICENSE
Package Category: BSP
Type of Content: source
Description and comments: Open Portable Trusted Execution Environment for Linux on ARM
-Release Location: https://source.codeaurora.org/external/imx/imx-optee-os -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-optee-os -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-2-Clause)
OP-TEE Trusted OS (BSD-2-Clause) - https://github.com/OP-TEE/optee_os
Mbed TLS (Apache-2.0) - https://github.com/ARMmbed/mbedtls/
@@ -357,13 +369,13 @@ Origin: NXP (BSD-2-Clause)
--------------------------------------------
Package: imx-optee-test.git
-Version: 3.13.0.imx
+Version: 3.15.0.imx
Outgoing License: BSD-2-Clause (ta/) and GPL-2.0 (host/)
License File: LICENSE.md
Package Category: BSP
Type of Content: source
Description and comments: Open Portable Trusted Execution Environment sanity tests
-Release Location: https://source.codeaurora.org/external/imx/imx-optee-test -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-optee-test -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-2-Clause)
optee_test (BSD-2-Clause) - https://github.com/OP-TEE/optee_test
@@ -376,7 +388,7 @@ License File: COPYING
Package Category: BSP
Type of Content: source
Description and comments: A partitioning Hypervisor based on Linux
-Release Location: https://source.codeaurora.org/external/imx/imx-jailhouse -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-jailhouse -b rel_imx_5.10.72-2.2.0
Origin: NXP (GPL-2.0)
Siemens AG (GPL-2.0) - https://github.com/siemens/jailhouse
@@ -389,14 +401,14 @@ License File: COPYING
Package Category: BSP
Type of Content: source
Description and comments: A Virtual Machine Monitor
-Release Location: https://source.codeaurora.org/external/imx/imx-xen -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-xen -b rel_imx_5.10.72-2.2.0
Origin: NXP (GPL-2.0)
--------------------------------------------
-Package: imx8ulp-m33-demo-2.10.0.bin
-Version: 2.10.0
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx8ulp-m33-demo-2.11.0.bin
+Version: 2.11.0
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: BSP
Type of Content: binary
@@ -428,7 +440,7 @@ License File: COPYING
Package Category: BSP
Type of Content: source
Description and comments: NXP i.MX Security Middleware Library
-Release Location: https://source.codeaurora.org/external/imx/imx-smw -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-smw -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-3-Clause)
--------------------------------------------
@@ -440,7 +452,7 @@ License File: COPYING
Package Category: BSP
Type of Content: source
Description and comments: NXP i.MX keyctl tool to manage CAAM Keys
-Release Location: https://source.codeaurora.org/external/imx/keyctl_caam -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/keyctl_caam -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-3-Clause)
--------------------------------------------
@@ -459,13 +471,13 @@ Origin: NXP (proprietary)
--------------------------------------------
Package: v2xsehsm.git
-Version: 0.6
+Version:
Outgoing License: BSD-3-Clause
License File: BSD-3-Clause.txt
Package Category: BSP
Type of Content: source
Description and comments: V2X Secure Element library
-Release Location: https://source.codeaurora.org/external/imx/v2xsehsm -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/v2xsehsm -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-3-Clause)
--------------------------------------------
@@ -477,7 +489,7 @@ License File: BSD-3-Clause.txt
Package Category: BSP
Type of Content: source
Description and comments: V2X Test Suite
-Release Location: https://source.codeaurora.org/external/imx/vtest -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/vtest -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-3-Clause)
--------------------------------------------
@@ -489,7 +501,7 @@ License File: license/bsd-3-clause.txt
Package Category: BSP
Type of Content: source
Description and comments: Data Plane Development Kit
-Release Location: https://source.codeaurora.org/external/qoriq/qoriq-components/dpdk -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/qoriq/qoriq-components/dpdk -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-3-Clause)
DPDK - Intel Corporation (BSD-3-Clause) - https://github.com/DPDK/dpdk
KNI Linux Device driver - Intel Corporation (GPL-2.0) Separate component of DPDK
@@ -501,20 +513,20 @@ Graphics Packages
--------------------------------------------
Package: isp-vvcam.git
-Version: 4.2.2.15.0
+Version: 4.2.2.16.0
Outgoing License: GPL-2.0
License File: vvcam/LICENSE
Package Category: Graphics
Type of Content: ISP Kernel Module source
Description and comments: Kernel Loadable Module for ISP
-Release Location: https://source.codeaurora.org/external/imx/isp-vvcam -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/isp-vvcam -b rel_imx_5.10.72-2.2.0
Origin: VeriSilicon Holdings Co., Ltd. (GPL-2.0)
--------------------------------------------
-Package: isp-imx-4.2.2.15.0.bin
-Version: 4.2.2.15.0
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: isp-imx-4.2.2.16.0.bin
+Version: 4.2.2.16.0
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Graphics
Type of Content: binary and source
@@ -524,9 +536,9 @@ Origin: VeriSilicon Holdings Co., Ltd. (proprietary)
--------------------------------------------
-Package: basler-camera-4.2.2.15.0.bin
-Version: 4.2.2.15.0
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: basler-camera-4.2.2.16.0.bin
+Version: 4.2.2.16.0
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Graphics
Type of Content: binary
@@ -538,21 +550,21 @@ Origin: Basler AG (proprietary)
--------------------------------------------
Package: apitrace-imx.git
-Version: 9.0.0
+Version: 10.0.0
Outgoing License: MIT
License File: LICENSE
Package Category: Graphics
Type of Content: source
Description and comments: GPU Core IP and test application source
-Release Location: https://source.codeaurora.org/external/imx/apitrace-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/apitrace-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (MIT)
apitrace (MIT) - https://github.com/apitrace/apitrace
--------------------------------------------
-Package: imx-gpu-viv-6.4.3.p2.2-aarch32.bin
-Version: 6.4.3.p2.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-gpu-viv-6.4.3.p2.4-aarch32.bin
+Version: 6.4.3.p2.4
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Graphics
Type of Content: binary and source
@@ -569,9 +581,9 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: imx-gpu-viv-6.4.3.p2.2-aarch64.bin
-Version: 6.4.3.p2.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-gpu-viv-6.4.3.p2.4-aarch64.bin
+Version: 6.4.3.p2.4
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Graphics
Type of Content: binary and source
@@ -595,7 +607,7 @@ License File: COPYING-MIT
Package Category: Graphics
Type of Content: source
Description and comments: Xserver Library extensions
-Release Location: https://source.codeaurora.org/external/imx/xf86-video-imx-vivante -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/xf86-video-imx-vivante -b rel_imx_5.10.72-2.2.0
Origin: NXP (MIT)
Vivante Corp. (MIT)
xorg-server (MIT) - http://xorg.freedesktop.org/
@@ -608,13 +620,13 @@ Origin: NXP (MIT)
--------------------------------------------
Package: gtec-demo-framework.git
-Version: 5.7.1
+Version: 5.8.0
Outgoing License: BSD-3-Clause
License File: License.md
Package Category: Graphics
Type of Content: source
Description and comments: Graphics sample applications
-Release Location: https://github.com/NXPmicro/gtec-demo-framework -b 5.7.1
+Release Location: https://github.com/NXPmicro/gtec-demo-framework -b 5.8.0
Origin: NXP (BSD-3-clause)
Demo Framework
Sascha Willems - Vulkan demo (MIT) - https://github.com/SaschaWillems/Vulkan
@@ -666,19 +678,19 @@ License File: COPYING
Package Category: Graphics
Type of Content: source
Description and comments: i.MX DRM Direct Rendering Manager
-Release Location: https://source.codeaurora.org/external/imx/libdrm-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/libdrm-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (MIT)
--------------------------------------------
Package: wayland-protocols-imx.git
-Version: 1.20.imx
+Version: 1.22.imx
Outgoing License: MIT
License File: COPYING
Package Category: Graphics
Type of Content: source
Description and comments: Wayland protocol development
-Release Location: https://source.codeaurora.org/external/imx/wayland-protocols-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/wayland-protocols-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (MIT)
Weston (MIT) - https://anongit.freedesktop.org/git/wayland/wayland-protocols.git
@@ -691,27 +703,27 @@ License File: COPYING
Package Category: Graphics
Type of Content: source
Description and comments: A reference implementation of a Wayland compositor
-Release Location: https://source.codeaurora.org/external/imx/weston-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/weston-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (MIT)
Weston (MIT) - http://github.com/wayland-project/weston/
--------------------------------------------
Package: imx-gputop.git
-Version: 6.4.3.p2.2
+Version: 6.4.3.p2.4
Outgoing License: MIT
License File: LICENSE.txt
Package Category: Graphics
Type of Content: source
Description and comments: Sample program to monitor i.MX GPU performance data
-Release Location: https://source.codeaurora.org/external/imx/imx-gputop -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-gputop -b rel_imx_5.10.72-2.2.0
Origin: NXP (MIT)
--------------------------------------------
-Package: imx-gpu-g2d-6.4.3.p2.2-arm.bin
-Version: 6.4.3.p2.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-gpu-g2d-6.4.3.p2.4-arm.bin
+Version: 6.4.3.p2.4
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Graphics
Type of Content: binary
@@ -721,9 +733,9 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: imx-gpu-g2d-6.4.3.p2.2-aarch64.bin
-Version: 6.4.3.p2.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-gpu-g2d-6.4.3.p2.4-aarch64.bin
+Version: 6.4.3.p2.4
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Graphics
Type of Content: binary
@@ -733,9 +745,21 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: libgpuperfcnt-6.4.3.p2.2-aarch64-fb.bin
-Version: 6.4.3.p2.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-g2d-samples.git
+Version: 1.0.0
+Outgoing License: BSD-3-Clause
+License File: COPYING
+Package Category: Graphics
+Type of Content: source
+Description and comments: Graphics G2D sample applications
+Release Location: https://source.codeaurora.org/external/imx/g2d-samples -b rel_imx_5.10.72-2.2.0
+Origin: NXP (BSD-3-Clause)
+
+--------------------------------------------
+
+Package: libgpuperfcnt-6.4.3.p2.4-aarch64-fb.bin
+Version: 6.4.3.p2.4
+Outgoing License: LA_OPT_NXP_Software_License v29 August 2021 - Production Use - Section 2.3 applies
License File: COPYING
Package Category: Graphics
Type of Content: binary
@@ -745,9 +769,9 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: libgpuperfcnt-6.4.3.p2.2-aarch64-wayland.bin
-Version: 6.4.3.p2.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: libgpuperfcnt-6.4.3.p2.4-aarch64-wayland.bin
+Version: 6.4.3.p2.4
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Graphics
Type of Content: binary
@@ -757,9 +781,9 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: libgpuperfcnt-6.4.3.p2.2-arm-fb.bin
-Version: 6.4.3.p2.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: libgpuperfcnt-6.4.3.p2.4-arm-fb.bin
+Version: 6.4.3.p2.4
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Graphics
Type of Content: binary
@@ -769,9 +793,9 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: libgpuperfcnt-6.4.3.p2.2-arm-wayland.bin
-Version: 6.4.3.p2.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: libgpuperfcnt-6.4.3.p2.4-arm-wayland.bin
+Version: 6.4.3.p2.4
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Graphics
Type of Content: binary
@@ -788,7 +812,7 @@ License File: LICENSE
Package Category: Graphics
Type of Content: source
Description and comments: i.MX Neural Networks Accelerator Plugin
-Release Location: https://source.codeaurora.org/external/imx/nn-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/nn-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (MIT)
Vivante Corporation (MIT)
Boost Software (Boost) - https://www.boost.org/
@@ -806,7 +830,7 @@ License File: LICENSE
Package Category: Graphics
Type of Content: source
Description and comments: i.MX OpenCV
-Release Location: https://source.codeaurora.org/external/imx/opencv-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/opencv-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-3-Cluse)
OpenCV Foundation (BSD-3-Clause) - https://github.com/opencv/opencv
Intel Corporation (BSD-3-Clause)
@@ -818,13 +842,13 @@ Origin: NXP (BSD-3-Cluse)
--------------------------------------------
Package: arm-computelibrary-imx.git
-Version: 21.02
+Version: 21.08
Outgoing License: MIT
License File: LICENSE
Package Category: Graphics
Type of Content: source
Description and comments: ARM Compute Library fork
-Release Location: https://source.codeaurora.org/external/imx/arm-computelibrary-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/arm-computelibrary-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (MIT)
ARM Software (MIT) - https://github.com/ARM-software/ComputeLibrary
@@ -832,13 +856,13 @@ Origin: NXP (MIT)
Multimedia Packages
--------------------------------------------
-Package: imx-codec-4.6.2.bin
-Version: 4.6.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-codec-4.6.3.bin
+Version: 4.6.3
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Multimedia
Type of Content: binary
-Description and comments: i.MX multimedia codec libraries: Codecs and wrappers for: AAC AACD BMP BSAC DeInterlace FLAC GIF JPEG MP3 MP3d NB_AMR OGG PEQ PNG SBC SRC WB_AMR WBAMRD G.711 G.723 G.726 G.729ab
+Description and comments: i.MX multimedia codec libraries: Codecs and wrappers for: AAC AACD BMP BSAC DeInterlace FLAC GIF JPEG MP3 MP3d NB_AMR OGG PEQ PNG SBC SRC WB_AMR WBAMRD G.711 G.723 G.726 G.729ab
Release Location: Mirror
Origin: NXP (proprietary)
ISO/IEC 13818-7 and ISO/IEC 14496-3 standards
@@ -849,9 +873,9 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: imx-parser-4.6.2.bin
-Version: 4.6.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-parser-4.6.3.bin
+Version: 4.6.3
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Multimedia
Type of Content: binary
@@ -862,13 +886,13 @@ Origin: NXP (proprietary)
--------------------------------------------
Package: imx-gst1.0-plugin.git
-Version: 4.6.2
+Version: 4.6.3
Outgoing License: LGPL-2.1
License File: COPYING-LGPL-2.1
Package Category: Multimedia
Type of Content: source
Description and comments: i.MX Gstreamer 1.0 plugins
-Release Location: https://source.codeaurora.org/external/imx/imx-gst1.0-plugin -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/imx-gst1.0-plugin -b rel_imx_5.10.72-2.2.0
Origin: NXP (LGPL-2.1)
Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/
Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/
@@ -877,52 +901,52 @@ Origin: NXP (LGPL-2.1)
--------------------------------------------
Package: gstreamer.git
-Version: 1.18.0.imx
+Version: 1.18.5.imx
Outgoing License: LGPL-2.0
License File: COPYING
Package Category: Multimedia
Type of Content: source
Description and comments: Open Source Multimedia Farmework
-Release Location: https://source.codeaurora.org/external/imx/gstreamer -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/gstreamer -b rel_imx_5.10.72-2.2.0
Origin: NXP (LGPL-2.1)
GStreamer (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gstreamer/
--------------------------------------------
Package: gst-plugins-good.git
-Version: 1.18.0.imx
+Version: 1.18.5.imx
Outgoing License: LGPL-2.1
License File: COPYING
Package Category: Multimedia
Type of Content: source
Description and comments: Gstreamer plugins with good quality code and correct functionality
-Release Location: https://source.codeaurora.org/external/imx/gst-plugins-good -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/gst-plugins-good -b rel_imx_5.10.72-2.2.0
Origin: NXP (LGPL-2.1)
Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/
--------------------------------------------
Package: gst-plugins-base.git
-Version: 1.18.0.imx
+Version: 1.18.5.imx
Outgoing License: LGPL-2.0
License File: COPYING
Package Category: Multimedia
Type of Content: source
Description and comments: Collection of well-groomed and well-maintained Gstreamer plugins
-Release Location: https://source.codeaurora.org/external/imx/gst-plugins-base -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/gst-plugins-base -b rel_imx_5.10.72-2.2.0
Origin: NXP (LGPL-2.1)
Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/
--------------------------------------------
Package: gst-plugins-bad.git
-Version: 1.18.0.imx
-Outgoing License: LGPL-2.0
-License File: COPYING.LIB
+Version: 1.18.5.imx
+Outgoing License: LGPL-2.1
+License File: COPYING
Package Category: Multimedia
Type of Content: source
Description and comments: Gstreamer plug-ins that aren't up to par compared to the rest. Close to good quality but missing something.
-Release Location: https://source.codeaurora.org/external/imx/gst-plugins-bad -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/gst-plugins-bad -b rel_imx_5.10.72-2.2.0
Origin: NXP (LGPL-2.1)
Gstreamer plugins-Bad (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-bad/
@@ -941,9 +965,9 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: imx-sw-pdm-1.0.1.bin
-Version: 1.0.1
-Outgoing License: LA_OPT_NXP_Software_License v15 August 2020 - Additional distribution license granted - Section 2.3 applies
+Package: imx-sw-pdm-1.0.2.bin
+Version: 1.0.2
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Multimedia
Type of Content: binary
@@ -954,13 +978,13 @@ Origin: NXP (proprietary)
--------------------------------------------
Package: imx-vpuwrap.git
-Version: 4.6.2
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Version: 4.6.3
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Multimedia
Type of Content: source
Description and comments: i.MX VPU wrapper library
-Release Location: https://github.com/NXP/imx-vpuwrap.git -b lf-5.10.52-2.1.0
+Release Location: https://github.com/NXP/imx-vpuwrap.git -b rel_imx_5.10.72-2.2.0
Origin: NXP (proprietary)
sqlite (Public Domain) - http://www.hwaci.com/sw/sqlite/index.html
@@ -979,9 +1003,9 @@ Origin: NXP (proprietary)
--------------------------------------------
-Package: imx-vpu-hantro-1.23.0.bin
-Version: 1.23.0
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-vpu-hantro-1.24.0.bin
+Version: 1.24.0
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Multimedia
Type of Content: binary
@@ -994,8 +1018,8 @@ Origin: VeriSilicon Inc. (proprietary)
--------------------------------------------
-Package: imx-vpu-hantro-daemon-1.1.0
-Version: 1.1.0
+Package: imx-vpu-hantro-daemon-1.1.1
+Version: 1.1.1
Outgoing License: MIT License
License File: LICENSE.txt
Package Category: Multimedia
@@ -1008,9 +1032,9 @@ Origin: NXP (MIT)
--------------------------------------------
-Package: imx-vpu-hantro-vc-1.5.0.bin
-Version: 1.5.0
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: imx-vpu-hantro-vc-1.6.0.bin
+Version: 1.6.0
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: Multimedia
Type of Content: binary
@@ -1060,6 +1084,34 @@ Origin: NXP (GPL-2.0)
--------------------------------------------
+Package: imx-dsp-1.2.0.bin
+Version: 1.2.0
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
+License File: COPYING
+Package Category: Multimedia
+Type of Content: binary
+Description and comments: Proprietary codecs and parsers
+Release Location: Mirror
+Origin: NXP (proprietary)
+ Cadence (MIT)
+ Matt Redfearn (BSD-3-clause)
+
+--------------------------------------------
+
+Package: imx-dsp-codec-ext-1.2.0.bin
+Version: 1.2.0
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
+License File: COPYING
+Package Category: Multimedia
+Type of Content: binary
+Description and comments: Proprietary codecs and parsers
+Release Location: Mirror
+Origin: NXP (proprietary)
+ autoconf - Free Software Foundation (FSF All Permissive License)
+ X Consortium (MIT)
+
+--------------------------------------------
+
Package: nxp-afe.git
Version: 1.0
Outgoing License: BSD-3-Clause
@@ -1067,7 +1119,7 @@ License File: LICENSE
Package Category: Multimedia
Type of Content: source
Description and comments: NXP Audio-Front-end is the software wrapper for ALSA
-Release Location: https://source.codeaurora.org/external/imx/nxp-afe -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/nxp-afe -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-3-Clause)
--------------------------------------------
@@ -1206,13 +1258,13 @@ MachineLearning Packages
--------------------------------------------
Package: armnn.git
-Version: 21.02
+Version: 21.08
Outgoing License: MIT
License File: LICENSE
Package Category: MachineLearning
Type of Content: source
Description and comments: ARM Neural Network SDK
-Release Location: https://source.codeaurora.org/external/imx/armnn-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/armnn-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (MIT)
armnn (MIT) - https://github.com/ARM-software/armnn
@@ -1225,15 +1277,15 @@ License File: LICENSE
Package Category: MachineLearning
Type of Content: source
Description and comments: Google Coral Edge TPU Posenet Library
-Release Location: https://source.codeaurora.org/external/imx/coral-posenet-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/coral-posenet-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (LGPL-2.1)
Google LLC - Google Coral Edge Project Posenet (Apache-2.0) https://github.com/google-coral/project-posenet/
--------------------------------------------
-Package: deepview-rt-2.4.28-aarch64.bin
-Version: 2.4.28-aarch64
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - No distribution license granted - Section 2.2 applies
+Package: deepview-rt-2.4.32-aarch64.bin
+Version: 2.4.32-aarch64
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - No distribution license granted - Section 2.2 applies
License File: COPYING
Package Category: MachineLearning
Type of Content: binary
@@ -1243,9 +1295,9 @@ Origin: Au-Zone Technologies (proprietary)
--------------------------------------------
-Package: deepview-rt-examples-1.1.bin
-Version: 1.1
-Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies
+Package: deepview-rt-examples-1.2.bin
+Version: 1.2
+Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 - Additional distribution license granted - Section 2.3 applies
License File: COPYING
Package Category: MachineLearning
Type of Content: binary
@@ -1263,7 +1315,7 @@ License File: COPYING-LGPL2.1
Package Category: MachineLearning
Type of Content: source
Description and comments: Gstreamer Neural Network inference Demo
-Release Location: https://source.codeaurora.org/external/imx/eiq-apps-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/eiq-apps-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (LGPL-2.1)
Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/
@@ -1276,20 +1328,20 @@ License File: LICENSE
Package Category: MachineLearning
Type of Content: source
Description and comments: Open Deep Learning Compiler Stack
-Release Location: https://source.codeaurora.org/external/imx/eiq-tvm-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/eiq-tvm-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (Apache-2.0)
Apache TVM (Apache-2.0) - https://github.com/apache/tvm
--------------------------------------------
Package: onnxruntime-imx.git
-Version: 1.8.1
+Version: 1.8.2
Outgoing License: MIT
License File: LICENSE
Package Category: MachineLearning
Type of Content: source
Description and comments: Onnxruntime cross-platform scoring engine
-Release Location: https://source.codeaurora.org/external/imx/onnxruntime-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/onnxruntime-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (MIT)
Microsoft/onnxruntime (MIT) - https://github.com/Microsoft/onnxruntime
Google's Protocol Buffer (BSD-3-clause) - https://tracker.debian.org/pkg/protobuf
@@ -1304,7 +1356,7 @@ License File: LICENSE
Package Category: MachineLearning
Type of Content: source
Description and comments: Tensors and Dynamic neural networks in Python with strong GPU acceleration
-Release Location: https://github.com/NXPmicro/pytorch-release -b lf-5.10.52-2.1.0
+Release Location: https://github.com/NXPmicro/pytorch-release -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-3-Clause)
pytorch (BSD-3-clause) - https://github.com/pytorch/pytorch
@@ -1317,33 +1369,46 @@ License File: LICENSE
Package Category: MachineLearning
Type of Content: source
Description and comments: The torchvision package consists of popular datasets model architectures and common image transformations for computer vision
-Release Location:
+Release Location: https://github.com/NXPmicro/pytorch-release -b rel_imx_5.10.72-2.2.0
Origin: NXP (BSD-3-Clause)
pytorch (BSD-3-clause) - https://github.com/pytorch/pytorch
--------------------------------------------
Package: tensorflow-imx.git
-Version: 2.5.0
+Version: 2.6.0
Outgoing License: Apache-2.0
License File: LICENSE
Package Category: MachineLearning
Type of Content: source
Description and comments: TensorFlow Lite C++ Library
-Release Location: https://source.codeaurora.org/external/imx/tensorflow-imx -b lf-5.10.52-2.1.0
+Release Location: https://source.codeaurora.org/external/imx/tensorflow-imx -b rel_imx_5.10.72-2.2.0
Origin: NXP (Apache-2.0)
TensorFlow (Apache-2.0) - https://github.com/tensorflow/tensorflow/
--------------------------------------------
+Package: tflite-vx-delegate-imx.git
+Version: 2.6.0
+Outgoing License: Apache-2.0
+License File: LICENSE
+Package Category: MachineLearning
+Type of Content: source
+Description and comments: TensorFlow Lite VX Delegate
+Release Location: https://source.codeaurora.org/external/imx/tflite-vx-delegate-imx -b rel_imx_5.10.72-2.2.0
+Origin: VeriSilicon Inc. (Apache-2.0) - https://github.com/VeriSilicon/tflite-vx-delegate.git
+ The TensorFlow Authors (Apache-2.0) - https://cs.opensource.google/tensorflow/tensorflow/+/master:tensorflow/lite/examples/minimal/
+
+--------------------------------------------
+
Package: tim-vx-imx.git
-Version: 1.1.32
+Version: 1.1.34
Outgoing License: MIT
License File: LICENSE
Package Category: MachineLearning
Type of Content: source
Description and comments: Tensor Interface Module for OpenVX
-Release Location: https://github.com/nxp/tim-vx-imx -b lf-5.10.52-2.1.0
+Release Location: https://github.com/nxp/tim-vx-imx -b rel_imx_5.10.72-2.2.0
Origin: Vivante Corporation (MIT)
The Khronos Group Inc. (Apache-2.0) - https://www.khronos.org/
The Android Open Source Project (Apache 2.0) - https://developer.android.com/index.html
@@ -1352,16 +1417,14 @@ Origin: Vivante Corporation (MIT)
Tools Packages
--------------------------------------------
-Package: VeriSiliconTool-6.4.3.p2.2.tgz
-Version: 6.4.3.p2.2
+Package: VivanteIDE-6.4.3.p2.4.tgz
+Version: 6.4.3.p2.4
Outgoing License: VeriSilicon License
License File:
Package Category: Tools
Type of Content: binary
Description and comments: VeriSilicon Tools
Release Location: nxp.com
-Origin: VeriSilicon (proprietary)
-
--------------------------------------------
Package: mfgtools.git
@@ -1371,7 +1434,7 @@ License File: LICENSE
Package Category: Tools
Type of Content: source
Description and comments: NXP I.MX Chip image deploy tools. Use uuu.
-Release Location: ssh://git@bitbucket.sw.nxp.com/imx/mfgtools-rel.git -b master
+Release Location: https://github.com/NXPmicro/mfgtools -b master
Origin: NXP (BSD-3-clause)
zlib (zlib) - https://github.com/madler/zlib
libusb (LGPL-2.1) [libusb-1.0.dll] [dynamic link] - https://github.com/libusb/libusb
@@ -1387,7 +1450,7 @@ License File: LICENSE
Package Category: Tools
Type of Content: source
Description and comments: NXP I.MX Chip image deploy tools. Use bcu.
-Release Location: https://github.com/NXPmicro/bcu -b master
+Release Location: ssh://git@bitbucket.sw.nxp.com/imx/bcu.git -b master
Origin: NXP (BSD-3-Clause)
--------------------------------------------
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index 5e66a1fc..857c4ca0 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -39,6 +39,8 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V24 = "417b82f17fc02b88125331ed
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V24.1 = "b3b0bab6ff55420d043cf1652c52d788"
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V25 = "f35df765ff17e69043ea21f350e3229c"
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V27 = "e565271ec9a80ce47abbddc4bffe56fa"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V29 = "28241cb895217d7946e40e7227136d02"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V30 = "03bcadc8dc0a788f66ca9e2b89f56c6f"
FSL_EULA_FILE_MD5SUMS = " \
${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10} \
@@ -73,11 +75,13 @@ FSL_EULA_FILE_MD5SUMS = " \
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V24.1} \
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V25} \
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V27} \
+ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V29} \
+ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V30} \
"
# The checksum for the EULA in the layer
FSL_EULA_FILE_MD5SUM ?= \
- "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V27}"
+ "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V30}"
LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE"
diff --git a/classes/fsl-vivante-kernel-driver-handler.bbclass b/classes/fsl-vivante-kernel-driver-handler.bbclass
index 54954aab..c226b0ab 100644
--- a/classes/fsl-vivante-kernel-driver-handler.bbclass
+++ b/classes/fsl-vivante-kernel-driver-handler.bbclass
@@ -41,9 +41,9 @@ python fsl_vivante_kernel_driver_handler () {
return
if use_vivante_kernel_driver_module != "1":
- e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
- e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
- e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
+ e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv')
+ e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv')
+ e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv')
}
addhandler fsl_vivante_kernel_driver_handler
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 3ffa7cbd..19b43312 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -85,7 +85,6 @@ do_deploy:append() {
j=$(expr $j + 1);
if [ $j -eq $i ]
then
- install -m 0644 ${B}/${config}/u-boot.itb ${DEPLOYDIR}/u-boot.itb-${MACHINE}-${type}
install -m 0644 ${B}/${config}/flash.bin ${DEPLOYDIR}/flash.bin-${MACHINE}-${type}
# When there's more than one word in UBOOT_CONFIG,
# this will overwrite the links created in
@@ -94,7 +93,6 @@ do_deploy:append() {
# word in UBOOT_CONFIG. This is also how all other
# artifacts handled by oe-core's u-boot.inc are
# treated.
- ln -sf u-boot.itb-${MACHINE}-${type} u-boot.itb
ln -sf flash.bin-${MACHINE}-${type} flash.bin
fi
done
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/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index cea44ed1..cb63dceb 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -4,15 +4,18 @@
#@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit
#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
-MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
+MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mq:"
require conf/machine/include/imx-base.inc
require conf/machine/include/arm/armv8a/tune-cortexa53.inc
-IMX_DEFAULT_BSP = "nxp"
+# Mainline BSP defaults to "generic" cortexa53 configuration,
+# adjust it here to include crypto extension which enables
+# inline NEON and FPU code generation
+DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
-MACHINE_FEATURES += "pci wifi bluetooth optee bcm43455 bcm4356"
-MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359"
MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
@@ -64,11 +67,34 @@ UBOOT_DTB_NAME = "imx8mq-evk.dtb"
# Set ATF platform name
ATF_PLATFORM = "imx8mq"
+ATF_LOAD_ADDR = "0x910000"
+
+# Extra firmware package name, that is required to build boot container for fslc bsp
+IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
# Set imx-mkimage boot target
IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk"
IMX_BOOT_SOC_TARGET = "iMX8M"
+# Add support for Syslinux to mainline BSP.
+# U-Boot has the Distro Boot mode enabled by default, which
+# require that either Syslinux to be enabled, or a boot script
+# to be used to define the boot process.
+# We opt-in for Syslinux, since it is designated as a preferred
+# distro boot mode according to the U-Boot documentation.
+UBOOT_EXTLINUX:use-mainline-bsp = "1"
+UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default"
+UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Quad EVK"
+
+UBOOT_EXTLINUX_MENU_DESCRIPTION:default:use-mainline-bsp = "i.MX8M Quad EVK"
+UBOOT_EXTLINUX_FDT:default:use-mainline-bsp = "../imx8mq-evk.dtb"
+UBOOT_EXTLINUX_CONSOLE:default:use-mainline-bsp = "console=${console}"
+UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp ??= "root=/dev/mmcblk1p2"
+
+# Add extlinux.conf to the lis of files, which are deployed onto the
+# boot partition
+IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
+
LOADADDR = ""
UBOOT_SUFFIX = "bin"
UBOOT_MAKE_TARGET = ""
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.13.inc b/recipes-bsp/firmware-imx/firmware-imx-8.14.inc
index ff739c4c..5af24283 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.13.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.14.inc
@@ -3,14 +3,14 @@
# Copyright (C) 2018 O.S. Systems Software LTDA.
SECTION = "base"
LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f"
SRC_URI = " \
${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
"
-SRC_URI[md5sum] = "97eb12ba899bc29a5375993889708bfb"
-SRC_URI[sha256sum] = "8b7aa9b41a0389e5f40bdf91cb1224f79ea4c2e7fc36292f27ad4bef7044d7f0"
+SRC_URI[md5sum] = "3357c84e48fdc220984a9642d1e808f6"
+SRC_URI[sha256sum] = "bfe9c57857e8442e7eb26ba3e1020733b09a7c9b83952ad4822980546c58a7f4"
S = "${WORKDIR}/firmware-imx-${PV}"
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb
index 6ea16d5b..6ea16d5b 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb
index a48356ed..a48356ed 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.13.bb b/recipes-bsp/firmware-imx/firmware-imx_8.14.bb
index 68539a61..5628e40b 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.13.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)"
diff --git a/recipes-bsp/imx-atf/imx-atf_2.4.bb b/recipes-bsp/imx-atf/imx-atf_2.4.bb
index 8360bfa8..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"
@@ -25,13 +25,30 @@ EXTRA_OEMAKE += " \
PLAT=${ATF_PLATFORM} \
"
+# Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is a standalone application
+CFLAGS[unexport] = "1"
+LDFLAGS[unexport] = "1"
+AS[unexport] = "1"
+LD[unexport] = "1"
+
+# Baremetal, just need a compiler
+DEPENDS:remove = "virtual/${TARGET_PREFIX}compilerlibs virtual/libc"
+
BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
-CFLAGS:remove:mx8mq = "-O2"
+# CC and LD introduce arguments which conflict with those otherwise provided by
+# this recipe. The heads of these variables excluding those arguments
+# are therefore used instead.
+def remove_options_tail (in_string):
+ from itertools import takewhile
+ return ' '.join(takewhile(lambda x: not x.startswith('-'), in_string.split(' ')))
+
+EXTRA_OEMAKE += "LD=${@remove_options_tail(d.getVar('LD'))}"
+
+EXTRA_OEMAKE += "CC=${@remove_options_tail(d.getVar('CC'))}"
do_compile() {
# Clear LDFLAGS to avoid the option -Wl recognize issue
- unset LDFLAGS
oe_runmake bl31
if ${BUILD_OPTEE}; then
oe_runmake clean BUILD_BASE=build-optee
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 <andrey.z@gmail.com>
-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 <andrey.z@gmail.com>
Cc: Tom Hochstein <tom.hochstein@nxp.com>
---
- 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-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/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"
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.11.0.bb
index e3dad7da..27f7a2a7 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb
@@ -3,15 +3,15 @@
DESCRIPTION = "i.MX System Controller Firmware"
LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+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] = "5c2b9d35e526136042a84e8d8f6c116e"
-SRC_URI[sha256sum] = "0adc3d2c2df250a873232f1b62b14674694b50a4e01dd6ceae479e4ff2b2276b"
+SRC_URI[md5sum] = "95f1b0a148c323968c0741e807995948"
+SRC_URI[sha256sum] = "4ad2999088098c7d95837b7dc88adceda319c2102c8bdf55bf6e9453653fba00"
BOARD_TYPE ?= "mek"
SC_FIRMWARE_NAME ?= "INVALID"
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"
diff --git a/recipes-bsp/imx-seco/imx-seco_3.8.2.bb b/recipes-bsp/imx-seco/imx-seco_3.8.4.bb
index bd749e4f..bd5739cd 100644
--- a/recipes-bsp/imx-seco/imx-seco_3.8.2.bb
+++ b/recipes-bsp/imx-seco/imx-seco_3.8.4.bb
@@ -4,14 +4,14 @@ SUMMARY = "NXP i.MX SECO firmware"
DESCRIPTION = "NXP i.MX Security Controller firmware"
SECTION = "base"
LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+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] = "92a15f2ffe162374806e2dfe9b0aa2e9"
-SRC_URI[sha256sum] = "c543cd3ec4d30c0cf5ee2a2f4dc7efe209363e45087e0b7c380b727b7bcf2c8a"
+SRC_URI[md5sum] = "38d298cda9ea91db945b266bd6774e07"
+SRC_URI[sha256sum] = "ed65381fac7a17a7594099191952821ed3f3f54c944937926dc19f82ecd8fef5"
do_compile[noexec] = "1"
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
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.6.0.bb
index e6cffaca..2a17d76f 100644
--- 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.6.0.bb
@@ -2,7 +2,7 @@
DESCRIPTION = "i.MX VC8000E Encoder library"
LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f"
inherit fsl-eula-unpack
@@ -10,8 +10,8 @@ SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
S = "${WORKDIR}/${BPN}-${PV}"
-SRC_URI[md5sum] = "fbd43a100c27abbae301428f1ae2bc64"
-SRC_URI[sha256sum] = "e59ac2ded726d722f61793b17fc394ce87b1c5710cb79f0b1d60b87fca5829e1"
+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}.
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.1.bb
index 25f54c7a..d4a48627 100644
--- 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.1.bb
@@ -9,8 +9,8 @@ DEPENDS:append:mx8mp = " imx-vpu-hantro-vc"
SRC_URI = " \
${FSL_MIRROR}/${BP}.tar.gz \
"
-SRC_URI[md5sum] = "980237589af195c2c4b852a7aad175ee"
-SRC_URI[sha256sum] = "a5d915fefd3637e68d693638edd1161c30e75011a6312251b914f04546fd0fc9"
+SRC_URI[md5sum] = "99e96b2e00516d56a78a95a80851076b"
+SRC_URI[sha256sum] = "e7b3d55f72e233179b1b28c03628139b463d1994d140fed3c3e0796c66e917c8"
PLATFORM:mx8mm = "IMX8MM"
PLATFORM:mx8mq = "IMX8MQ"
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.24.0.bb
index 427dbf92..84c71610 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb
@@ -2,13 +2,13 @@
DESCRIPTION = "i.MX Hantro VPU library"
LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f"
PROVIDES = "virtual/imxvpu"
SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "3f8d4bb593d851d0523d0146131946ae"
-SRC_URI[sha256sum] = "a312a0b6d32ed16527e5bfcff362b231069428362ad5710f816bca019f70c6a2"
+SRC_URI[md5sum] = "1f99c6941b8a51035b52cc5bc72faa3d"
+SRC_URI[sha256sum] = "aa9461a152e13a1caa852f29ae18fd33aebd90c8a2b49519003e632687fe89d6"
inherit fsl-eula-unpack use-imx-headers
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.16.0.bb
index 0122d273..e7c8a326 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb
@@ -2,14 +2,14 @@
DESCRIPTION = "Basler camera binary drivers"
LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f"
inherit fsl-eula-unpack
SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "963339f568e8b0ba5d67328238284d47"
-SRC_URI[sha256sum] = "f4d4aa08103937ddd86b9c0880d07c1e0db1ec7f51a420a8ccc76dcf2fb7dbe6"
+SRC_URI[md5sum] = "489763169857773bade28611e649172e"
+SRC_URI[sha256sum] = "3d4ae594659a697eef7479ca2480cc53f1d460f22bcc1c58104cff63bc6705fe"
do_install() {
dest_dir=${D}/opt/imx8-isp/bin
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.16.0.bb
index 9ede07bd..4411c351 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb
@@ -2,17 +2,16 @@
DESCRIPTION = "i.MX Verisilicon Software ISP"
LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+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 \
- file://0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch \
"
-SRC_URI[md5sum] = "e9e0943b9f4923c767d07901e550c41c"
-SRC_URI[sha256sum] = "13274c0fd442da4b3b9900a7568c59872ffa6408f5699d35eebc6760a8e51297"
+SRC_URI[md5sum] = "f490153dbec234a04416ad41834806b2"
+SRC_URI[sha256sum] = "83b24b9d1f7a40a506a45a1c5c2ef2ca2313fe9b23fde591e3b7dce77ea359ca"
inherit fsl-eula-unpack cmake systemd use-imx-headers
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc
index 7d401692..341e2802 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc
@@ -10,10 +10,10 @@ DEPENDS += "flex-native bison-native"
SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
-SRCREV = "691e634bfd317ede487d2b864a126847ffeb4aa7"
-SRCBRANCH = "2021.07+fslc"
+SRCREV = "ed9503daa309c765a8654dc89c486326b4850f6d"
+SRCBRANCH = "2022.01+fslc"
-PV = "v2021.07+git${SRCPV}"
+PV = "v2022.01+git${SRCPV}"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb
index 2e79166b..2e79166b 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb
index a3a732ef..a3a732ef 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2021.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb
index 21989ae5..21989ae5 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2021.07.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb
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"
-
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}" ]
diff --git a/recipes-graphics/libsdl2/libsdl2_%.bbappend b/recipes-graphics/libsdl2/libsdl2_%.bbappend
index af9c97bb..3b2655ce 100644
--- a/recipes-graphics/libsdl2/libsdl2_%.bbappend
+++ b/recipes-graphics/libsdl2/libsdl2_%.bbappend
@@ -1,6 +1,6 @@
# what vivante driver does libsdl2 mean? Anyway it fails with missing functions as
# VIVANTE_Create VIVANTE_GLES_GetProcAddress VIVANTE_GLES_UnloadLibrary ...
-EXTRA_OECONF:append:imxgpu2d = " --disable-video-vivante"
+EXTRA_OECMAKE:append:imxgpu = " -DSDL_VIVANTE=OFF"
CFLAGS:append:imxgpu = " -DLINUX \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_API_FB', d)} \
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.10.bb b/recipes-kernel/linux/linux-fslc-imx_5.10.bb
index c8a513f4..5078efa4 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.10.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.10.bb
@@ -28,7 +28,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
# ------------------------------------------------------------------------------
# 1. Stable (tag or SHA(s))
# ------------------------------------------------------------------------------
-# tag: v5.10.79
+# tag: v5.10.93
#
# ------------------------------------------------------------------------------
# 2. NXP-specific (tag or SHA(s))
@@ -38,6 +38,10 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
# ------------------------------------------------------------------------------
# 3. Critical patches (SHA(s))
# ------------------------------------------------------------------------------
+# 8ef27ae9f200 ("gpio: fix enabling GPIO_VF610")
+# 12099c38577a ("ASoC: fsl_sai: Correct the clock source for mclk0")
+# db172377e6e2 ("Revert "MLK-12786-2: ASoC: fsl_sai: correct the clock source for mclk0"")
+# 372825d96a29 ("ARM: dts: imx7s: fix ARM timer definition")
# 8b20421b2b61 ("staging: fsl_ppfe: reduce MAC address filtering loglevel to debug")
# 16ea8f2ab906 ("staging: fsl_ppfe: assign correct OF nodes to individual ports")
# 9d0f521803cd ("staging: fsl_ppfe: handle all RGMII modes in pfe_eth_adjust_link")
@@ -69,14 +73,14 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
KBRANCH = "5.10-2.1.x-imx"
-SRCREV = "cdf10f101ab7e0112a285ab86e1a62d80e7d2104"
+SRCREV = "f28a9b90c506241e614212f2ce314d8f5460819d"
# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
# required by kernel-yocto.bbclass.
#
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
# should be updated once patchlevel is merged.
-LINUX_VERSION = "5.10.79"
+LINUX_VERSION = "5.10.93"
# Local version indicates the branch name in the NXP kernel tree where patches are collected from.
LOCALVERSION = "-5.10.52-2.1.0"
diff --git a/recipes-kernel/linux/linux-fslc-lts_5.10.bb b/recipes-kernel/linux/linux-fslc-lts_5.10.bb
index b56e003f..c3410a59 100644
--- a/recipes-kernel/linux/linux-fslc-lts_5.10.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_5.10.bb
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
#
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
# should be updated once patchlevel is merged.
-LINUX_VERSION = "5.10.79"
+LINUX_VERSION = "5.10.93"
KBRANCH = "5.10.x+fslc"
-SRCREV = "0ac3cc275e5453959661bfbbc78b22c2dc6d1987"
+SRCREV = "de6a8455baae279feddb56c99056aa075175cd68"
COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc_5.15.bb b/recipes-kernel/linux/linux-fslc_5.15.bb
index f2e15981..1e88adba 100644
--- a/recipes-kernel/linux/linux-fslc_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc_5.15.bb
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
#
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
# should be updated once patchlevel is merged.
-LINUX_VERSION = "5.15.2"
+LINUX_VERSION = "5.15.16"
KBRANCH = "5.15.x+fslc"
-SRCREV = "3b7c3ba50480a1ee9043c3d07293c175c2e9d47b"
+SRCREV = "d084d166324389d09f73d8f2e91b989d69432335"
COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"
diff --git a/recipes-kernel/linux/linux-imx-headers_5.10.bb b/recipes-kernel/linux/linux-imx-headers_5.10.bb
index 8acb2652..8a142b91 100644
--- a/recipes-kernel/linux/linux-imx-headers_5.10.bb
+++ b/recipes-kernel/linux/linux-imx-headers_5.10.bb
@@ -8,9 +8,9 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
SRCBRANCH = "lf-5.10.y"
-LOCALVERSION = "-5.10.52-2.1.0"
+LOCALVERSION = "-5.10.72-2.2.0"
SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "ef3f2cfc6010c13feb40cfb7fd7490832cf86f45"
+SRCREV = "a68e31b63f864ff71cd4adb40fbc9e1edc75c250"
S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-imx/imx/defconfig b/recipes-kernel/linux/linux-imx/imx/defconfig
index b2a0351d..6ca0833e 100644
--- a/recipes-kernel/linux/linux-imx/imx/defconfig
+++ b/recipes-kernel/linux/linux-imx/imx/defconfig
@@ -352,6 +352,7 @@ CONFIG_SND_USB_AUDIO=m
CONFIG_SND_SOC=y
CONFIG_SND_SOC_FSL_ASRC=y
CONFIG_SND_SOC_FSL_MQS=y
+CONFIG_SND_SOC_FSL_RPMSG=y
CONFIG_SND_IMX_SOC=y
CONFIG_SND_SOC_EUKREA_TLV320=y
CONFIG_SND_SOC_IMX_SII902X=y
@@ -368,6 +369,7 @@ CONFIG_SND_SOC_AC97_CODEC=y
CONFIG_SND_SOC_CS42XX8_I2C=y
CONFIG_SND_SOC_TLV320AIC3X=y
CONFIG_SND_SOC_WM8960=y
+CONFIG_SND_SOC_RPMSG_WM8960=y
CONFIG_SND_SOC_WM8962=y
CONFIG_SND_SIMPLE_CARD=y
CONFIG_HID_MULTITOUCH=y
diff --git a/recipes-kernel/linux/linux-imx/mx8/defconfig b/recipes-kernel/linux/linux-imx/mx8/defconfig
index 65c676a9..775fd503 100644
--- a/recipes-kernel/linux/linux-imx/mx8/defconfig
+++ b/recipes-kernel/linux/linux-imx/mx8/defconfig
@@ -15,6 +15,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_MEMCG=y
CONFIG_BLK_CGROUP=y
CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_HUGETLB=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_DEVICE=y
@@ -60,6 +61,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m
CONFIG_ARM_SCPI_CPUFREQ=y
CONFIG_ARM_IMX_CPUFREQ_DT=y
CONFIG_QORIQ_CPUFREQ=y
+CONFIG_ARM_SCMI_PROTOCOL=y
CONFIG_ARM_SCPI_PROTOCOL=y
CONFIG_EFI_CAPSULE_LOADER=y
CONFIG_IMX_DSP=y
@@ -276,6 +278,7 @@ CONFIG_BNX2X=m
CONFIG_MACB=y
CONFIG_THUNDER_NIC_PF=y
CONFIG_FEC=y
+CONFIG_FEC_UIO=y
CONFIG_FSL_FMAN=y
CONFIG_FSL_DPAA_ETH=y
CONFIG_FSL_DPAA2_ETH=y
@@ -323,9 +326,9 @@ CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
CONFIG_MDIO_BUS_MUX_MMIOREG=y
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
+CONFIG_USB_RTL8152=y
CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
+CONFIG_USB_USBNET=y
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SR9800=m
CONFIG_USB_NET_SMSC75XX=m
@@ -342,6 +345,7 @@ CONFIG_KEYBOARD_ADC=m
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_SNVS_PWRKEY=y
CONFIG_KEYBOARD_IMX_SC_PWRKEY=y
+CONFIG_KEYBOARD_RPMSG=y
CONFIG_KEYBOARD_CROS_EC=y
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
@@ -388,6 +392,8 @@ CONFIG_I2C_RPBUS=y
CONFIG_I2C_CROS_EC_TUNNEL=y
CONFIG_XEN_I2C_BACKEND=y
CONFIG_I2C_SLAVE=y
+CONFIG_I3C=y
+CONFIG_SVC_I3C_MASTER=y
CONFIG_SPI=y
CONFIG_SPI_CADENCE_QUADSPI=y
CONFIG_SPI_FSL_LPSPI=y
@@ -411,10 +417,12 @@ CONFIG_PINCTRL_IMX8MQ=y
CONFIG_PINCTRL_IMX8QM=y
CONFIG_PINCTRL_IMX8QXP=y
CONFIG_PINCTRL_IMX8DXL=y
+CONFIG_PINCTRL_IMX8ULP=y
CONFIG_PINCTRL_S32V234=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_ALTERA=m
CONFIG_GPIO_DWAPB=y
+CONFIG_GPIO_IMX_RPMSG=y
CONFIG_GPIO_MB86S7X=y
CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_PL061=y
@@ -432,7 +440,9 @@ CONFIG_POWER_RESET_SYSCON=y
CONFIG_SYSCON_REBOOT_MODE=y
CONFIG_BATTERY_SBS=m
CONFIG_BATTERY_BQ27XXX=y
+CONFIG_SENSORS_ARM_SCMI=y
CONFIG_SENSORS_ARM_SCPI=y
+CONFIG_SENSORS_FP9931=y
CONFIG_SENSORS_LM90=m
CONFIG_SENSORS_PWM_FAN=m
CONFIG_SENSORS_SL28CPLD=m
@@ -453,12 +463,14 @@ CONFIG_ARM_SBSA_WATCHDOG=y
CONFIG_DW_WATCHDOG=y
CONFIG_IMX2_WDT=y
CONFIG_IMX_SC_WDT=y
+CONFIG_IMX7ULP_WDT=y
CONFIG_ARM_SMC_WATCHDOG=y
CONFIG_XEN_WDT=y
CONFIG_MFD_BD9571MWV=y
CONFIG_MFD_AXP20X_I2C=y
CONFIG_MFD_IMX_MIX=y
CONFIG_MFD_HI6421_PMIC=y
+CONFIG_MFD_FP9931=y
CONFIG_MFD_MAX77620=y
CONFIG_MFD_RK808=y
CONFIG_MFD_SEC_CORE=y
@@ -475,6 +487,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_HI6421V530=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX8973=y
+CONFIG_REGULATOR_FP9931=y
CONFIG_REGULATOR_PCA9450=y
CONFIG_REGULATOR_PFUZE100=y
CONFIG_REGULATOR_PWM=y
@@ -529,6 +542,7 @@ CONFIG_DRM_RCAR_LVDS=m
CONFIG_DRM_PANEL_LVDS=m
CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
+CONFIG_DRM_PANEL_RAYDIUM_RM68200=y
CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
@@ -550,6 +564,7 @@ CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
CONFIG_DRM_DW_HDMI_GP_AUDIO=y
CONFIG_DRM_DW_HDMI_CEC=y
CONFIG_DRM_ITE_IT6263=y
+CONFIG_DRM_ITE_IT6161=y
CONFIG_DRM_IMX=y
CONFIG_DRM_IMX_LCDIF_MUX_DISPLAY=y
CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
@@ -560,6 +575,7 @@ CONFIG_DRM_IMX8QXP_LDB=y
CONFIG_DRM_IMX8MP_LDB=y
CONFIG_DRM_IMX_HDMI=y
CONFIG_DRM_IMX_SEC_DSIM=y
+CONFIG_DRM_IMX_DCNANO=y
CONFIG_DRM_IMX_DCSS=y
CONFIG_DRM_IMX_CDNS_MHDP=y
CONFIG_DRM_ETNAVIV=m
@@ -571,6 +587,7 @@ CONFIG_DRM_LIMA=m
CONFIG_DRM_PANFROST=m
CONFIG_FB_ARMCLCD=y
CONFIG_FB_EFI=y
+CONFIG_FB_MXC_EINK_V2_PANEL=y
CONFIG_BACKLIGHT_PWM=y
CONFIG_BACKLIGHT_LP855X=m
CONFIG_LOGO=y
@@ -585,6 +602,7 @@ CONFIG_SND_SOC_FSL_ASRC=y
CONFIG_SND_SOC_FSL_MQS=y
CONFIG_SND_SOC_FSL_EASRC=y
CONFIG_SND_SOC_FSL_ESAI_CLIENT=y
+CONFIG_SND_SOC_FSL_RPMSG=y
CONFIG_SND_IMX_SOC=y
CONFIG_SND_SOC_IMX_AK4458=y
CONFIG_SND_SOC_IMX_AK5558=y
@@ -605,6 +623,8 @@ CONFIG_SND_SOC_SOF_COMPRESS=y
CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y
CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y
CONFIG_SND_SOC_SOF_IMX8M_SUPPORT=y
+CONFIG_SND_SOC_SOF_IMX8ULP_SUPPORT=y
+CONFIG_SND_SOC_SOF_IMX8ULP=y
CONFIG_SND_SOC_AK4613=m
CONFIG_SND_SOC_BT_SCO=y
CONFIG_SND_SOC_CROS_EC_CODEC=m
@@ -623,9 +643,13 @@ CONFIG_SND_SOC_WCD934X=m
CONFIG_SND_SOC_WM8524=y
CONFIG_SND_SOC_WM8904=m
CONFIG_SND_SOC_WM8960=y
+CONFIG_SND_SOC_RPMSG_WM8960=y
+CONFIG_SND_SOC_RPMSG_WM8960_I2C=y
+CONFIG_SND_SOC_RPMSG_AK4497=y
CONFIG_SND_SOC_WSA881X=m
CONFIG_SND_SIMPLE_CARD=y
CONFIG_SND_AUDIO_GRAPH_CARD=y
+CONFIG_SND_ALOOP=m
CONFIG_I2C_HID=m
CONFIG_USB_CONN_GPIO=y
CONFIG_USB=y
@@ -740,6 +764,7 @@ CONFIG_RTC_DRV_FSL_FTM_ALARM=y
CONFIG_RTC_DRV_PL031=y
CONFIG_RTC_DRV_SNVS=y
CONFIG_RTC_DRV_IMX_SC=y
+CONFIG_RTC_DRV_IMX_RPMSG=y
CONFIG_DMADEVICES=y
CONFIG_BCM_SBA_RAID=m
CONFIG_FSL_EDMA=y
@@ -756,6 +781,7 @@ CONFIG_DMATEST=y
CONFIG_DMABUF_HEAPS=y
CONFIG_DMABUF_HEAPS_SYSTEM=y
CONFIG_DMABUF_HEAPS_CMA=y
+CONFIG_DMABUF_HEAPS_DSP=y
CONFIG_UIO=y
CONFIG_UIO_PCI_GENERIC=y
CONFIG_UIO_IVSHMEM=y
@@ -797,6 +823,7 @@ CONFIG_CLK_IMX8MN=y
CONFIG_CLK_IMX8MP=y
CONFIG_CLK_IMX8MQ=y
CONFIG_CLK_IMX8QXP=y
+CONFIG_CLK_IMX8ULP=y
CONFIG_HWSPINLOCK=y
CONFIG_ARM_MHU=y
CONFIG_IMX_MBOX=y
@@ -805,6 +832,8 @@ CONFIG_ARM_SMMU=y
CONFIG_ARM_SMMU_V3=y
CONFIG_REMOTEPROC=y
CONFIG_IMX_REMOTEPROC=y
+CONFIG_IMX_DSP_REMOTEPROC=y
+CONFIG_RPMSG_CHAR=y
CONFIG_RPMSG_QCOM_GLINK_RPM=y
CONFIG_SOUNDWIRE=m
CONFIG_SOUNDWIRE_QCOM=m
@@ -825,15 +854,18 @@ CONFIG_IIO_CROS_EC_SENSORS_CORE=m
CONFIG_IIO_CROS_EC_SENSORS=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_IIO_ST_LSM6DSX=y
CONFIG_PWM=y
CONFIG_PWM_CROS_EC=m
CONFIG_PWM_FSL_FTM=m
CONFIG_PWM_IMX27=y
+CONFIG_PWM_RPCHIP=y
CONFIG_PWM_SL28CPLD=m
CONFIG_SL28CPLD_INTC=y
CONFIG_MST_IRQ=y
CONFIG_RESET_BRCMSTB_RESCAL=y
CONFIG_RESET_IMX7=y
+CONFIG_RESET_IMX8ULP_SIM=y
CONFIG_PHY_XGENE=y
CONFIG_PHY_MIXEL_LVDS=y
CONFIG_PHY_MIXEL_LVDS_COMBO=y
@@ -878,6 +910,7 @@ CONFIG_EFIVAR_FS=y
CONFIG_JFFS2_FS=y
CONFIG_UBIFS_FS=y
CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_XZ=y
CONFIG_NFS_FS=y
CONFIG_NFS_V4=y
CONFIG_NFS_V4_1=y
@@ -946,3 +979,7 @@ CONFIG_CORESIGHT=y
CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
CONFIG_CORESIGHT_SOURCE_ETM4X=y
CONFIG_MEMTEST=y
+CONFIG_MXC_PXP_V3=y
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_AEAD=m
diff --git a/recipes-kernel/linux/linux-imx_5.10.bb b/recipes-kernel/linux/linux-imx_5.10.bb
index 62ecf4bc..e287fa39 100644
--- a/recipes-kernel/linux/linux-imx_5.10.bb
+++ b/recipes-kernel/linux/linux-imx_5.10.bb
@@ -18,15 +18,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "lzop-native bc-native"
SRCBRANCH = "lf-5.10.y"
-LOCALVERSION = "-5.10.52-2.1.0"
-SRCREV = "a11753a89ec610768301d4070e10b8bd60fde8cd"
+LOCALVERSION = "-5.10.72-2.2.0"
+SRCREV = "a68e31b63f864ff71cd4adb40fbc9e1edc75c250"
# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
# required by kernel-yocto.bbclass.
#
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
# should be updated once patchlevel is merged.
-LINUX_VERSION = "5.10.52"
+LINUX_VERSION = "5.10.72"
DEFAULT_PREFERENCE = "1"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb
index 1a076c2e..73d8c429 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb
@@ -22,3 +22,5 @@ inherit meson pkgconfig upstream-version-is-even
FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
+
+COMPATIBLE_MACHINE = "(imx)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb
index 65ac1636..0625fbaa 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb
@@ -41,3 +41,5 @@ EXTRA_OEMESON += " \
FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
+
+COMPATIBLE_MACHINE = "(imx)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb
index 4ac30c28..eaaf078b 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb
@@ -28,3 +28,5 @@ GIR_MESON_DISABLE_FLAG = "disabled"
# Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well
require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
+
+COMPATIBLE_MACHINE = "(imx)"
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb
index 9d43a175..b5fb8890 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb
@@ -49,6 +49,10 @@ PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN
# Add codec list that the beep plugin run-time depended
BEEP_RDEPENDS = "imx-codec-aac imx-codec-mp3 imx-codec-oggvorbis"
RDEPENDS:${PN} += "imx-parser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux "
+RDEPENDS:${PN}:append:mx8qm = " imx-dsp"
+RDEPENDS:${PN}:append:mx8qxp = " imx-dsp"
+RDEPENDS:${PN}:append:mx8mp = " imx-dsp"
+RDEPENDS:${PN}:append:mx8ulp = " imx-dsp"
# overlaysink rely on G2D,
# cannot be supported on i.MX6SLL & i.MX6UL & i.MX6ULL & i.MX7D
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb
new file mode 100644
index 00000000..fe653c18
--- /dev/null
+++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb
@@ -0,0 +1,21 @@
+# Copyright 2018-2021 NXP
+
+DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f"
+
+inherit fsl-eula-unpack autotools pkgconfig
+
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+
+SRC_URI[md5sum] = "9e1d0e06f4fed47a37cb390e135f453f"
+SRC_URI[sha256sum] = "2703a9dc619a2ac32352d65cfa58f8217e65abcabd33b77b0be02425dc896ae2"
+
+# Fix strip command failed: 'Unable to recognise the format of the input file'
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INSANE_SKIP:${PN} = "arch dev-so"
+
+FILES:${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm"
+COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8mp|mx8ulp)"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb b/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb
new file mode 100644
index 00000000..fe650eb1
--- /dev/null
+++ b/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb
@@ -0,0 +1,45 @@
+# Copyright 2017-2021 NXP
+
+DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f"
+
+inherit fsl-eula-unpack autotools pkgconfig
+
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+
+SRC_URI[md5sum] = "238d3f0256573ca657228d7090bcb7d3"
+SRC_URI[sha256sum] = "13f67f267d6d33e8be2a6c258a46cde3667258ac86435776cbf1a370de611476"
+
+EXTRA_OECONF += " \
+ -datadir=${base_libdir}/firmware --bindir=/unit_tests \
+ ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', ' ', d)} \
+"
+
+RDEPENDS:${PN} += " imx-dsp-codec-ext"
+
+HIFI4_BIN ?= "hifi4_imx8qmqxp.bin"
+HIFI4_BIN:mx8mp = "hifi4_imx8mp.bin"
+HIFI4_BIN:mx8ulp = "hifi4_imx8ulp.bin"
+
+do_install:append () {
+ # Rename DSP Firmware into hifi4.bin and remove unneeded binary
+ mv ${D}/lib/firmware/imx/dsp/${HIFI4_BIN} ${D}/lib/firmware/imx/dsp/hifi4.bin
+ find ${D}/lib/firmware/imx/dsp -name hifi4_*.bin -exec rm {} \;
+}
+
+FILES:${PN} = "${libdir}/imx-mm/audio-codec/dsp \
+ ${libdir}/imx-mm/audio-codec/wrap \
+ ${base_libdir}/firmware/imx/dsp \
+ /unit_tests \
+"
+
+INSANE_SKIP:${PN} = "already-stripped arch ldflags dev-so"
+
+# Fix strip command failed: 'Unable to recognise the format of the input file'
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8mp|mx8ulp)"
diff --git a/recipes-support/opencv/opencv_4.5.2.imx.bb b/recipes-support/opencv/opencv_4.5.2.imx.bb
index f84e29d7..f8824a18 100644
--- a/recipes-support/opencv/opencv_4.5.2.imx.bb
+++ b/recipes-support/opencv/opencv_4.5.2.imx.bb
@@ -147,7 +147,7 @@ PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,"
inherit pkgconfig cmake
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)}
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'setuptools3-base', '', d)}
inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)}
export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}"
@@ -265,11 +265,8 @@ SRC_URI += " \
"
SRCREV_FORMAT:append = "_extra"
-# Add tiny-dnn
-SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59"
-SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b"
+# Patch DNN example
SRC_URI += " \
- https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz;destsuffix=git/3rdparty/tinydnn/tiny-dnn-1.0.0a3;name=tinydnn;unpack=false \
file://OpenCV_DNN_examples.patch \
"
@@ -286,11 +283,6 @@ PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPEN
PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native,"
PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DINSTALL_TESTS=OFF,"
-do_unpack_extra:append() {
- mkdir -p ${S}/3rdparty/tinydnn/
- tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/
-}
-
do_install:append() {
ln -sf opencv4/opencv2 ${D}${includedir}/opencv2
install -d ${D}${datadir}/OpenCV/samples/data
diff --git a/wic/imx-boot-container-bootpart.wks.in b/wic/imx-boot-container-bootpart.wks.in
index 88679a68..321ee46b 100644
--- a/wic/imx-boot-container-bootpart.wks.in
+++ b/wic/imx-boot-container-bootpart.wks.in
@@ -11,16 +11,15 @@
# U-Boot DTB file, ATF, and optional OP-TEE components.
#
# The disk layout used is:
-# - ----------- -------------- ----------------------------
-# | | flash.bin | u-boot.itb | boot | rootfs |
-# - ----------- -------------- ----------------------------
-# ^ ^ ^ ^ ^ ^
-# | | | | | |
-# 0 | 384KiB 8MiB 72MiB 72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+# - ----------- -------------- -------------
+# | | flash.bin | boot | rootfs |
+# - ----------- -------------- -------------
+# ^ ^ ^ ^ ^
+# | | | | |
+# 0 | 8MiB 72MiB 72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
# ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
#
part u-boot --source rawcopy --sourceparams="file=flash.bin" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
-part u-boot-itb --source rawcopy --sourceparams="file=u-boot.itb" --ondisk mmcblk --no-table --align 384
part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --size 64
part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192