summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--SCR/SCR-6.1.55-2.2.0.txt (renamed from SCR/SCR-6.1.36-2.1.0.txt)395
-rw-r--r--classes/uuu_bootloader_tag.bbclass5
-rw-r--r--conf/layer.conf6
-rw-r--r--conf/machine/include/imx-base.inc14
-rw-r--r--dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend4
-rw-r--r--recipes-bsp/imx-lib/imx-lib_git.bb2
-rw-r--r--recipes-bsp/imx-mkimage/imx-boot_1.0.bb1
-rw-r--r--recipes-bsp/imx-test/imx-test_git.bb10
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-common_2024.01.inc (renamed from recipes-bsp/u-boot/u-boot-fslc-common_2023.10.inc)6
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.01.bb (renamed from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2023.10.bb)0
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc_2024.01.bb (renamed from recipes-bsp/u-boot/u-boot-fslc_2023.10.bb)0
-rw-r--r--recipes-bsp/u-boot/u-boot-imx_2023.04.bb15
-rw-r--r--recipes-devtools/uuu/files/0001-libuuu-usbhotplug.cpp-don-t-limit-retry-logic-to-win.patch61
-rw-r--r--recipes-devtools/uuu/uuu-bin_1.5.165.bb (renamed from recipes-devtools/uuu/uuu-bin_1.4.243.bb)6
-rw-r--r--recipes-devtools/uuu/uuu_git.bb8
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch34
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb7
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend3
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb6
-rw-r--r--recipes-security/optee-imx/optee-client_4.0.0.imx.bb (renamed from recipes-security/optee-imx/optee-client_3.21.0.imx.bb)4
-rw-r--r--recipes-security/optee-imx/optee-os/0001-core-Define-section-attributes-for-clang.patch69
-rw-r--r--recipes-security/optee-imx/optee-os/0002-optee-enable-clang-support.patch4
-rw-r--r--recipes-security/optee-imx/optee-os/0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch4
-rw-r--r--recipes-security/optee-imx/optee-os/0004-core-link-add-no-warn-rwx-segments.patch6
-rw-r--r--recipes-security/optee-imx/optee-os_4.0.0.imx.bb (renamed from recipes-security/optee-imx/optee-os_3.21.0.imx.bb)4
-rw-r--r--recipes-security/optee-imx/optee-test_4.0.0.imx.bb (renamed from recipes-security/optee-imx/optee-test_3.21.0.imx.bb)4
26 files changed, 315 insertions, 363 deletions
diff --git a/SCR/SCR-6.1.36-2.1.0.txt b/SCR/SCR-6.1.55-2.2.0.txt
index 63536fa3..16ef4e8c 100644
--- a/SCR/SCR-6.1.36-2.1.0.txt
+++ b/SCR/SCR-6.1.55-2.2.0.txt
@@ -1,15 +1,15 @@
1NXP Software Content Register 1NXP Software Content Register
2 2
3Release - Linux 6.1.36-2.1.0 3Release - Linux 6.1.55-2.2.0
4 Augest 2023 4 December 2023
5 5
6Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 - Additional distribution license granted - Section 2.3 applies 6Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 - Additional distribution license granted - Section 2.3 applies
7License File: LICENSE.txt 7License File: LICENSE.txt
8 8
9Yocto Project recipe manifest: 9Yocto Project recipe manifest:
10repo init -u https://github.com/nxp-imx/imx-manifest -b imx-linux-mickledore -m imx-6.1.36-2.1.0.xml 10repo init -u https://github.com/nxp-imx/imx-manifest -b imx-linux-mickledore -m imx-6.1.55-2.2.0.xml
11 11
12Release tag: lf-6.1.36-2.1.0 12Release tag: lf-6.1.55-2.2.0
13Release Location: https://www.nxp.com/design/software/embedded-software/i-mx-software/embedded-linux-for-i-mx-applications-processors:IMXLINUX 13Release Location: https://www.nxp.com/design/software/embedded-software/i-mx-software/embedded-linux-for-i-mx-applications-processors:IMXLINUX
14 14
15-------------------------------------------- 15--------------------------------------------
@@ -23,7 +23,7 @@ License File: COPYING
23Package Category: BSP 23Package Category: BSP
24Type of Content: source 24Type of Content: source
25Description and comments: The Linux kernel with i.MX-specific drivers 25Description and comments: The Linux kernel with i.MX-specific drivers
26Release Location: https://github.com/nxp-imx/linux-imx -b lf-6.1.36-2.1.0 26Release Location: https://github.com/nxp-imx/linux-imx -b lf-6.1.55-2.2.0
27Origin: NXP (GPL-2.0) 27Origin: NXP (GPL-2.0)
28 kernel.org (GPL-2.0) - https://www.kernel.org/ 28 kernel.org (GPL-2.0) - https://www.kernel.org/
29 29
@@ -36,7 +36,7 @@ License File: Licenses/gpl-2.0.txt
36Package Category: BSP 36Package Category: BSP
37Type of Content: source 37Type of Content: source
38Description and comments: Bootloader with i.MX-specific capabilities 38Description and comments: Bootloader with i.MX-specific capabilities
39Release Location: https://github.com/nxp-imx/uboot-imx -b lf-6.1.36-2.1.0 39Release Location: https://github.com/nxp-imx/uboot-imx -b lf-6.1.55-2.2.0
40Origin: NXP (GPL-2.0) 40Origin: NXP (GPL-2.0)
41 Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome 41 Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome
42 Android Open Source Project (BSD-2-Clause) - https://source.android.com/ 42 Android Open Source Project (BSD-2-Clause) - https://source.android.com/
@@ -51,7 +51,7 @@ License File: docs/license.rst
51Package Category: BSP 51Package Category: BSP
52Type of Content: source 52Type of Content: source
53Description and comments: ARM Trusted Firmware 53Description and comments: ARM Trusted Firmware
54Release Location: https://github.com/nxp-imx/imx-atf -b lf-6.1.36-2.1.0 54Release Location: https://github.com/nxp-imx/imx-atf -b lf-6.1.55-2.2.0
55Origin: NXP (BSD-3-clause) 55Origin: NXP (BSD-3-clause)
56 arm-trusted-firmware - ARM Limited (BSD-3-clause) - http://github.com/ARM-software/arm-trusted-firmware/ 56 arm-trusted-firmware - ARM Limited (BSD-3-clause) - http://github.com/ARM-software/arm-trusted-firmware/
57 57
@@ -70,9 +70,9 @@ Origin: NXP (LA_OPT_NXP_Software_License)
70 70
71-------------------------------------------- 71--------------------------------------------
72 72
73Package: firmware-imx-8.21.bin 73Package: firmware-imx-8.22.bin
74Version: 8.21 74Version: 8.22
75Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 75Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
76License File: COPYING 76License File: COPYING
77Package Category: BSP 77Package Category: BSP
78Type of Content: binary 78Type of Content: binary
@@ -102,15 +102,16 @@ Origin: NXP (LA_OPT_NXP_Software_License)
102 102
103-------------------------------------------- 103--------------------------------------------
104 104
105Package: firmware-sentinel-0.11.bin 105Package: firmware-ele-imx-0.1.0.bin
106Version: 0.11 106Version: 0.1.0
107Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 107Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
108License File: COPYING 108License File: COPYING
109Package Category: BSP 109Package Category: BSP
110Type of Content: binary 110Type of Content: binary
111Description and comments: S400 firmware 111Description and comments: S400 firmware
112Release Location: Mirror 112Release Location: Mirror
113Origin: NXP (LA_OPT_NXP_Software_License) 113Origin: NXP (proprietary)
114 CMSIS header files (Apache License 2.0; https://github.com/ARM-software/CMSIS_5)
114 115
115-------------------------------------------- 116--------------------------------------------
116 117
@@ -133,7 +134,7 @@ License File: LICENSE
133Package Category: BSP 134Package Category: BSP
134Type of Content: source 135Type of Content: source
135Description and comments: Make Image BootLoader 136Description and comments: Make Image BootLoader
136Release Location: https://github.com/nxp-imx/imx-mkimage -b lf-6.1.36-2.1.0 137Release Location: https://github.com/nxp-imx/imx-mkimage -b lf-6.1.55-2.2.0
137Origin: NXP (GPL-2.0) 138Origin: NXP (GPL-2.0)
138 Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome 139 Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome
139 140
@@ -146,7 +147,7 @@ License File: LICENSE
146Package Category: BSP 147Package Category: BSP
147Type of Content: source 148Type of Content: source
148Description and comments: BSP libraries 149Description and comments: BSP libraries
149Release Location: https://github.com/nxp-imx/imx-lib -b master 150Release Location: https://github.com/nxp-imx/imx-lib -b lf-6.1.55_2.2.0
150Origin: NXP (LGPL-2.1) 151Origin: NXP (LGPL-2.1)
151 152
152-------------------------------------------- 153--------------------------------------------
@@ -158,7 +159,7 @@ License File: LICENSE
158Package Category: BSP 159Package Category: BSP
159Type of Content: source 160Type of Content: source
160Description and comments: Linux unit test applications 161Description and comments: Linux unit test applications
161Release Location: https://github.com/nxp-imx/imx-test -b lf-6.1.36-2.1.0 162Release Location: https://github.com/nxp-imx/imx-test -b lf-6.1.55-2.2.0
162Origin: NXP (GPL-2.0) 163Origin: NXP (GPL-2.0)
163 module_test: NXP (GPL-2.0+) 164 module_test: NXP (GPL-2.0+)
164 Hantro Products Oy. (GPL-2.0+) 165 Hantro Products Oy. (GPL-2.0+)
@@ -224,7 +225,7 @@ Origin: NXP (GPL-2.0)
224 225
225Package: imx-firmware.git 226Package: imx-firmware.git
226Version: 227Version:
227Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 228Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
228License File: LICENSE.txt 229License File: LICENSE.txt
229Package Category: BSP 230Package Category: BSP
230Type of Content: binary 231Type of Content: binary
@@ -243,14 +244,14 @@ License File: LICENSE
243Package Category: BSP 244Package Category: BSP
244Type of Content: source 245Type of Content: source
245Description and comments: NXP Wi-Fi linux SDK 246Description and comments: NXP Wi-Fi linux SDK
246Release Location: https://github.com/nxp-imx/mwifiex -b lf-6.1.36-2.1.0 247Release Location: https://github.com/nxp-imx/mwifiex -b lf-6.1.55-2.2.0
247Origin: NXP (GPL-2.0) 248Origin: NXP (GPL-2.0)
248 249
249-------------------------------------------- 250--------------------------------------------
250 251
251Package: imx-seco-5.9.0.bin 252Package: imx-seco-5.9.2.bin
252Version: 5.9.0 253Version: 5.9.2
253Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies 254Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies
254License File: COPYING 255License File: COPYING
255Package Category: BSP 256Package Category: BSP
256Type of Content: binary 257Type of Content: binary
@@ -267,13 +268,13 @@ License File: EULA.txt
267Package Category: BSP 268Package Category: BSP
268Type of Content: source 269Type of Content: source
269Description and comments: BSP source - SECO 270Description and comments: BSP source - SECO
270Release Location: https://github.com/NXP/imx-seco-libs.git -b lf-6.1.36-2.1.0 271Release Location: https://github.com/NXP/imx-seco-libs.git -b lf-6.1.55-2.2.0
271Origin: NXP (LA_OPT_NXP_Software_License) 272Origin: NXP (LA_OPT_NXP_Software_License)
272 273
273-------------------------------------------- 274--------------------------------------------
274 275
275Package: sof-imx-2.6.0 276Package: sof-imx-2.7.0
276Version: 2.6.0 277Version: 2.7.0
277Outgoing License: BSD-3-Clause 278Outgoing License: BSD-3-Clause
278License File: LICENCE 279License File: LICENCE
279Package Category: BSP 280Package Category: BSP
@@ -285,8 +286,8 @@ Origin: NXP (BSD-3-clause)
285 286
286-------------------------------------------- 287--------------------------------------------
287 288
288Package: sof-zephyr-2.6.0 289Package: sof-zephyr-2.7.0
289Version: 2.6.0 290Version: 2.7.0
290Outgoing License: BSD-3-Clause 291Outgoing License: BSD-3-Clause
291License File: LICENCE 292License File: LICENCE
292Package Category: BSP 293Package Category: BSP
@@ -299,8 +300,8 @@ Origin: NXP (BSD-3-clause)
299 300
300-------------------------------------------- 301--------------------------------------------
301 302
302Package: zephyr-demo-imx-3.4.0 303Package: zephyr-demo-imx-3.5.0
303Version: 3.4.0 304Version: 3.5.0
304Outgoing License: BSD-3-Clause 305Outgoing License: BSD-3-Clause
305License File: LICENCE 306License File: LICENCE
306Package Category: BSP 307Package Category: BSP
@@ -355,26 +356,26 @@ Origin: NXP (GPL-2.0)
355-------------------------------------------- 356--------------------------------------------
356 357
357Package: imx-optee-client.git 358Package: imx-optee-client.git
358Version: 3.21.0.imx 359Version: 4.0.0.imx
359Outgoing License: BSD-2-Clause 360Outgoing License: BSD-2-Clause
360License File: LICENSE 361License File: LICENSE
361Package Category: BSP 362Package Category: BSP
362Type of Content: source 363Type of Content: source
363Description and comments: Open Portable Trusted Execution Environment for TEE Client library 364Description and comments: Open Portable Trusted Execution Environment for TEE Client library
364Release Location: https://github.com/nxp-imx/imx-optee-client -b lf-6.1.36-2.1.0 365Release Location: https://github.com/nxp-imx/imx-optee-client -b lf-6.1.55-2.2.0
365Origin: NXP (BSD-2-Clause) 366Origin: NXP (BSD-2-Clause)
366 optee_client (BSD-2-Clause) - https://github.com/OP-TEE/optee_client 367 optee_client (BSD-2-Clause) - https://github.com/OP-TEE/optee_client
367 368
368-------------------------------------------- 369--------------------------------------------
369 370
370Package: imx-optee-os.git 371Package: imx-optee-os.git
371Version: 3.21.0.imx 372Version: 4.0.0.imx
372Outgoing License: BSD-2-Clause 373Outgoing License: BSD-2-Clause
373License File: LICENSE 374License File: LICENSE
374Package Category: BSP 375Package Category: BSP
375Type of Content: source 376Type of Content: source
376Description and comments: Open Portable Trusted Execution Environment for Linux on ARM 377Description and comments: Open Portable Trusted Execution Environment for Linux on ARM
377Release Location: https://github.com/nxp-imx/imx-optee-os -b lf-6.1.36-2.1.0 378Release Location: https://github.com/nxp-imx/imx-optee-os -b lf-6.1.55-2.2.0
378Origin: NXP (BSD-2-Clause) 379Origin: NXP (BSD-2-Clause)
379 OP-TEE Trusted OS (BSD-2-Clause) - https://github.com/OP-TEE/optee_os 380 OP-TEE Trusted OS (BSD-2-Clause) - https://github.com/OP-TEE/optee_os
380 Mbed TLS (Apache-2.0) - https://github.com/ARMmbed/mbedtls/ 381 Mbed TLS (Apache-2.0) - https://github.com/ARMmbed/mbedtls/
@@ -382,13 +383,13 @@ Origin: NXP (BSD-2-Clause)
382-------------------------------------------- 383--------------------------------------------
383 384
384Package: imx-optee-test.git 385Package: imx-optee-test.git
385Version: 3.21.0.imx 386Version: 4.0.0.imx
386Outgoing License: BSD-2-Clause (ta/) and GPL-2.0 (host/) 387Outgoing License: BSD-2-Clause (ta/) and GPL-2.0 (host/)
387License File: LICENSE.md 388License File: LICENSE.md
388Package Category: BSP 389Package Category: BSP
389Type of Content: source 390Type of Content: source
390Description and comments: Open Portable Trusted Execution Environment sanity tests 391Description and comments: Open Portable Trusted Execution Environment sanity tests
391Release Location: https://github.com/nxp-imx/imx-optee-test -b lf-6.1.36-2.1.0 392Release Location: https://github.com/nxp-imx/imx-optee-test -b lf-6.1.55-2.2.0
392Origin: NXP (BSD-2-Clause) 393Origin: NXP (BSD-2-Clause)
393 optee_test (BSD-2-Clause) - https://github.com/OP-TEE/optee_test 394 optee_test (BSD-2-Clause) - https://github.com/OP-TEE/optee_test
394 395
@@ -401,72 +402,99 @@ License File: COPYING
401Package Category: BSP 402Package Category: BSP
402Type of Content: source 403Type of Content: source
403Description and comments: A partitioning Hypervisor based on Linux 404Description and comments: A partitioning Hypervisor based on Linux
404Release Location: https://github.com/nxp-imx/imx-jailhouse -b lf-6.1.36-2.1.0 405Release Location: https://github.com/nxp-imx/imx-jailhouse -b lf-6.1.55-2.2.0
405Origin: NXP (GPL-2.0) 406Origin: NXP (GPL-2.0)
406 Siemens AG (GPL-2.0) - https://github.com/siemens/jailhouse 407 Siemens AG (GPL-2.0) - https://github.com/siemens/jailhouse
407 408
408-------------------------------------------- 409--------------------------------------------
409 410
410Package: crypto-af-alg.git 411Package: imx-secure-enclave.git
411Version: 412Version:
412Outgoing License: BSD-3-Clause 413Outgoing License: BSD-3-Clause Additional distribution license granted - Section 2.3 applies
413License File: LICENSE 414License File: LICENSE
414Package Category: BSP 415Package Category: BSP
415Type of Content: source 416Type of Content: source
416Description and comments: i.MX crypto af alg tool to perform symmetric operation 417Description and comments: i.MX secure enclave library
417Release Location: https://github.com/nxp-imx/crypto_af_alg -b lf-6.1.36-2.1.0 418Release Location: https://github.com/NXP/imx-secure-enclave.git -b lf-6.1.55-2.2.0
418Origin: NXP (BSD-3-Clause) 419Origin: NXP (BSD-3-Clause)
419 420
420-------------------------------------------- 421--------------------------------------------
421 422
422Package: el2go-agent.git 423Package: imx-smw.git
423Version: 424Version: 0.1
424Outgoing License: Apache-2.0 425Outgoing License: BSD-3-Clause
425License File: LICENSE 426License File: LICENSE
426Package Category: BSP 427Package Category: BSP
427Type of Content: source 428Type of Content: source
428Description and comments: Contains communication protocol stack 429Description and comments: NXP i.MX Security Middleware Library
429Release Location: https://github.com/NXP/el2go-agent -b lf-6.1.36-2.1.0 430Release Location: https://github.com/nxp-imx/imx-smw -b lf-6.1.55-2.2.0
430Origin: NXP(Apache-2.0) 431Origin: NXP (BSD-3-Clause)
431 Mbed-TLS(Apache-2.0) - https://github.com/Mbed-TLS/mbedtls
432 nanopb(zlib License) - https://cocoapods.org/pods/nanopb
433
434 432
435-------------------------------------------- 433--------------------------------------------
436 434
437Package: imx-secure-enclave.git 435Package: itest.git
438Version: 436Version:
439Outgoing License: BSD-3-Clause Additional distribution license granted - Section 2.3 applies 437Outgoing License: BSD-3-Clause
440License File: LICENSE 438License File: LICENSE
441Package Category: BSP 439Package Category: BSP
442Type of Content: source 440Type of Content: source
443Description and comments: i.MX secure enclave library 441Description and comments: Tools to test EdgeLock Enclave api bridge on the ele_libs layer
444Release Location: https://github.com/NXP/imx-secure-enclave.git -b lf-6.1.36-2.1.0 442Release Location: https://github.com/nxp-imx/itest -b lf-6.1.55-2.2.0
445Origin: NXP (BSD-3-Clause) 443Origin: NXP (BSD-3-Clause)
446 444
447-------------------------------------------- 445--------------------------------------------
448 446
449Package: imx-smw.git 447Package: keyctl_caam.git
450Version: 0.1 448Version:
451Outgoing License: BSD-3-Clause 449Outgoing License: BSD-3-Clause
452License File: LICENSE 450License File: LICENSE
453Package Category: BSP 451Package Category: BSP
454Type of Content: source 452Type of Content: source
455Description and comments: NXP i.MX Security Middleware Library 453Description and comments: NXP i.MX keyctl tool to manage CAAM Keys
456Release Location: https://github.com/nxp-imx/imx-smw -b lf-6.1.36-2.1.0 454Release Location: https://github.com/nxp-imx/keyctl_caam -b lf-6.1.55-2.2.0
457Origin: NXP (BSD-3-Clause) 455Origin: NXP (BSD-3-Clause)
458 456
459-------------------------------------------- 457--------------------------------------------
460 458
461Package: keyctl_caam.git 459Package: el2go-agent.git
462Version: 460Version:
463Outgoing License: BSD-3-Clause 461Outgoing License: Apache-2.0
464License File: LICENSE 462License File: LICENSE
465Package Category: BSP 463Package Category: BSP
466Type of Content: source 464Type of Content: source
467Description and comments: NXP i.MX keyctl tool to manage CAAM Keys 465Description and comments: Contains communication protocol stack
468Release Location: https://github.com/nxp-imx/keyctl_caam -b lf-6.1.36-2.1.0 466Release Location: https://github.com/NXP/el2go-agent -b lf-6.1.55-2.2.0
469Origin: NXP (BSD-3-Clause) 467Origin: NXP(Apache-2.0)
468 Mbed-TLS(Apache-2.0) - https://github.com/Mbed-TLS/mbedtls
469 nanopb(zlib License) - https://cocoapods.org/pods/nanopb
470
471
472--------------------------------------------
473
474Package: se05x-openssl-provider.git
475Version: 1.0.0
476Outgoing License: Apache-2.0
477License File: LICENSE.txt
478Package Category: BSP
479Type of Content: source
480Description and comments: se05x openssl provider
481Release Location: https://github.com/NXPPlugNTrust/se05x-openssl-provider -b lf-6.1.55-2.2.0
482Origin: NXP (Apache-2.0)
483 OpenSSL 1.1 (OpenSSL) - https://github.com/openssl/openssl/tree/OpenSSL_1_1_1-stable
484
485--------------------------------------------
486
487Package: plug-and-trust.git
488Version: v04.04.00
489Outgoing License: Apache-2.0
490License File: LICENSE.txt
491Package Category: BSP
492Type of Content: source
493Description and comments: Plug & Trust ECC example for SE050
494Release Location: https://github.com/NXP/plug-and-trust
495Origin: NXP (Apache-2.0)
496 MbedTLS (Apache-2.0) - https://github.com/Mbed-TLS/mbedtls
497 OpenSSL 1.1 (OpenSSL) - https://github.com/openssl/openssl/tree/OpenSSL_1_1_1-stable
470 498
471-------------------------------------------- 499--------------------------------------------
472 500
@@ -490,7 +518,7 @@ License File: LICENSE
490Package Category: BSP 518Package Category: BSP
491Type of Content: source 519Type of Content: source
492Description and comments: V2X Secure Element library 520Description and comments: V2X Secure Element library
493Release Location: https://github.com/nxp-imx/v2xsehsm -b lf-6.1.36-2.1.0 521Release Location: https://github.com/nxp-imx/v2xsehsm -b lf-6.1.55-2.2.0
494Origin: NXP (BSD-3-Clause) 522Origin: NXP (BSD-3-Clause)
495 523
496-------------------------------------------- 524--------------------------------------------
@@ -502,7 +530,7 @@ License File: LICENSE
502Package Category: BSP 530Package Category: BSP
503Type of Content: source 531Type of Content: source
504Description and comments: V2X Test Suite 532Description and comments: V2X Test Suite
505Release Location: https://github.com/nxp-imx/vtest -b lf-6.1.36-2.1.0 533Release Location: https://github.com/nxp-imx/vtest -b lf-6.1.55-2.2.0
506Origin: NXP (BSD-3-Clause) 534Origin: NXP (BSD-3-Clause)
507 535
508-------------------------------------------- 536--------------------------------------------
@@ -514,7 +542,7 @@ License File: license/bsd-3-clause.txt
514Package Category: BSP 542Package Category: BSP
515Type of Content: source 543Type of Content: source
516Description and comments: Data Plane Development Kit 544Description and comments: Data Plane Development Kit
517Release Location: https://github.com/nxp-qoriq/dpdk -b lf-6.1.36-2.1.0 545Release Location: https://github.com/nxp-qoriq/dpdk -b lf-6.1.55-2.2.0
518Origin: NXP (BSD-3-Clause) 546Origin: NXP (BSD-3-Clause)
519 DPDK - Intel Corporation (BSD-3-Clause) - https://github.com/DPDK/dpdk 547 DPDK - Intel Corporation (BSD-3-Clause) - https://github.com/DPDK/dpdk
520 KNI Linux Device driver - Intel Corporation (GPL-2.0) Separate component of DPDK 548 KNI Linux Device driver - Intel Corporation (GPL-2.0) Separate component of DPDK
@@ -522,24 +550,37 @@ Origin: NXP (BSD-3-Clause)
522 550
523 551
524-------------------------------------------- 552--------------------------------------------
553
554Package: dpdk-extras.git
555Version: git
556Outgoing License: GPL-2.0
557License File: LICENSE
558Package Category: BSP
559Type of Content: source
560Description and comments: Kernel module for dpdk
561Release Location: https://github.com/nxp-qoriq/dpdk-extras -b lf-6.1.55-2.2.0
562Origin: NXP (GPL-2.0 or BSD-3-Clause)
563 DPDK-kmods (GPL-2.0) - http://git.dpdk.org/dpdk-kmods/
564
565--------------------------------------------
525Graphics Packages 566Graphics Packages
526-------------------------------------------- 567--------------------------------------------
527 568
528Package: isp-vvcam.git 569Package: isp-vvcam.git
529Version: 4.2.2.23.0 570Version: 4.2.2.24.0
530Outgoing License: GPL-2.0 571Outgoing License: GPL-2.0
531License File: vvcam/LICENSE 572License File: vvcam/LICENSE
532Package Category: Graphics 573Package Category: Graphics
533Type of Content: ISP Kernel Module source 574Type of Content: ISP Kernel Module source
534Description and comments: Kernel Loadable Module for ISP 575Description and comments: Kernel Loadable Module for ISP
535Release Location: https://github.com/nxp-imx/isp-vvcam -b lf-6.1.36-2.1.0 576Release Location: https://github.com/nxp-imx/isp-vvcam -b lf-6.1.55-2.2.0
536Origin: VeriSilicon Holdings Co., Ltd. (GPL-2.0) 577Origin: VeriSilicon Holdings Co., Ltd. (GPL-2.0)
537 578
538-------------------------------------------- 579--------------------------------------------
539 580
540Package: isp-imx-4.2.2.23.0.bin 581Package: isp-imx-4.2.2.24.0.bin
541Version: 4.2.2.23.0 582Version: 4.2.2.24.0
542Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 583Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
543License File: COPYING 584License File: COPYING
544Package Category: Graphics 585Package Category: Graphics
545Type of Content: binary and source 586Type of Content: binary and source
@@ -549,9 +590,9 @@ Origin: VeriSilicon Holdings Co., Ltd. (LA_OPT_NXP_Software
549 590
550-------------------------------------------- 591--------------------------------------------
551 592
552Package: basler-camera-4.2.2.23.0.bin 593Package: basler-camera-4.2.2.24.0.bin
553Version: 4.2.2.23.0 594Version: 4.2.2.24.0
554Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 595Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
555License File: COPYING 596License File: COPYING
556Package Category: Graphics 597Package Category: Graphics
557Type of Content: binary 598Type of Content: binary
@@ -569,15 +610,15 @@ License File: LICENSE
569Package Category: Graphics 610Package Category: Graphics
570Type of Content: source 611Type of Content: source
571Description and comments: GPU Core IP and test application source 612Description and comments: GPU Core IP and test application source
572Release Location: https://github.com/nxp-imx/apitrace-imx -b lf-6.1.36-2.1.0 613Release Location: https://github.com/nxp-imx/apitrace-imx -b lf-6.1.55-2.2.0
573Origin: NXP (MIT) 614Origin: NXP (MIT)
574 apitrace (MIT) - https://github.com/apitrace/apitrace 615 apitrace (MIT) - https://github.com/apitrace/apitrace
575 616
576-------------------------------------------- 617--------------------------------------------
577 618
578Package: imx-gpu-viv-6.4.11.p2.0-aarch32.bin 619Package: imx-gpu-viv-6.4.11.p2.2-aarch32.bin
579Version: 6.4.11.p2.0 620Version: 6.4.11.p2.2
580Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 621Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
581License File: COPYING 622License File: COPYING
582Package Category: Graphics 623Package Category: Graphics
583Type of Content: binary and source 624Type of Content: binary and source
@@ -594,9 +635,9 @@ Origin: NXP (LA_OPT_NXP_Software_License)
594 635
595-------------------------------------------- 636--------------------------------------------
596 637
597Package: imx-gpu-viv-6.4.11.p2.0-aarch64.bin 638Package: imx-gpu-viv-6.4.11.p2.2-aarch64.bin
598Version: 6.4.11.p2.0 639Version: 6.4.11.p2.2
599Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 640Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
600License File: COPYING 641License File: COPYING
601Package Category: Graphics 642Package Category: Graphics
602Type of Content: binary and source 643Type of Content: binary and source
@@ -620,7 +661,7 @@ License File: License.md
620Package Category: Graphics 661Package Category: Graphics
621Type of Content: source 662Type of Content: source
622Description and comments: Graphics sample applications 663Description and comments: Graphics sample applications
623Release Location: https://github.com/nxp-imx/gtec-demo-framework -b lf-6.1.36-2.1.0 664Release Location: https://github.com/nxp-imx/gtec-demo-framework -b lf-6.1.55-2.2.0
624Origin: NXP (BSD-3-clause) 665Origin: NXP (BSD-3-clause)
625 Demo Framework 666 Demo Framework
626 Sascha Willems - Vulkan demo (MIT) - https://github.com/SaschaWillems/Vulkan 667 Sascha Willems - Vulkan demo (MIT) - https://github.com/SaschaWillems/Vulkan
@@ -660,7 +701,7 @@ License File: LICENSE
660Package Category: Graphics 701Package Category: Graphics
661Type of Content: source 702Type of Content: source
662Description and comments: i.MX DRM Direct Rendering Manager 703Description and comments: i.MX DRM Direct Rendering Manager
663Release Location: https://github.com/nxp-imx/libdrm-imx -b lf-6.1.36-2.1.0 704Release Location: https://github.com/nxp-imx/libdrm-imx -b lf-6.1.55-2.2.0
664Origin: NXP (MIT) 705Origin: NXP (MIT)
665 706
666-------------------------------------------- 707--------------------------------------------
@@ -672,53 +713,53 @@ License File: LICENSE
672Package Category: Graphics 713Package Category: Graphics
673Type of Content: source 714Type of Content: source
674Description and comments: Wayland protocol development 715Description and comments: Wayland protocol development
675Release Location: https://github.com/nxp-imx/wayland-protocols-imx -b lf-6.1.36-2.1.0 716Release Location: https://github.com/nxp-imx/wayland-protocols-imx -b lf-6.1.55-2.2.0
676Origin: NXP (MIT) 717Origin: NXP (MIT)
677 Weston (MIT) - https://anongit.freedesktop.org/git/wayland/wayland-protocols.git 718 Weston (MIT) - https://anongit.freedesktop.org/git/wayland/wayland-protocols.git
678 719
679-------------------------------------------- 720--------------------------------------------
680 721
681Package: weston-imx.git 722Package: weston-imx.git
682Version: 11.0.2.imx 723Version: 11.0.3.imx
683Outgoing License: MIT 724Outgoing License: MIT
684License File: LICENSE 725License File: LICENSE
685Package Category: Graphics 726Package Category: Graphics
686Type of Content: source 727Type of Content: source
687Description and comments: A reference implementation of a Wayland compositor 728Description and comments: A reference implementation of a Wayland compositor
688Release Location: https://github.com/nxp-imx/weston-imx -b lf-6.1.36-2.1.0 729Release Location: https://github.com/nxp-imx/weston-imx -b lf-6.1.55-2.2.0
689Origin: NXP (MIT) 730Origin: NXP (MIT)
690 Weston (MIT) - http://github.com/wayland-project/weston/ 731 Weston (MIT) - http://github.com/wayland-project/weston/
691 732
692-------------------------------------------- 733--------------------------------------------
693 734
694Package: weston-10-imx.git 735Package: weston-10-imx.git
695Version: 10.0.4.imx 736Version: 10.0.5.imx
696Outgoing License: MIT 737Outgoing License: MIT
697License File: LICENSE 738License File: LICENSE
698Package Category: Graphics 739Package Category: Graphics
699Type of Content: source 740Type of Content: source
700Description and comments: A reference implementation of a Wayland compositor 741Description and comments: A reference implementation of a Wayland compositor
701Release Location: https://github.com/nxp-imx/weston-imx -b lf-6.1.36-2.1.0 742Release Location: https://github.com/nxp-imx/weston-imx -b lf-6.1.55-2.2.0
702Origin: NXP (MIT) 743Origin: NXP (MIT)
703 Weston (MIT) - http://github.com/wayland-project/weston/ 744 Weston (MIT) - http://github.com/wayland-project/weston/
704 745
705-------------------------------------------- 746--------------------------------------------
706 747
707Package: imx-gputop.git 748Package: imx-gputop.git
708Version: 6.4.11.p2.0 749Version: 6.4.11.p2.2
709Outgoing License: MIT 750Outgoing License: MIT
710License File: LICENSE.txt 751License File: LICENSE.txt
711Package Category: Graphics 752Package Category: Graphics
712Type of Content: source 753Type of Content: source
713Description and comments: Sample program to monitor i.MX GPU performance data 754Description and comments: Sample program to monitor i.MX GPU performance data
714Release Location: https://github.com/nxp-imx/imx-gputop -b lf-6.1.36-2.1.0 755Release Location: https://github.com/nxp-imx/imx-gputop -b lf-6.1.55-2.2.0
715Origin: NXP (MIT) 756Origin: NXP (MIT)
716 757
717-------------------------------------------- 758--------------------------------------------
718 759
719Package: imx-gpu-g2d-6.4.11.p2.0-arm.bin 760Package: imx-gpu-g2d-6.4.11.p2.2-arm.bin
720Version: 6.4.11.p2.0 761Version: 6.4.11.p2.2
721Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 762Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
722License File: COPYING 763License File: COPYING
723Package Category: Graphics 764Package Category: Graphics
724Type of Content: binary 765Type of Content: binary
@@ -728,9 +769,9 @@ Origin: NXP (LA_OPT_NXP_Software_License)
728 769
729-------------------------------------------- 770--------------------------------------------
730 771
731Package: imx-gpu-g2d-6.4.11.p2.0-aarch64.bin 772Package: imx-gpu-g2d-6.4.11.p2.2-aarch64.bin
732Version: 6.4.11.p2.0 773Version: 6.4.11.p2.2
733Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 774Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
734License File: COPYING 775License File: COPYING
735Package Category: Graphics 776Package Category: Graphics
736Type of Content: binary 777Type of Content: binary
@@ -754,12 +795,12 @@ Origin: NXP (LA_OPT_NXP_Software_License)
754 795
755Package: imx-g2d-pxp.git 796Package: imx-g2d-pxp.git
756Version: 2.1.0 797Version: 2.1.0
757Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 798Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
758License File: LICENSE.txt 799License File: LICENSE.txt
759Package Category: Graphics 800Package Category: Graphics
760Type of Content: source 801Type of Content: source
761Description and comments: G2D implementation using PXP 802Description and comments: G2D implementation using PXP
762Release Location: https://github.com/nxp-imx/imx-g2d-pxp -b lf-6.1.36-2.1.0 803Release Location: https://github.com/nxp-imx/imx-g2d-pxp -b lf-6.1.55-2.2.0
763Origin: NXP (Proprietary) 804Origin: NXP (Proprietary)
764 805
765-------------------------------------------- 806--------------------------------------------
@@ -771,14 +812,14 @@ License File: LICENSE
771Package Category: Graphics 812Package Category: Graphics
772Type of Content: source 813Type of Content: source
773Description and comments: Graphics G2D sample applications 814Description and comments: Graphics G2D sample applications
774Release Location: https://github.com/nxp-imx/g2d-samples -b lf-6.1.36-2.1.0 815Release Location: https://github.com/nxp-imx/g2d-samples -b lf-6.1.55-2.2.0
775Origin: NXP (BSD-3-Clause) 816Origin: NXP (BSD-3-Clause)
776 817
777-------------------------------------------- 818--------------------------------------------
778 819
779Package: libgpuperfcnt-6.4.11.p2.0-aarch64-wayland.bin 820Package: libgpuperfcnt-6.4.11.p2.2-aarch64-wayland.bin
780Version: 6.4.11.p2.0 821Version: 6.4.11.p2.2
781Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 822Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
782License File: COPYING 823License File: COPYING
783Package Category: Graphics 824Package Category: Graphics
784Type of Content: binary 825Type of Content: binary
@@ -788,9 +829,9 @@ Origin: NXP (LA_OPT_NXP_Software_License)
788 829
789-------------------------------------------- 830--------------------------------------------
790 831
791Package: libgpuperfcnt-6.4.11.p2.0-arm-fb.bin 832Package: libgpuperfcnt-6.4.11.p2.2-arm-fb.bin
792Version: 6.4.11.p2.0 833Version: 6.4.11.p2.2
793Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 834Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
794License File: COPYING 835License File: COPYING
795Package Category: Graphics 836Package Category: Graphics
796Type of Content: binary 837Type of Content: binary
@@ -800,9 +841,9 @@ Origin: NXP (LA_OPT_NXP_Software_License)
800 841
801-------------------------------------------- 842--------------------------------------------
802 843
803Package: libgpuperfcnt-6.4.11.p2.0-arm-wayland.bin 844Package: libgpuperfcnt-6.4.11.p2.2-arm-wayland.bin
804Version: 6.4.11.p2.0 845Version: 6.4.11.p2.2
805Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 846Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
806License File: COPYING 847License File: COPYING
807Package Category: Graphics 848Package Category: Graphics
808Type of Content: binary 849Type of Content: binary
@@ -819,7 +860,7 @@ License File: LICENSE
819Package Category: Graphics 860Package Category: Graphics
820Type of Content: source 861Type of Content: source
821Description and comments: i.MX Neural Networks Accelerator Plugin 862Description and comments: i.MX Neural Networks Accelerator Plugin
822Release Location: https://github.com/nxp-imx/nn-imx -b lf-6.1.36-2.1.0 863Release Location: https://github.com/nxp-imx/nn-imx -b lf-6.1.55-2.2.0
823Origin: NXP (MIT) 864Origin: NXP (MIT)
824 Vivante Corporation (MIT) 865 Vivante Corporation (MIT)
825 Boost Software (Boost) - https://www.boost.org/ 866 Boost Software (Boost) - https://www.boost.org/
@@ -837,7 +878,7 @@ License File: LICENSE
837Package Category: Graphics 878Package Category: Graphics
838Type of Content: source 879Type of Content: source
839Description and comments: i.MX OpenCV 880Description and comments: i.MX OpenCV
840Release Location: https://github.com/nxp-imx/opencv-imx -b lf-6.1.36-2.1.0 881Release Location: https://github.com/nxp-imx/opencv-imx -b lf-6.1.55-2.2.0
841Origin: NXP (BSD-3-Cluse) 882Origin: NXP (BSD-3-Cluse)
842 OpenCV Foundation (BSD-3-Clause) - https://github.com/opencv/opencv 883 OpenCV Foundation (BSD-3-Clause) - https://github.com/opencv/opencv
843 Intel Corporation (BSD-3-Clause) 884 Intel Corporation (BSD-3-Clause)
@@ -850,9 +891,9 @@ Origin: NXP (BSD-3-Cluse)
850Multimedia Packages 891Multimedia Packages
851-------------------------------------------- 892--------------------------------------------
852 893
853Package: imx-codec-4.8.1.bin 894Package: imx-codec-4.8.2.bin
854Version: 4.8.1 895Version: 4.8.2
855Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 896Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
856License File: COPYING 897License File: COPYING
857Package Category: Multimedia 898Package Category: Multimedia
858Type of Content: binary 899Type of Content: binary
@@ -867,9 +908,9 @@ Origin: NXP (LA_OPT_NXP_Software_License)
867 908
868-------------------------------------------- 909--------------------------------------------
869 910
870Package: imx-parser-4.8.1.bin 911Package: imx-parser-4.8.2.bin
871Version: 4.8.1 912Version: 4.8.2
872Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 913Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
873License File: COPYING 914License File: COPYING
874Package Category: Multimedia 915Package Category: Multimedia
875Type of Content: binary 916Type of Content: binary
@@ -886,7 +927,7 @@ License File: LICENSE.txt
886Package Category: Multimedia 927Package Category: Multimedia
887Type of Content: source 928Type of Content: source
888Description and comments: i.MX Gstreamer 1.0 plugins 929Description and comments: i.MX Gstreamer 1.0 plugins
889Release Location: https://github.com/nxp-imx/imx-gst1.0-plugin -b lf-6.1.36-2.1.0 930Release Location: https://github.com/nxp-imx/imx-gst1.0-plugin -b lf-6.1.55-2.2.0
890Origin: NXP (LGPL-2.1) 931Origin: NXP (LGPL-2.1)
891 Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/ 932 Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/
892 Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/ 933 Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/
@@ -895,52 +936,52 @@ Origin: NXP (LGPL-2.1)
895-------------------------------------------- 936--------------------------------------------
896 937
897Package: gstreamer.git 938Package: gstreamer.git
898Version: 1.22.0.imx 939Version: 1.22.5.imx
899Outgoing License: LGPL-2.1 940Outgoing License: LGPL-2.1
900License File: LICENSE.txt 941License File: LICENSE.txt
901Package Category: Multimedia 942Package Category: Multimedia
902Type of Content: source 943Type of Content: source
903Description and comments: Open Source Multimedia Farmework 944Description and comments: Open Source Multimedia Farmework
904Release Location: https://github.com/nxp-imx/gstreamer -b lf-6.1.36-2.1.0 945Release Location: https://github.com/nxp-imx/gstreamer -b lf-6.1.55-2.2.0
905Origin: NXP (LGPL-2.1) 946Origin: NXP (LGPL-2.1)
906 GStreamer (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gstreamer/ 947 GStreamer (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gstreamer/
907 948
908-------------------------------------------- 949--------------------------------------------
909 950
910Package: gst-plugins-good.git 951Package: gst-plugins-good.git
911Version: 1.22.0.imx 952Version: 1.22.5.imx
912Outgoing License: LGPL-2.1 953Outgoing License: LGPL-2.1
913License File: LICENSE.txt 954License File: LICENSE.txt
914Package Category: Multimedia 955Package Category: Multimedia
915Type of Content: source 956Type of Content: source
916Description and comments: Gstreamer plugins with good quality code and correct functionality 957Description and comments: Gstreamer plugins with good quality code and correct functionality
917Release Location: https://github.com/nxp-imx/gst-plugins-good -b lf-6.1.36-2.1.0 958Release Location: https://github.com/nxp-imx/gst-plugins-good -b lf-6.1.55-2.2.0
918Origin: NXP (LGPL-2.1) 959Origin: NXP (LGPL-2.1)
919 Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/ 960 Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/
920 961
921-------------------------------------------- 962--------------------------------------------
922 963
923Package: gst-plugins-base.git 964Package: gst-plugins-base.git
924Version: 1.22.0.imx 965Version: 1.22.5.imx
925Outgoing License: LGPL-2.1 966Outgoing License: LGPL-2.1
926License File: LICENSE.txt 967License File: LICENSE.txt
927Package Category: Multimedia 968Package Category: Multimedia
928Type of Content: source 969Type of Content: source
929Description and comments: Collection of well-groomed and well-maintained Gstreamer plugins 970Description and comments: Collection of well-groomed and well-maintained Gstreamer plugins
930Release Location: https://github.com/nxp-imx/gst-plugins-base -b lf-6.1.36-2.1.0 971Release Location: https://github.com/nxp-imx/gst-plugins-base -b lf-6.1.55-2.2.0
931Origin: NXP (LGPL-2.1) 972Origin: NXP (LGPL-2.1)
932 Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/ 973 Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/
933 974
934-------------------------------------------- 975--------------------------------------------
935 976
936Package: gst-plugins-bad.git 977Package: gst-plugins-bad.git
937Version: 1.22.0.imx 978Version: 1.22.5.imx
938Outgoing License: LGPL-2.1 979Outgoing License: LGPL-2.1
939License File: LICENSE.txt 980License File: LICENSE.txt
940Package Category: Multimedia 981Package Category: Multimedia
941Type of Content: source 982Type of Content: source
942Description and comments: Gstreamer plug-ins that aren't up to par compared to the rest. Close to good quality but missing something. 983Description and comments: Gstreamer plug-ins that aren't up to par compared to the rest. Close to good quality but missing something.
943Release Location: https://github.com/nxp-imx/gst-plugins-bad -b lf-6.1.36-2.1.0 984Release Location: https://github.com/nxp-imx/gst-plugins-bad -b lf-6.1.55-2.2.0
944Origin: NXP (LGPL-2.1) 985Origin: NXP (LGPL-2.1)
945 Gstreamer plugins-Bad (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-bad/ 986 Gstreamer plugins-Bad (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-bad/
946 987
@@ -971,14 +1012,26 @@ Origin: NXP (LA_OPT_NXP_Software_License)
971 1012
972-------------------------------------------- 1013--------------------------------------------
973 1014
1015Package: imx-opencl-converter-0.1.bin
1016Version: 0.1
1017Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
1018License File: COPYING
1019Package Category: Multimedia
1020Type of Content: binary
1021Description and comments: i.MX multimedia opencl converter library
1022Release Location: Mirror
1023Origin: NXP (LA_OPT_NXP_Software_License)
1024
1025--------------------------------------------
1026
974Package: imx-vpuwrap.git 1027Package: imx-vpuwrap.git
975Version: git 1028Version: git
976Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 1029Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
977License File: COPYING 1030License File: LICENSE.txt
978Package Category: Multimedia 1031Package Category: Multimedia
979Type of Content: source 1032Type of Content: source
980Description and comments: i.MX VPU wrapper library 1033Description and comments: i.MX VPU wrapper library
981Release Location: https://github.com/NXP/imx-vpuwrap.git -b lf-6.1.36-2.1.0 1034Release Location: https://github.com/NXP/imx-vpuwrap.git -b lf-6.1.55-2.2.0
982Origin: NXP (LA_OPT_NXP_Software_License) 1035Origin: NXP (LA_OPT_NXP_Software_License)
983 sqlite (Public Domain) - http://www.hwaci.com/sw/sqlite/index.html 1036 sqlite (Public Domain) - http://www.hwaci.com/sw/sqlite/index.html
984 1037
@@ -997,9 +1050,9 @@ Origin: NXP (LA_OPT_NXP_Software_License)
997 1050
998-------------------------------------------- 1051--------------------------------------------
999 1052
1000Package: imx-vpu-hantro-1.30.0.bin 1053Package: imx-vpu-hantro-1.31.0.bin
1001Version: 1.30.0 1054Version: 1.31.0
1002Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 1055Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
1003License File: COPYING 1056License File: COPYING
1004Package Category: Multimedia 1057Package Category: Multimedia
1005Type of Content: binary 1058Type of Content: binary
@@ -1012,8 +1065,8 @@ Origin: VeriSilicon Inc. (LA_OPT_NXP_Software_License)
1012 1065
1013-------------------------------------------- 1066--------------------------------------------
1014 1067
1015Package: imx-vpu-hantro-daemon-1.1.8 1068Package: imx-vpu-hantro-daemon-1.1.9
1016Version: 1.1.8 1069Version: 1.1.9
1017Outgoing License: MIT License 1070Outgoing License: MIT License
1018License File: LICENSE.txt 1071License File: LICENSE.txt
1019Package Category: Multimedia 1072Package Category: Multimedia
@@ -1054,9 +1107,9 @@ Origin: NXP (GPL-2.0)
1054 1107
1055-------------------------------------------- 1108--------------------------------------------
1056 1109
1057Package: imx-dsp-2.1.5.bin 1110Package: imx-dsp-2.1.6.bin
1058Version: 2.1.5 1111Version: 2.1.6
1059Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 1112Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
1060License File: COPYING 1113License File: COPYING
1061Package Category: Multimedia 1114Package Category: Multimedia
1062Type of Content: binary 1115Type of Content: binary
@@ -1068,9 +1121,9 @@ Origin: NXP (LA_OPT_NXP_Software_License)
1068 1121
1069-------------------------------------------- 1122--------------------------------------------
1070 1123
1071Package: imx-dsp-codec-ext-2.1.5.bin 1124Package: imx-dsp-codec-ext-2.1.6.bin
1072Version: 2.1.5 1125Version: 2.1.6
1073Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 1126Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
1074License File: COPYING 1127License File: COPYING
1075Package Category: Multimedia 1128Package Category: Multimedia
1076Type of Content: binary 1129Type of Content: binary
@@ -1089,7 +1142,7 @@ License File: LICENSE
1089Package Category: Multimedia 1142Package Category: Multimedia
1090Type of Content: source 1143Type of Content: source
1091Description and comments: NXP Audio-Front-end is the software wrapper for ALSA 1144Description and comments: NXP Audio-Front-end is the software wrapper for ALSA
1092Release Location: https://github.com/nxp-imx/nxp-afe -b lf-6.1.36-2.1.0 1145Release Location: https://github.com/nxp-imx/nxp-afe -b lf-6.1.55-2.2.0
1093Origin: NXP (BSD-3-Clause) 1146Origin: NXP (BSD-3-Clause)
1094 1147
1095-------------------------------------------- 1148--------------------------------------------
@@ -1101,7 +1154,7 @@ License File: LICENSE.txt
1101Package Category: Multimedia 1154Package Category: Multimedia
1102Type of Content: source 1155Type of Content: source
1103Description and comments: NXP RetuneDSP Voice Seeker 1156Description and comments: NXP RetuneDSP Voice Seeker
1104Release Location: https://github.com/nxp-imx/imx-voiceUI -b lf-6.1.36-2.1.0 1157Release Location: https://github.com/nxp-imx/imx-voiceUI -b lf-6.1.55-2.2.0
1105Origin: NXP (Proprietary) 1158Origin: NXP (Proprietary)
1106 Ne10 (BSD-3-Clause) - https://github.com/projectNe10/Ne10 1159 Ne10 (BSD-3-Clause) - https://github.com/projectNe10/Ne10
1107 pugixml (MIT) - https://github.com/zeux/pugixml 1160 pugixml (MIT) - https://github.com/zeux/pugixml
@@ -1260,9 +1313,9 @@ Origin: NXP (LA_OPT_NXP_Software_License)
1260 1313
1261-------------------------------------------- 1314--------------------------------------------
1262 1315
1263Package: imx93-m33-demo-2.14.1.bin 1316Package: imx93-m33-demo-2.14.2.bin
1264Version: 2.14.1 1317Version: 2.14.2
1265Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 Additional distribution license granted - Section 2.3 applies 1318Outgoing License: LA_OPT_NXP_Software_License v49 September 2023 Additional distribution license granted - Section 2.3 applies
1266License File: COPYING 1319License File: COPYING
1267Package Category: M33_Processor 1320Package Category: M33_Processor
1268Type of Content: binary 1321Type of Content: binary
@@ -1286,7 +1339,7 @@ License File: LICENSE
1286Package Category: MachineLearning 1339Package Category: MachineLearning
1287Type of Content: source 1340Type of Content: source
1288Description and comments: ARM Compute Library fork 1341Description and comments: ARM Compute Library fork
1289Release Location: https://github.com/nxp-imx/arm-computelibrary-imx -b lf-6.1.36-2.1.0 1342Release Location: https://github.com/nxp-imx/arm-computelibrary-imx -b lf-6.1.55-2.2.0
1290Origin: NXP (MIT) 1343Origin: NXP (MIT)
1291 ARM Software (MIT) - https://github.com/ARM-software/ComputeLibrary 1344 ARM Software (MIT) - https://github.com/ARM-software/ComputeLibrary
1292 1345
@@ -1299,7 +1352,7 @@ License File: LICENSE
1299Package Category: MachineLearning 1352Package Category: MachineLearning
1300Type of Content: source 1353Type of Content: source
1301Description and comments: eIQ examples based on TensorFlow Lite 1354Description and comments: eIQ examples based on TensorFlow Lite
1302Release Location: https://github.com/nxp-imx/eiq-examples -b lf-6.1.36-2.1.0 1355Release Location: https://github.com/nxp-imx/eiq-examples -b lf-6.1.55-2.2.0
1303Origin: NXP (Apache-2.0) 1356Origin: NXP (Apache-2.0)
1304 tensorflow v2.10.0 (Apache-2.0) - https://github.com/tensorflow/tensorflow 1357 tensorflow v2.10.0 (Apache-2.0) - https://github.com/tensorflow/tensorflow
1305 hand_tracking (Apache-2.0) - https://github.com/wolterlw/hand_tracking 1358 hand_tracking (Apache-2.0) - https://github.com/wolterlw/hand_tracking
@@ -1313,20 +1366,20 @@ License File: LICENSE
1313Package Category: MachineLearning 1366Package Category: MachineLearning
1314Type of Content: source 1367Type of Content: source
1315Description and comments: Open Deep Learning Compiler Stack 1368Description and comments: Open Deep Learning Compiler Stack
1316Release Location: https://github.com/nxp-imx/eiq-tvm-imx -b lf-6.1.36-2.1.0 1369Release Location: https://github.com/nxp-imx/eiq-tvm-imx -b lf-6.1.55-2.2.0
1317Origin: NXP (Apache-2.0) 1370Origin: NXP (Apache-2.0)
1318 Apache TVM (Apache-2.0) - https://github.com/apache/tvm 1371 Apache TVM (Apache-2.0) - https://github.com/apache/tvm
1319 1372
1320-------------------------------------------- 1373--------------------------------------------
1321 1374
1322Package: ethos-u-driver-stack-imx.git 1375Package: ethos-u-driver-stack-imx.git
1323Version: 22.08 1376Version: 23.08
1324Outgoing License: Apache-2.0 1377Outgoing License: Apache-2.0
1325License File: LICENSE.txt 1378License File: LICENSE.txt
1326Package Category: MachineLearning 1379Package Category: MachineLearning
1327Type of Content: source 1380Type of Content: source
1328Description and comments: ethos-u-driver-stack is the user space driver library for ethos-u NPU on iMX93 platform 1381Description and comments: ethos-u-driver-stack is the user space driver library for ethos-u NPU on iMX93 platform
1329Release Location: https://github.com/nxp-imx/ethos-u-driver-stack-imx -b lf-6.1.36-2.1.0 1382Release Location: https://github.com/nxp-imx/ethos-u-driver-stack-imx -b lf-6.1.55-2.2.0
1330Origin: NXP (BSD-3-Clause) 1383Origin: NXP (BSD-3-Clause)
1331 ARM Limited ethos-u-linux-driver-stack v22.02 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-linux-driver-stack.git 1384 ARM Limited ethos-u-linux-driver-stack v22.02 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-linux-driver-stack.git
1332 FlatBuffers (Apache-2.0) 1385 FlatBuffers (Apache-2.0)
@@ -1335,13 +1388,13 @@ Origin: NXP (BSD-3-Clause)
1335-------------------------------------------- 1388--------------------------------------------
1336 1389
1337Package: ethos-u-firmware.git 1390Package: ethos-u-firmware.git
1338Version: 22.08 1391Version: 23.08
1339Outgoing License: Apache-2.0 1392Outgoing License: Apache-2.0
1340License File: LICENSE.txt 1393License File: LICENSE.txt
1341Package Category: MachineLearning 1394Package Category: MachineLearning
1342Type of Content: source 1395Type of Content: source
1343Description and comments: ethos-u-firmware is the binary NPU driver running on cortex-m33 core of NXP iMX93 platform 1396Description and comments: ethos-u-firmware is the binary NPU driver running on cortex-m33 core of NXP iMX93 platform
1344Release Location: https://github.com/nxp-imx/ethos-u-firmware -b lf-6.1.36-2.1.0 1397Release Location: https://github.com/nxp-imx/ethos-u-firmware -b lf-6.1.55-2.2.0
1345Origin: NXP (BSD-3-Clause) 1398Origin: NXP (BSD-3-Clause)
1346 ARM Limited ethos-u-linux-driver-stack v22.02 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-core-software.git 1399 ARM Limited ethos-u-linux-driver-stack v22.02 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-core-software.git
1347 Amazon.com, Inc. FreeRTOS (MIT) - https://git.mlplatform.org/ml/ethos-u/ethos-u-core-software.git/tree/rtos/freertos_config/FreeRTOSConfig.h.in 1400 Amazon.com, Inc. FreeRTOS (MIT) - https://git.mlplatform.org/ml/ethos-u/ethos-u-core-software.git/tree/rtos/freertos_config/FreeRTOSConfig.h.in
@@ -1349,39 +1402,27 @@ Origin: NXP (BSD-3-Clause)
1349-------------------------------------------- 1402--------------------------------------------
1350 1403
1351Package: ethos-u-vela.git 1404Package: ethos-u-vela.git
1352Version: 3.8.0 1405Version: 3.9.0
1353Outgoing License: Apache-2.0 1406Outgoing License: Apache-2.0
1354License File: LICENSE.txt 1407License File: LICENSE.txt
1355Package Category: MachineLearning 1408Package Category: MachineLearning
1356Type of Content: source 1409Type of Content: source
1357Description and comments: Tool to compile a TensorFlow Lite for Microcontrollers neural network model 1410Description and comments: Tool to compile a TensorFlow Lite for Microcontrollers neural network model
1358Release Location: https://github.com/nxp-imx/ethos-u-vela -b lf-6.1.36-2.1.0 1411Release Location: https://github.com/nxp-imx/ethos-u-vela -b lf-6.1.55-2.2.0
1359Origin: NXP (BSD-3-Clause) 1412Origin: NXP (BSD-3-Clause)
1360 ARM Limited ethos-u-vela v22.02 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-vela.git 1413 ARM Limited ethos-u-vela v22.02 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-vela.git
1361 FlatBuffers (Apache-2.0) 1414 FlatBuffers (Apache-2.0)
1362 1415
1363-------------------------------------------- 1416--------------------------------------------
1364 1417
1365Package: modelrunner-2.3.0.bin
1366Version: 2.3.0
1367Outgoing License: LA_OPT_NXP_Software_License v48 July 2023 No distribution license granted - Section 2.2 applies
1368License File: COPYING
1369Package Category: MachineLearning
1370Type of Content: binary
1371Description and comments: Machine Learning Au-Zone ModelRunner for i.MX8 Application Processors
1372Release Location: Mirror
1373Origin: Au-Zone Technologies (LA_OPT_NXP_Software_License - see appendix)
1374
1375--------------------------------------------
1376
1377Package: nnshark.git 1418Package: nnshark.git
1378Version: 2021.10.imx 1419Version: 2023.11.imx
1379Outgoing License: LGPL-2.1 1420Outgoing License: LGPL-2.1
1380License File: COPYING.LESSER 1421License File: COPYING.LESSER
1381Package Category: MachineLearning 1422Package Category: MachineLearning
1382Type of Content: source 1423Type of Content: source
1383Description and comments: A GStreamer NNstreamer pipelines real-time profiling plugin 1424Description and comments: A GStreamer NNstreamer pipelines real-time profiling plugin
1384Release Location: https://github.com/nxp-imx/nnshark -b lf-6.1.36-2.1.0 1425Release Location: https://github.com/nxp-imx/nnshark -b lf-6.1.55-2.2.0
1385Origin: NXP (LGPL-2.1) 1426Origin: NXP (LGPL-2.1)
1386 GstShark (LGPL-2.1) - https://github.com/RidgeRun/gst-shark 1427 GstShark (LGPL-2.1) - https://github.com/RidgeRun/gst-shark
1387 1428
@@ -1390,13 +1431,13 @@ Origin: NXP (LGPL-2.1)
1390-------------------------------------------- 1431--------------------------------------------
1391 1432
1392Package: onnxruntime-imx.git 1433Package: onnxruntime-imx.git
1393Version: 1.13.1 1434Version: 1.16.1
1394Outgoing License: MIT 1435Outgoing License: MIT
1395License File: LICENSE 1436License File: LICENSE
1396Package Category: MachineLearning 1437Package Category: MachineLearning
1397Type of Content: source 1438Type of Content: source
1398Description and comments: Onnxruntime cross-platform scoring engine 1439Description and comments: Onnxruntime cross-platform scoring engine
1399Release Location: https://github.com/nxp-imx/onnxruntime-imx -b lf-6.1.36-2.1.0 1440Release Location: https://github.com/nxp-imx/onnxruntime-imx -b lf-6.1.55-2.2.0
1400Origin: NXP (MIT) 1441Origin: NXP (MIT)
1401 Microsoft/onnxruntime (MIT) - https://github.com/Microsoft/onnxruntime 1442 Microsoft/onnxruntime (MIT) - https://github.com/Microsoft/onnxruntime
1402 Google's Protocol Buffer (BSD-3-clause) - https://tracker.debian.org/pkg/protobuf 1443 Google's Protocol Buffer (BSD-3-clause) - https://tracker.debian.org/pkg/protobuf
@@ -1411,33 +1452,33 @@ License File: LICENSE
1411Package Category: MachineLearning 1452Package Category: MachineLearning
1412Type of Content: source 1453Type of Content: source
1413Description and comments: Tensors and Dynamic neural networks in Python with strong GPU acceleration 1454Description and comments: Tensors and Dynamic neural networks in Python with strong GPU acceleration
1414Release Location: https://github.com/nxp-imx/pytorch-release -b lf-6.1.36-2.1.0 1455Release Location: https://github.com/nxp-imx/pytorch-release -b lf-6.1.55-2.2.0
1415Origin: NXP (BSD-3-Clause) 1456Origin: NXP (BSD-3-Clause)
1416 pytorch (BSD-3-clause) - https://github.com/pytorch/pytorch 1457 pytorch (BSD-3-clause) - https://github.com/pytorch/pytorch
1417 1458
1418-------------------------------------------- 1459--------------------------------------------
1419 1460
1420Package: tensorflow-imx.git 1461Package: tensorflow-imx.git
1421Version: 2.11.1 1462Version: 2.12.1
1422Outgoing License: Apache-2.0 1463Outgoing License: Apache-2.0
1423License File: LICENSE 1464License File: LICENSE
1424Package Category: MachineLearning 1465Package Category: MachineLearning
1425Type of Content: source 1466Type of Content: source
1426Description and comments: TensorFlow Lite C++ Library 1467Description and comments: TensorFlow Lite C++ Library
1427Release Location: https://github.com/nxp-imx/tensorflow-imx -b lf-6.1.36-2.1.0 1468Release Location: https://github.com/nxp-imx/tensorflow-imx -b lf-6.1.55-2.2.0
1428Origin: NXP (Apache-2.0) 1469Origin: NXP (Apache-2.0)
1429 TensorFlow (Apache-2.0) - https://github.com/tensorflow/tensorflow/ 1470 TensorFlow (Apache-2.0) - https://github.com/tensorflow/tensorflow/
1430 1471
1431-------------------------------------------- 1472--------------------------------------------
1432 1473
1433Package: tflite-ethosu-delegate.git 1474Package: tflite-ethosu-delegate.git
1434Version: 2.11.1 1475Version: 2.12.1
1435Outgoing License: Apache-2.0 1476Outgoing License: Apache-2.0
1436License File: LICENSE 1477License File: LICENSE
1437Package Category: MachineLearning 1478Package Category: MachineLearning
1438Type of Content: source 1479Type of Content: source
1439Description and comments: TensorFlow Lite Ethos-u Delegate 1480Description and comments: TensorFlow Lite Ethos-u Delegate
1440Release Location: https://github.com/nxp-imx/tflite-ethosu-delegate-imx -b lf-6.1.36-2.1.0 1481Release Location: https://github.com/nxp-imx/tflite-ethosu-delegate-imx -b lf-6.1.55-2.2.0
1441Origin: NXP (Apache-2.0) 1482Origin: NXP (Apache-2.0)
1442 tensorflow v2.10.0 (Apache-2.0) - https://github.com/tensorflow/tensorflow 1483 tensorflow v2.10.0 (Apache-2.0) - https://github.com/tensorflow/tensorflow
1443 ARM ethos-u-linux-driver-stack v22.08 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-linux-driver-stack.git 1484 ARM ethos-u-linux-driver-stack v22.08 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-linux-driver-stack.git
@@ -1445,13 +1486,13 @@ Origin: NXP (Apache-2.0)
1445-------------------------------------------- 1486--------------------------------------------
1446 1487
1447Package: tflite-vx-delegate-imx.git 1488Package: tflite-vx-delegate-imx.git
1448Version: 2.11.1 1489Version: 2.12.1
1449Outgoing License: MIT 1490Outgoing License: MIT
1450License File: LICENSE 1491License File: LICENSE
1451Package Category: MachineLearning 1492Package Category: MachineLearning
1452Type of Content: source 1493Type of Content: source
1453Description and comments: TensorFlow Lite VX Delegate 1494Description and comments: TensorFlow Lite VX Delegate
1454Release Location: https://github.com/nxp-imx/tflite-vx-delegate-imx -b lf-6.1.36-2.1.0 1495Release Location: https://github.com/nxp-imx/tflite-vx-delegate-imx -b lf-6.1.55-2.2.0
1455Origin: VeriSilicon Inc. (Apache-2.0) - https://github.com/VeriSilicon/tflite-vx-delegate.git 1496Origin: VeriSilicon Inc. (Apache-2.0) - https://github.com/VeriSilicon/tflite-vx-delegate.git
1456 The TensorFlow Authors (Apache-2.0) - https://cs.opensource.google/tensorflow/tensorflow/+/master:tensorflow/lite/examples/minimal/ 1497 The TensorFlow Authors (Apache-2.0) - https://cs.opensource.google/tensorflow/tensorflow/+/master:tensorflow/lite/examples/minimal/
1457 1498
@@ -1464,7 +1505,7 @@ License File: LICENSE
1464Package Category: MachineLearning 1505Package Category: MachineLearning
1465Type of Content: source 1506Type of Content: source
1466Description and comments: Tensor Interface Module for OpenVX 1507Description and comments: Tensor Interface Module for OpenVX
1467Release Location: https://github.com/nxp-imx/tim-vx-imx -b lf-6.1.36-2.1.0 1508Release Location: https://github.com/nxp-imx/tim-vx-imx -b lf-6.1.55-2.2.0
1468Origin: Vivante Corporation (MIT) 1509Origin: Vivante Corporation (MIT)
1469 The Khronos Group Inc. (Apache-2.0) - https://www.khronos.org/ 1510 The Khronos Group Inc. (Apache-2.0) - https://www.khronos.org/
1470 The Android Open Source Project (Apache 2.0) - https://developer.android.com/index.html 1511 The Android Open Source Project (Apache 2.0) - https://developer.android.com/index.html
diff --git a/classes/uuu_bootloader_tag.bbclass b/classes/uuu_bootloader_tag.bbclass
index fb6acd72..87745660 100644
--- a/classes/uuu_bootloader_tag.bbclass
+++ b/classes/uuu_bootloader_tag.bbclass
@@ -4,8 +4,9 @@
4do_deploy:append() { 4do_deploy:append() {
5 if [ "${UUU_BOOTLOADER}" != "" ]; then 5 if [ "${UUU_BOOTLOADER}" != "" ]; then
6 cp ${DEPLOYDIR}/${UUU_BOOTLOADER} ${DEPLOYDIR}/${UUU_BOOTLOADER_TAGGED} 6 cp ${DEPLOYDIR}/${UUU_BOOTLOADER} ${DEPLOYDIR}/${UUU_BOOTLOADER_TAGGED}
7 cp ${DEPLOYDIR}/${UUU_BOOTLOADER} ${DEPLOYDIR}/${UUU_BOOTLOADER_UNTAGGED}
7 ln -sf ${UUU_BOOTLOADER_TAGGED} ${DEPLOYDIR}/${UUU_BOOTLOADER} 8 ln -sf ${UUU_BOOTLOADER_TAGGED} ${DEPLOYDIR}/${UUU_BOOTLOADER}
8 stat -L -cUUUBURNXXOEUZX7+A-XY5601QQWWZ%sEND ${DEPLOYDIR}/${UUU_BOOTLOADER} \ 9 stat -L -cUUUBURNXXOEUZX7+A-XY5601QQWWZ%sEND ${DEPLOYDIR}/${UUU_BOOTLOADER_TAGGED} \
9 >> ${DEPLOYDIR}/${UUU_BOOTLOADER} 10 >> ${DEPLOYDIR}/${UUU_BOOTLOADER_TAGGED}
10 fi 11 fi
11} 12}
diff --git a/conf/layer.conf b/conf/layer.conf
index 49a94d61..ef4e3e6e 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -28,6 +28,12 @@ ${IMX_MIRROR} http://download.ossystems.com.br/bsp/freescale/source/ \n \
28# implemented in imx GL driver implementation 28# implemented in imx GL driver implementation
29COMPATIBLE_HOST:pn-xdg-desktop-portal-wlr:imxgpu = "(null)" 29COMPATIBLE_HOST:pn-xdg-desktop-portal-wlr:imxgpu = "(null)"
30 30
31# For compatibility with layers before scarthgap
32PROVIDES:pn-bmap-tools-native = "bmaptool-native"
33RPROVIDES:pn-bmap-tools-native:bmap-tools-native = "bmaptool-native"
34PROVIDES:pn-bmap-tools = "bmaptool"
35RPROVIDES:pn-bmap-tools:bmap-tools = "bmaptool"
36
31BBFILES_DYNAMIC += " \ 37BBFILES_DYNAMIC += " \
32 aglprofilegraphical:${LAYERDIR}/dynamic-layers/aglprofilegraphical/*/*/*.bb \ 38 aglprofilegraphical:${LAYERDIR}/dynamic-layers/aglprofilegraphical/*/*/*.bb \
33 aglprofilegraphical:${LAYERDIR}/dynamic-layers/aglprofilegraphical/*/*/*.bbappend \ 39 aglprofilegraphical:${LAYERDIR}/dynamic-layers/aglprofilegraphical/*/*/*.bbappend \
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 87a17153..7f4ae4d7 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -593,12 +593,12 @@ PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.239.0.imx"
593PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.239.0.imx" 593PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.239.0.imx"
594 594
595# Use i.MX optee Version 595# Use i.MX optee Version
596PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "3.21.0.imx" 596PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.0.0.imx"
597PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "3.21.0.imx" 597PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.0.0.imx"
598PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.21.0.imx" 598PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.0.0.imx"
599PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.21.0.imx" 599PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.0.0.imx"
600PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.21.0.imx" 600PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.0.0.imx"
601PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.21.0.imx" 601PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.0.0.imx"
602 602
603# Use i.MX opencv Version 603# Use i.MX opencv Version
604PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" 604PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
@@ -637,7 +637,7 @@ WKS_FILE_DEPENDS ?= " \
637 virtual/bootloader \ 637 virtual/bootloader \
638 \ 638 \
639 e2fsprogs-native \ 639 e2fsprogs-native \
640 bmap-tools-native \ 640 bmaptool-native \
641 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ 641 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \
642" 642"
643 643
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
index fe2cd9e3..1c51fc09 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
@@ -41,6 +41,10 @@ PACKAGECONFIG_PLATFORM:use-mainline-bsp = " \
41 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}" 41 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}"
42 42
43PACKAGECONFIG += " \ 43PACKAGECONFIG += " \
44 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${PACKAGECONFIG_WAYLAND}', '', d)}"
45PACKAGECONFIG_WAYLAND = "wayland"
46
47PACKAGECONFIG += " \
44 ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" 48 ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}"
45PACKAGECONFIG_VULKAN = "" 49PACKAGECONFIG_VULKAN = ""
46PACKAGECONFIG_VULKAN:imxgpu = " \ 50PACKAGECONFIG_VULKAN:imxgpu = " \
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index db09982a..74b7bddf 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -13,7 +13,7 @@ PE = "1"
13PV = "5.9+${SRCPV}" 13PV = "5.9+${SRCPV}"
14 14
15SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" 15SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
16SRCBRANCH = "lf-6.1.22_2.0.0" 16SRCBRANCH = "lf-6.1.55_2.2.0"
17SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547" 17SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index d5aef3c6..a761870b 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -25,6 +25,7 @@ inherit deploy uuu_bootloader_tag
25 25
26UUU_BOOTLOADER = "${BOOT_NAME}" 26UUU_BOOTLOADER = "${BOOT_NAME}"
27UUU_BOOTLOADER_TAGGED = "${BOOT_NAME}-tagged" 27UUU_BOOTLOADER_TAGGED = "${BOOT_NAME}-tagged"
28UUU_BOOTLOADER_UNTAGGED = "${BOOT_NAME}-untagged"
28 29
29# Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build 30# Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build
30CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}" 31CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}"
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index 815a77df..5d30179d 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -19,8 +19,8 @@ PV = "7.0+${SRCPV}"
19 19
20SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ 20SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
21 file://memtool_profile" 21 file://memtool_profile"
22SRCBRANCH = "lf-6.1.22_2.0.0" 22SRCBRANCH = "lf-6.1.55_2.2.0"
23SRCREV = "9fe083c29439b71292df9a8e4d40c73f25828a69" 23SRCREV = "e8b3c9026553233491abb4df4185dd7291a8ffb2"
24 24
25S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"
26 26
@@ -73,11 +73,11 @@ do_install() {
73 if [ -e ${WORKDIR}/clocks.sh ]; then 73 if [ -e ${WORKDIR}/clocks.sh ]; then
74 install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh 74 install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
75 fi 75 fi
76 install -d -m 0755 ${D}/home/root/ 76 install -d -m 0755 ${D}${ROOT_HOME}/
77 install -m 0644 ${WORKDIR}/memtool_profile ${D}/home/root/.profile 77 install -m 0644 ${WORKDIR}/memtool_profile ${D}${ROOT_HOME}/.profile
78} 78}
79 79
80FILES:${PN} += "/unit_tests /home/root/.profile" 80FILES:${PN} += "/unit_tests ${ROOT_HOME}/.profile"
81RDEPENDS:${PN} = "bash" 81RDEPENDS:${PN} = "bash"
82 82
83FILES:${PN}-dbg += "/unit_tests/.debug" 83FILES:${PN}-dbg += "/unit_tests/.debug"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2023.10.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2024.01.inc
index 1b8a720b..ee05df89 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2023.10.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2024.01.inc
@@ -10,10 +10,10 @@ DEPENDS += "flex-native bison-native"
10 10
11SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" 11SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
12 12
13SRCREV = "105a9c8cc0a8551195e2a5ac8812802f12604ff6" 13SRCREV = "9ff224ca0039e9cd22be2ec4b56408cb64d71a87"
14SRCBRANCH = "2023.10+fslc" 14SRCBRANCH = "2024.01+fslc"
15 15
16PV = "2023.10+git${SRCPV}" 16PV = "2024.01+git${SRCPV}"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19B = "${WORKDIR}/build" 19B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2023.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.01.bb
index b7e4ca76..b7e4ca76 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2023.10.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.01.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2023.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2024.01.bb
index eba8876a..eba8876a 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2023.10.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2024.01.bb
diff --git a/recipes-bsp/u-boot/u-boot-imx_2023.04.bb b/recipes-bsp/u-boot/u-boot-imx_2023.04.bb
index f0ebdc5f..0e7c467b 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2023.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2023.04.bb
@@ -9,12 +9,15 @@ PROVIDES += "u-boot u-boot-mfgtool"
9 9
10inherit uuu_bootloader_tag 10inherit uuu_bootloader_tag
11 11
12UUU_BOOTLOADER = "" 12UUU_BOOTLOADER = ""
13UUU_BOOTLOADER:mx6-generic-bsp = "${UBOOT_BINARY}" 13UUU_BOOTLOADER:mx6-generic-bsp = "${UBOOT_BINARY}"
14UUU_BOOTLOADER:mx7-generic-bsp = "${UBOOT_BINARY}" 14UUU_BOOTLOADER:mx7-generic-bsp = "${UBOOT_BINARY}"
15UUU_BOOTLOADER_TAGGED = "" 15UUU_BOOTLOADER_TAGGED = ""
16UUU_BOOTLOADER_TAGGED:mx6-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" 16UUU_BOOTLOADER_TAGGED:mx6-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}"
17UUU_BOOTLOADER_TAGGED:mx7-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" 17UUU_BOOTLOADER_TAGGED:mx7-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}"
18UUU_BOOTLOADER_UNTAGGED = ""
19UUU_BOOTLOADER_UNTAGGED:mx6-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}"
20UUU_BOOTLOADER_UNTAGGED:mx7-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}"
18 21
19do_deploy:append:mx8m-generic-bsp() { 22do_deploy:append:mx8m-generic-bsp() {
20 # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary 23 # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
diff --git a/recipes-devtools/uuu/files/0001-libuuu-usbhotplug.cpp-don-t-limit-retry-logic-to-win.patch b/recipes-devtools/uuu/files/0001-libuuu-usbhotplug.cpp-don-t-limit-retry-logic-to-win.patch
deleted file mode 100644
index 3c53a65c..00000000
--- a/recipes-devtools/uuu/files/0001-libuuu-usbhotplug.cpp-don-t-limit-retry-logic-to-win.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From 51e8aa31a9260492576e316096dc8fb68065a7fd Mon Sep 17 00:00:00 2001
2From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
3Date: Fri, 22 Dec 2023 11:57:15 +0100
4Subject: [PATCH] libuuu/usbhotplug.cpp: don't limit retry logic to windows
5
6When using the udev rules to avoid use of sudo, we have sometimes
7observed uuu spuriously failing because it sees the device and
8attempts to open it, before the udev daemon has had a chance to apply
9its rules and grant access to the current user (via the 'uaccess'
10tag).
11
12The error in that case is -EACCES which libusb translates to
13LIBUSB_ERROR_ACCESS, so extend the retry logic to that case. Also,
14since I have seen the open() succeed on the 5th and last attempt, bump
15the number of retries to 10, for a total of around 2 seconds instead
16of just 1.
17
18Upstream-Status: Submitted [https://github.com/nxp-imx/mfgtools/pull/407]
19Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
20---
21 libuuu/usbhotplug.cpp | 11 ++++++-----
22 1 file changed, 6 insertions(+), 5 deletions(-)
23
24diff --git a/libuuu/usbhotplug.cpp b/libuuu/usbhotplug.cpp
25index 815d9dd..cc3d6ce 100644
26--- a/libuuu/usbhotplug.cpp
27+++ b/libuuu/usbhotplug.cpp
28@@ -214,10 +214,7 @@ static string get_device_path(libusb_device *dev)
29
30 static int open_libusb(libusb_device *dev, void **usb_device_handle)
31 {
32- int retry = 1;
33-#ifdef WIN32
34- retry = 5;
35-#endif
36+ int retry = 10;
37
38 while (retry)
39 {
40@@ -226,13 +223,17 @@ static int open_libusb(libusb_device *dev, void **usb_device_handle)
41 /* work around windows open device failure 1/10
42 * sometime HID device detect need some time, refresh list
43 * to make sure HID driver installed.
44+ *
45+ * On linux, udev rules may need some time to kick in,
46+ * so also retry on -EACCES.
47 */
48 CAutoList l;
49
50 int ret;
51 if ((ret = libusb_open(dev, (libusb_device_handle **)(usb_device_handle))) < 0)
52 {
53- if ((ret != LIBUSB_ERROR_NOT_SUPPORTED) || (retry == 0))
54+ if ((ret != LIBUSB_ERROR_NOT_SUPPORTED && ret != LIBUSB_ERROR_ACCESS)
55+ || (retry == 0))
56 {
57 set_last_err_string("Failure open usb device" TRY_SUDO);
58 return -1;
59--
602.40.1.1.g1c60b9335d
61
diff --git a/recipes-devtools/uuu/uuu-bin_1.4.243.bb b/recipes-devtools/uuu/uuu-bin_1.5.165.bb
index 4ad823aa..2b5feda1 100644
--- a/recipes-devtools/uuu/uuu-bin_1.4.243.bb
+++ b/recipes-devtools/uuu/uuu-bin_1.5.165.bb
@@ -15,9 +15,9 @@ SRC_URI = " \
15 https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu.exe;downloadfilename=uuu-${PV}.exe;name=Windows \ 15 https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu.exe;downloadfilename=uuu-${PV}.exe;name=Windows \
16" 16"
17 17
18SRC_URI[Linux.sha256sum] = "dfb2a6dca337ebd59675ea5ce7f1bce6724e3b901bcb455126d4bf9bdfa2e585" 18SRC_URI[Linux.sha256sum] = "f863bba022202361d19e5026be0af408d307f78d2dbf2c139fb7eaaabd220442"
19SRC_URI[Mac.sha256sum] = "399efa4bc7e3eb452fefe89ef5e2e453b516ea716658a963a890c430ad81a471" 19SRC_URI[Mac.sha256sum] = "62da0bd7e333931fba100823aa50133621c7e6047be0546bc12e29c0ea78a4d8"
20SRC_URI[Windows.sha256sum] = "f3f178e7be161c7dc058dbcd35c8cfa1516981e7c4f915fe0256ae4cda7f101e" 20SRC_URI[Windows.sha256sum] = "013ed8bb45e21b971b6b3a5802c5f154733913714bece0b020cb770a809cd206"
21 21
22S = "${WORKDIR}" 22S = "${WORKDIR}"
23 23
diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb
index 69eed48f..e48698a8 100644
--- a/recipes-devtools/uuu/uuu_git.bb
+++ b/recipes-devtools/uuu/uuu_git.bb
@@ -3,10 +3,8 @@ DESCRIPTION = "Image deploy tool for i.MX chips"
3HOMEPAGE = "https://github.com/nxp-imx/mfgtools" 3HOMEPAGE = "https://github.com/nxp-imx/mfgtools"
4 4
5SRC_URI = "git://github.com/nxp-imx/mfgtools.git;protocol=https;branch=master" 5SRC_URI = "git://github.com/nxp-imx/mfgtools.git;protocol=https;branch=master"
6SRCREV = "de317f587003dbd6203af1c647e2fccb912f8f0d" 6SRCREV = "7347a80c7a943dd7e9081d9d2bab9e6ca8e0ba07"
7PV = "1.5.141" 7PV = "1.5.165"
8
9SRC_URI += "file://0001-libuuu-usbhotplug.cpp-don-t-limit-retry-logic-to-win.patch"
10 8
11LICENSE = "BSD-3-Clause" 9LICENSE = "BSD-3-Clause"
12LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5"
@@ -15,6 +13,6 @@ inherit cmake pkgconfig
15 13
16S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
17 15
18DEPENDS = "libusb zlib bzip2 openssl zstd" 16DEPENDS = "libusb zlib bzip2 openssl zstd libtinyxml2"
19 17
20BBCLASSEXTEND = "native nativesdk" 18BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch
deleted file mode 100644
index 5b837310..00000000
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 223ec51667cfdc6339b5c74a65c87e0e8ad970b5 Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
3Date: Tue, 31 Oct 2023 14:49:12 -0700
4Subject: [PATCH] moal_cfg80211: remove dropped REGULATORY_IGNORE_STALE_KICKOFF
5
6Upstream commit e8c2af660ba0 ("wifi: cfg80211: fix regulatory disconnect with
7OCB/NAN") removed the definition of REGULATORY_IGNORE_STALE_KICKOFF. Fix the
8driver code to indicate Kernel version where it is no longer available.
9
10Link: https://lore.kernel.org/r/20230616222844.2794d1625a26.I8e78a3789a29e6149447b3139df724a6f1b46fc3@changeid
11
12Upstream-Status: Pending
13Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
14Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
15---
16 mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c b/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c
20index bf39f0e..8a69d32 100644
21--- a/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c
22+++ b/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c
23@@ -10357,7 +10357,7 @@ mlan_status woal_register_cfg80211(moal_private *priv)
24 PRINTM(MIOCTL, "Follow countryIE provided by AP.\n");
25 }
26 #endif
27-#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
28+#if (CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && (CFG80211_VERSION_CODE < KERNEL_VERSION(6, 1, 39))
29 /*REGULATORY_IGNORE_STALE_KICKOFF: the regulatory core will _not_ make
30 * sure all interfaces on this wiphy reside on allowed channels. If this
31 * flag is not set, upon a regdomain change, the interfaces are given a
32--
332.25.1
34
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index d5258e77..0bf6154d 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -8,11 +8,10 @@ RREPLACES:${PN} = "kernel-module-nxp89xx"
8RPROVIDES:${PN} = "kernel-module-nxp89xx" 8RPROVIDES:${PN} = "kernel-module-nxp89xx"
9RCONFLICTS:${PN} = "kernel-module-nxp89xx" 9RCONFLICTS:${PN} = "kernel-module-nxp89xx"
10 10
11SRCBRANCH = "lf-6.1.22_2.0.0" 11SRCBRANCH = "lf-6.1.55_2.2.0"
12MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" 12MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
13SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH} \ 13SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}"
14 file://0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch;patchdir=${WORKDIR}/git" 14SRCREV = "952d10f3349426f917636a4560974117eb6eef5b"
15SRCREV = "f1382ccbd34fc22daf504e798745f6cddb702b82"
16 15
17S = "${WORKDIR}/git/mxm_wifiex/wlan_src" 16S = "${WORKDIR}/git/mxm_wifiex/wlan_src"
18 17
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend
index 761189af..ca6636b8 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend
@@ -6,7 +6,7 @@ PACKAGECONFIG_GL:use-mainline-bsp = \
6 "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl gbm', '', d)}" 6 "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl gbm', '', d)}"
7 7
8# The i.MX8 uses KMS instead of the Vivante specific framebuffer API. 8# The i.MX8 uses KMS instead of the Vivante specific framebuffer API.
9# The i.MX7 does not have a GPU. 9# The i.MX7 does not have a GPU, except for ULP.
10# This leaves the i.MX6 - with the vendor BSP - as the remaining use case for viv-fb. 10# This leaves the i.MX6 - with the vendor BSP - as the remaining use case for viv-fb.
11# 11#
12# (Note that viv-fb is about the _windowing system_. Vivante direct texture support 12# (Note that viv-fb is about the _windowing system_. Vivante direct texture support
@@ -14,3 +14,4 @@ PACKAGECONFIG_GL:use-mainline-bsp = \
14# which was fixed in GStreamer 1.22.5. Since then, the direct texture support is 14# which was fixed in GStreamer 1.22.5. Since then, the direct texture support is
15# detected by Meson by checking for direct texture symbols like "glTexDirectVIV".) 15# detected by Meson by checking for direct texture symbols like "glTexDirectVIV".)
16PACKAGECONFIG_GL:append:mx6-nxp-bsp = " viv-fb " 16PACKAGECONFIG_GL:append:mx6-nxp-bsp = " viv-fb "
17PACKAGECONFIG_GL:append:mx7ulp-nxp-bsp = " viv-fb "
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb
index 366314bd..29347f21 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb
@@ -125,12 +125,6 @@ S = "${WORKDIR}/git"
125 125
126inherit use-imx-headers 126inherit use-imx-headers
127 127
128# Prior to version 1.22.5, viv-fb is coupled with the Vivante direct texture feature.
129# For this reason, in these older versions, viv-fb must be enabled always, even when
130# building for SoCs like the i.MX8 that do not support the viv-fb windowing system.
131# TODO: Once this .imx recipe is upgraded to 1.22.5 or newer, drop this line.
132PACKAGECONFIG_GL:append = " viv-fb "
133
134PACKAGECONFIG_REMOVE ?= "jpeg" 128PACKAGECONFIG_REMOVE ?= "jpeg"
135PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}" 129PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
136PACKAGECONFIG:append:imxgpu2d = " g2d" 130PACKAGECONFIG:append:imxgpu2d = " g2d"
diff --git a/recipes-security/optee-imx/optee-client_3.21.0.imx.bb b/recipes-security/optee-imx/optee-client_4.0.0.imx.bb
index 3860cb6c..2a9eaa6a 100644
--- a/recipes-security/optee-imx/optee-client_3.21.0.imx.bb
+++ b/recipes-security/optee-imx/optee-client_4.0.0.imx.bb
@@ -1,7 +1,7 @@
1require optee-client-fslc-imx.inc 1require optee-client-fslc-imx.inc
2 2
3SRCBRANCH = "lf-6.1.36_2.1.0" 3SRCBRANCH = "lf-6.1.55_2.2.0"
4SRCREV = "8533e0e6329840ee96cf81b6453f257204227e6c" 4SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee"
5 5
6DEPENDS += "util-linux" 6DEPENDS += "util-linux"
7EXTRA_OEMAKE += "PKG_CONFIG=pkg-config" 7EXTRA_OEMAKE += "PKG_CONFIG=pkg-config"
diff --git a/recipes-security/optee-imx/optee-os/0001-core-Define-section-attributes-for-clang.patch b/recipes-security/optee-imx/optee-os/0001-core-Define-section-attributes-for-clang.patch
index 8a9062f3..54fbe541 100644
--- a/recipes-security/optee-imx/optee-os/0001-core-Define-section-attributes-for-clang.patch
+++ b/recipes-security/optee-imx/optee-os/0001-core-Define-section-attributes-for-clang.patch
@@ -1,4 +1,4 @@
1From b73c3d2829d3661ca66b5cc6b4181f3bf973b13f Mon Sep 17 00:00:00 2001 1From ef83625c9a5f50610e25aa860c4b9c5e64723a66 Mon Sep 17 00:00:00 2001
2From: Emekcan Aras <emekcan.aras@arm.com> 2From: Emekcan Aras <emekcan.aras@arm.com>
3Date: Wed, 21 Dec 2022 10:55:58 +0000 3Date: Wed, 21 Dec 2022 10:55:58 +0000
4Subject: [PATCH 1/4] core: Define section attributes for clang 4Subject: [PATCH 1/4] core: Define section attributes for clang
@@ -36,15 +36,15 @@ Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
36 core/arch/arm/kernel/thread.c | 19 +++++++++++++++-- 36 core/arch/arm/kernel/thread.c | 19 +++++++++++++++--
37 core/arch/arm/mm/core_mmu_lpae.c | 35 +++++++++++++++++++++++++++---- 37 core/arch/arm/mm/core_mmu_lpae.c | 35 +++++++++++++++++++++++++++----
38 core/arch/arm/mm/core_mmu_v7.c | 36 +++++++++++++++++++++++++++++--- 38 core/arch/arm/mm/core_mmu_v7.c | 36 +++++++++++++++++++++++++++++---
39 core/arch/arm/mm/pgt_cache.c | 12 ++++++++++-
40 core/kernel/thread.c | 13 +++++++++++- 39 core/kernel/thread.c | 13 +++++++++++-
40 core/mm/pgt_cache.c | 12 ++++++++++-
41 5 files changed, 104 insertions(+), 11 deletions(-) 41 5 files changed, 104 insertions(+), 11 deletions(-)
42 42
43diff --git a/core/arch/arm/kernel/thread.c b/core/arch/arm/kernel/thread.c 43diff --git a/core/arch/arm/kernel/thread.c b/core/arch/arm/kernel/thread.c
44index 22ef932f9..7a9078d2e 100644 44index 66833b3a0..b3eb9cf9a 100644
45--- a/core/arch/arm/kernel/thread.c 45--- a/core/arch/arm/kernel/thread.c
46+++ b/core/arch/arm/kernel/thread.c 46+++ b/core/arch/arm/kernel/thread.c
47@@ -44,15 +44,30 @@ static size_t thread_user_kcode_size __nex_bss; 47@@ -45,15 +45,30 @@ static size_t thread_user_kcode_size __nex_bss;
48 #if defined(CFG_CORE_UNMAP_CORE_AT_EL0) && \ 48 #if defined(CFG_CORE_UNMAP_CORE_AT_EL0) && \
49 defined(CFG_CORE_WORKAROUND_SPECTRE_BP_SEC) && defined(ARM64) 49 defined(CFG_CORE_WORKAROUND_SPECTRE_BP_SEC) && defined(ARM64)
50 long thread_user_kdata_sp_offset __nex_bss; 50 long thread_user_kdata_sp_offset __nex_bss;
@@ -78,10 +78,10 @@ index 22ef932f9..7a9078d2e 100644
78 78
79 #ifdef ARM32 79 #ifdef ARM32
80diff --git a/core/arch/arm/mm/core_mmu_lpae.c b/core/arch/arm/mm/core_mmu_lpae.c 80diff --git a/core/arch/arm/mm/core_mmu_lpae.c b/core/arch/arm/mm/core_mmu_lpae.c
81index 6df2c68cf..a877e4965 100644 81index 4c8b85e39..1885e1d3f 100644
82--- a/core/arch/arm/mm/core_mmu_lpae.c 82--- a/core/arch/arm/mm/core_mmu_lpae.c
83+++ b/core/arch/arm/mm/core_mmu_lpae.c 83+++ b/core/arch/arm/mm/core_mmu_lpae.c
84@@ -238,19 +238,46 @@ typedef uint16_t l1_idx_t; 84@@ -234,19 +234,46 @@ typedef uint16_t l1_idx_t;
85 typedef uint64_t base_xlat_tbls_t[CFG_TEE_CORE_NB_CORE][NUM_BASE_LEVEL_ENTRIES]; 85 typedef uint64_t base_xlat_tbls_t[CFG_TEE_CORE_NB_CORE][NUM_BASE_LEVEL_ENTRIES];
86 typedef uint64_t xlat_tbl_t[XLAT_TABLE_ENTRIES]; 86 typedef uint64_t xlat_tbl_t[XLAT_TABLE_ENTRIES];
87 87
@@ -133,7 +133,7 @@ index 6df2c68cf..a877e4965 100644
133 * TAs page table entry inside a level 1 page table. 133 * TAs page table entry inside a level 1 page table.
134 * 134 *
135diff --git a/core/arch/arm/mm/core_mmu_v7.c b/core/arch/arm/mm/core_mmu_v7.c 135diff --git a/core/arch/arm/mm/core_mmu_v7.c b/core/arch/arm/mm/core_mmu_v7.c
136index 58596be84..98fa58635 100644 136index 61e703da8..1960c08ca 100644
137--- a/core/arch/arm/mm/core_mmu_v7.c 137--- a/core/arch/arm/mm/core_mmu_v7.c
138+++ b/core/arch/arm/mm/core_mmu_v7.c 138+++ b/core/arch/arm/mm/core_mmu_v7.c
139@@ -204,16 +204,46 @@ typedef uint32_t l1_xlat_tbl_t[NUM_L1_ENTRIES]; 139@@ -204,16 +204,46 @@ typedef uint32_t l1_xlat_tbl_t[NUM_L1_ENTRIES];
@@ -186,35 +186,11 @@ index 58596be84..98fa58635 100644
186 186
187 struct mmu_partition { 187 struct mmu_partition {
188 l1_xlat_tbl_t *l1_table; 188 l1_xlat_tbl_t *l1_table;
189diff --git a/core/arch/arm/mm/pgt_cache.c b/core/arch/arm/mm/pgt_cache.c
190index 79553c6d2..b9efdf427 100644
191--- a/core/arch/arm/mm/pgt_cache.c
192+++ b/core/arch/arm/mm/pgt_cache.c
193@@ -410,8 +410,18 @@ void pgt_init(void)
194 * has a large alignment, while .bss has a small alignment. The current
195 * link script is optimized for small alignment in .bss
196 */
197+#ifdef __clang__
198+#pragma clang section bss=".nozi.mmu.l2"
199+#endif
200 static uint8_t pgt_tables[PGT_CACHE_SIZE][PGT_SIZE]
201- __aligned(PGT_SIZE) __section(".nozi.pgt_cache");
202+ __aligned(PGT_SIZE)
203+#ifndef __clang__
204+ __section(".nozi.pgt_cache")
205+#endif
206+ ;
207+#ifdef __clang__
208+#pragma clang section bss=""
209+#endif
210 size_t n;
211
212 for (n = 0; n < ARRAY_SIZE(pgt_tables); n++) {
213diff --git a/core/kernel/thread.c b/core/kernel/thread.c 189diff --git a/core/kernel/thread.c b/core/kernel/thread.c
214index e48294b3b..8de9064ca 100644 190index 2a1f22dce..5516b6771 100644
215--- a/core/kernel/thread.c 191--- a/core/kernel/thread.c
216+++ b/core/kernel/thread.c 192+++ b/core/kernel/thread.c
217@@ -38,13 +38,24 @@ struct thread_core_local thread_core_local[CFG_TEE_CORE_NB_CORE] __nex_bss; 193@@ -39,13 +39,24 @@ static uint32_t end_canary_value = 0xababab00;
218 name[stack_num][sizeof(name[stack_num]) / sizeof(uint32_t) - 1] 194 name[stack_num][sizeof(name[stack_num]) / sizeof(uint32_t) - 1]
219 #endif 195 #endif
220 196
@@ -240,7 +216,30 @@ index e48294b3b..8de9064ca 100644
240 #define GET_STACK(stack) ((vaddr_t)(stack) + STACK_SIZE(stack)) 216 #define GET_STACK(stack) ((vaddr_t)(stack) + STACK_SIZE(stack))
241 217
242 DECLARE_STACK(stack_tmp, CFG_TEE_CORE_NB_CORE, STACK_TMP_SIZE, 218 DECLARE_STACK(stack_tmp, CFG_TEE_CORE_NB_CORE, STACK_TMP_SIZE,
219diff --git a/core/mm/pgt_cache.c b/core/mm/pgt_cache.c
220index 79553c6d2..b9efdf427 100644
221--- a/core/mm/pgt_cache.c
222+++ b/core/mm/pgt_cache.c
223@@ -410,8 +410,18 @@ void pgt_init(void)
224 * has a large alignment, while .bss has a small alignment. The current
225 * link script is optimized for small alignment in .bss
226 */
227+#ifdef __clang__
228+#pragma clang section bss=".nozi.mmu.l2"
229+#endif
230 static uint8_t pgt_tables[PGT_CACHE_SIZE][PGT_SIZE]
231- __aligned(PGT_SIZE) __section(".nozi.pgt_cache");
232+ __aligned(PGT_SIZE)
233+#ifndef __clang__
234+ __section(".nozi.pgt_cache")
235+#endif
236+ ;
237+#ifdef __clang__
238+#pragma clang section bss=""
239+#endif
240 size_t n;
241
242 for (n = 0; n < ARRAY_SIZE(pgt_tables); n++) {
243-- 243--
2442.40.1 2442.43.2
245
246 245
diff --git a/recipes-security/optee-imx/optee-os/0002-optee-enable-clang-support.patch b/recipes-security/optee-imx/optee-os/0002-optee-enable-clang-support.patch
index 096579c0..dbc53542 100644
--- a/recipes-security/optee-imx/optee-os/0002-optee-enable-clang-support.patch
+++ b/recipes-security/optee-imx/optee-os/0002-optee-enable-clang-support.patch
@@ -1,4 +1,4 @@
1From c67f63d4e7bbe7b21b4c9ef49ae84c6725794aa9 Mon Sep 17 00:00:00 2001 1From 2ba573c9763329fbfdfacc8393d565ab747cac4d Mon Sep 17 00:00:00 2001
2From: Brett Warren <brett.warren@arm.com> 2From: Brett Warren <brett.warren@arm.com>
3Date: Wed, 23 Sep 2020 09:27:34 +0100 3Date: Wed, 23 Sep 2020 09:27:34 +0100
4Subject: [PATCH 2/4] optee: enable clang support 4Subject: [PATCH 2/4] optee: enable clang support
@@ -30,5 +30,5 @@ index a045beee8..1ebe2f702 100644
30 30
31 # Core ASLR relies on the executable being ready to run from its preferred load 31 # Core ASLR relies on the executable being ready to run from its preferred load
32-- 32--
332.40.1 332.43.2
34 34
diff --git a/recipes-security/optee-imx/optee-os/0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch b/recipes-security/optee-imx/optee-os/0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch
index f0fac69f..1c5753c7 100644
--- a/recipes-security/optee-imx/optee-os/0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch
+++ b/recipes-security/optee-imx/optee-os/0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch
@@ -1,4 +1,4 @@
1From f23fb3381422c613890f77c26d11e377234481c6 Mon Sep 17 00:00:00 2001 1From 6f738803a59613ec4a683ddbc1747ebffd75a4e6 Mon Sep 17 00:00:00 2001
2From: Jerome Forissier <jerome.forissier@linaro.org> 2From: Jerome Forissier <jerome.forissier@linaro.org>
3Date: Tue, 23 Aug 2022 12:31:46 +0000 3Date: Tue, 23 Aug 2022 12:31:46 +0000
4Subject: [PATCH 3/4] arm32: libutils, libutee, ta: add .note.GNU-stack section 4Subject: [PATCH 3/4] arm32: libutils, libutee, ta: add .note.GNU-stack section
@@ -129,5 +129,5 @@ index cd9a12f9d..ccdc19928 100644
129 * This function is the bottom of the user call stack. Mark it as such so that 129 * This function is the bottom of the user call stack. Mark it as such so that
130 * the unwinding code won't try to go further down. 130 * the unwinding code won't try to go further down.
131-- 131--
1322.40.1 1322.43.2
133 133
diff --git a/recipes-security/optee-imx/optee-os/0004-core-link-add-no-warn-rwx-segments.patch b/recipes-security/optee-imx/optee-os/0004-core-link-add-no-warn-rwx-segments.patch
index f72d80dc..f32b2284 100644
--- a/recipes-security/optee-imx/optee-os/0004-core-link-add-no-warn-rwx-segments.patch
+++ b/recipes-security/optee-imx/optee-os/0004-core-link-add-no-warn-rwx-segments.patch
@@ -1,4 +1,4 @@
1From b53f5542102b8088448134202c30ca563f5b3c04 Mon Sep 17 00:00:00 2001 1From a63f82f74e015eb662242cdb51ef814e3f576829 Mon Sep 17 00:00:00 2001
2From: Jerome Forissier <jerome.forissier@linaro.org> 2From: Jerome Forissier <jerome.forissier@linaro.org>
3Date: Fri, 5 Aug 2022 09:48:03 +0200 3Date: Fri, 5 Aug 2022 09:48:03 +0200
4Subject: [PATCH 4/4] core: link: add --no-warn-rwx-segments 4Subject: [PATCH 4/4] core: link: add --no-warn-rwx-segments
@@ -25,7 +25,7 @@ Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
25 1 file changed, 4 insertions(+), 2 deletions(-) 25 1 file changed, 4 insertions(+), 2 deletions(-)
26 26
27diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk 27diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk
28index e8a518254..60e08966f 100644 28index 49e9f4fa1..9e1cc172f 100644
29--- a/core/arch/arm/kernel/link.mk 29--- a/core/arch/arm/kernel/link.mk
30+++ b/core/arch/arm/kernel/link.mk 30+++ b/core/arch/arm/kernel/link.mk
31@@ -37,6 +37,7 @@ link-ldflags += --sort-section=alignment 31@@ -37,6 +37,7 @@ link-ldflags += --sort-section=alignment
@@ -63,5 +63,5 @@ index e8a518254..60e08966f 100644
63 $(libgcccore) 63 $(libgcccore)
64 cleanfiles += $(link-out-dir)/init.o 64 cleanfiles += $(link-out-dir)/init.o
65-- 65--
662.40.1 662.43.2
67 67
diff --git a/recipes-security/optee-imx/optee-os_3.21.0.imx.bb b/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
index 89788370..cecfc23c 100644
--- a/recipes-security/optee-imx/optee-os_3.21.0.imx.bb
+++ b/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
@@ -8,5 +8,5 @@ SRC_URI += " \
8 file://0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch \ 8 file://0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch \
9 file://0004-core-link-add-no-warn-rwx-segments.patch \ 9 file://0004-core-link-add-no-warn-rwx-segments.patch \
10" 10"
11SRCBRANCH = "lf-6.1.36_2.1.0" 11SRCBRANCH = "lf-6.1.55_2.2.0"
12SRCREV = "4e32281904b15af9ddbdf00f73e1c08eae21c695" 12SRCREV = "a303fc80f7c4bd713315687a1fa1d6ed136e78ee"
diff --git a/recipes-security/optee-imx/optee-test_3.21.0.imx.bb b/recipes-security/optee-imx/optee-test_4.0.0.imx.bb
index 159c74ce..dd4ee307 100644
--- a/recipes-security/optee-imx/optee-test_3.21.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_4.0.0.imx.bb
@@ -4,7 +4,7 @@ require optee-test-fslc.inc
4 4
5SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}" 5SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
6 6
7SRCBRANCH = "lf-6.1.36_2.1.0" 7SRCBRANCH = "lf-6.1.55_2.2.0"
8SRCREV = "e0ebd5193070e0215b5389da191bc33f4f478222" 8SRCREV = "38efacef3b14b32a6792ceaebe211b5718536fbb"
9 9
10COMPATIBLE_MACHINE = "(imx-nxp-bsp)" 10COMPATIBLE_MACHINE = "(imx-nxp-bsp)"