mirror of
git://git.yoctoproject.org/meta-freescale.git
synced 2025-10-22 23:02:20 +02:00
Merge pull request #2362 from hiagofranco/sync-walnascar-with-master
Sync walnascar with master - NXP BSP 6.12.20-2.0.0 release
This commit is contained in:
Otavio Salvador
GitHub
commit
82d86a67d3
44
EULA
44
EULA
|
|
@ -1,4 +1,4 @@
|
|||
LA_OPT_NXP_Software_License v58 November 2024
|
||||
LA_OPT_NXP_Software_License v62 May 2025
|
||||
IMPORTANT. Read the following NXP Software License Agreement ("Agreement")
|
||||
completely. By selecting the "I Accept" button at the end of this page, or by
|
||||
downloading, installing, or using the Licensed Software, you indicate that you
|
||||
|
|
@ -157,6 +157,8 @@ of the Licensed Software to anyone other than NXP. You may advise NXP of any
|
|||
results obtained from your use of the Licensed Software, including any problems
|
||||
or suggested improvements thereof, and NXP retains the right to use such
|
||||
results and related information in any manner it deems appropriate.
|
||||
3.9. Licensee may not use the Licensed Software as data or training
|
||||
input to any artificial intelligence models or machine learning algorithms.
|
||||
4. OPEN SOURCE. Open source software included in the Licensed
|
||||
Software is not licensed under the terms of this Agreement but is instead
|
||||
licensed under the terms of the applicable open source license(s), such as the
|
||||
|
|
@ -222,9 +224,10 @@ to you.
|
|||
disclaims any warranty for the Licensed Software. The Licensed Software is
|
||||
provided "AS IS", without warranty of any kind, either express or implied,
|
||||
including without limitation the implied warranties of merchantability, fitness
|
||||
for a particular purpose, or non-infringement. You assume the entire risk
|
||||
arising out of the use or performance of the licensed software, or any systems
|
||||
you design using the licensed software (if any).
|
||||
for a particular purpose, non-infringement, or any warranty that the Licensed
|
||||
Software is free from vulnerabilities. You assume the entire risk arising out
|
||||
of the use or performance of the licensed software, or any systems you design
|
||||
using the licensed software (if any).
|
||||
10. INDEMNITY. You agree to fully defend and indemnify NXP from all
|
||||
claims, liabilities, and costs (including reasonable attorney’s fees) related
|
||||
to (1) your use (including your subcontractor’s or distributee’s use, if
|
||||
|
|
@ -242,6 +245,7 @@ COSTS, DAMAGES, CLAIMS, OR LOSSES WHATSOEVER ARISING OUT OF OR IN CONNECTION
|
|||
WITH THIS AGREEMENT OR PRODUCT(S) SUPPLIED UNDER THIS AGREEMENT IS LIMITED TO
|
||||
THE AGGREGATE AMOUNT PAID BY YOU TO NXP IN CONNECTION WITH THE LICENSED
|
||||
SOFTWARE PROVIDED UNDER THIS AGREEMENT TO WHICH LOSSES OR DAMAGES ARE CLAIMED.
|
||||
|
||||
12. EXPORT COMPLIANCE.
|
||||
12.1 Each party shall comply with all applicable export and import control
|
||||
laws and regulations including but not limited to the US Export Administration
|
||||
|
|
@ -259,7 +263,7 @@ without obtaining prior written authorization from the applicable competent
|
|||
government authorities to the extent required by those laws.
|
||||
12.2 Prohibition of Export to Russian Federation
|
||||
|
||||
(a) With respect to activitit that falls under the scope of Article 12g,
|
||||
(a) With respect to activity that falls under the scope of Article 12g,
|
||||
12ga of Council Regulation (EU) No 833/2014, or Council Regulation (EU) No
|
||||
765/2006 (as the case requires), you (a) will not sell, export or re-export,
|
||||
directly or indirectly any item, and (b) will not sell, license or sublicense
|
||||
|
|
@ -572,7 +576,7 @@ provide Fraunhofer your name and contact information.
|
|||
|
||||
Future Technology Devices International Ltd.: Future Technology Devices
|
||||
International software must be used consistent with the terms found here:
|
||||
http://www.ftdichip.com/Drivers/FTDriverLicenceTerms.htm
|
||||
https://ftdichip.com/driver-licence-terms-details/
|
||||
|
||||
Global Locate (Broadcom Corporation): Use of Global Locate, Inc. software is
|
||||
limited to evaluation and demonstration only. Permitted distributions must be
|
||||
|
|
@ -633,10 +637,17 @@ Licensed Software includes proprietary software of MindTree in source code
|
|||
format, Licensee may make modifications and create derivative works only to the
|
||||
extent necessary for debugging of the Licensed Software.
|
||||
|
||||
MM SOLUTIONS AD: Use of MM SOLUTIONS AEC (Auto Exposure Control) and AWB (Auto
|
||||
White Balance) software is limited to demonstration, testing, and evaluation
|
||||
only. In no event may Licensee distribute or sublicense the MM SOLUTIONS
|
||||
software. Further rights must be obtained directly from MM SOLUTIONS.
|
||||
MM SOLUTIONS EAD: Use of the following MM SOLUTIONS software is limited to use
|
||||
in conjuncture with NXP Products that have the Imaging Subsystem Processor
|
||||
(ISP) enabled (fusing configuration), as indicated in the applicable data
|
||||
sheet: (i) MMS Tuning Tool; (ii) Camera Development Kit (uGuzzi); (iii) and
|
||||
additional Camera Software. For the purposes of this Agreement, “Camera
|
||||
Software” means: (a) AEC (Auto Exposure Control); (b) AWB (Auto White
|
||||
Balance), (c) Auto Focus; (d) Wide Dynamic Range; (e) LED Flicker Mitigation;
|
||||
and (f) Multi-Camera Harmonization. In no event may Licensee distribute or
|
||||
sublicense the MM SOLUTIONS software, unless otherwise licensed to do so by
|
||||
issuance of the distribution rights under Section 2.3 of the Agreement. Any
|
||||
further rights must be obtained directly from MM SOLUTIONS directly.
|
||||
|
||||
MPEG LA: Use of MPEG LA audio or video codec technology is limited to
|
||||
evaluation and demonstration only. Permitted distributions must be similarly
|
||||
|
|
@ -647,10 +658,19 @@ Licensee under any circumstance, even by a signed written amendment to this
|
|||
Agreement.
|
||||
|
||||
NXP Voice Software: VoiceSpot, VoiceSeeker (including AEC), VIT Speech to
|
||||
Intent, and Conversa may be used for evaluation or demonstration purposes only.
|
||||
Any commercial distribution rights are subject to a separate royalty agreement
|
||||
Intent, and Conversa are subject to the terms of Section 2.2 only. Any
|
||||
commercial distribution rights are subject to a separate royalty agreement
|
||||
obtained from NXP.
|
||||
|
||||
Together with the voice communication algorithm Conversa Licensee may get a
|
||||
tuning tool from DevExpress and/or Lightning Chart in form of certain libraries
|
||||
noted as ([name].dll) (“Tool”). Conversa as well as the Tool may only be
|
||||
used by Licensee internally during testing, evaluation or product development
|
||||
solely for tuning purposes of Licensee’s products in connection with
|
||||
Conversa. Any use of Conversa or the Tool outside the scope of this license is
|
||||
strictly prohibited, distributing the Libraries in any form. Licensee may use
|
||||
Conversa in connection with its products only following the execution of a
|
||||
separate royalty agreement with NXP.
|
||||
NXP Wireless Charging Library: License to the Software is limited to use in
|
||||
inductive coupling or wireless charging applications
|
||||
|
||||
|
|
|
|||
63
LICENSE
63
LICENSE
|
|
@ -5,17 +5,17 @@ This file lists all licenses used by recipes in the meta-freescale layer.
|
|||
./dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb: LICENSE = "BSD-3-Clause"
|
||||
./dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_1.0.0.bb: LICENSE = "BSD-3-Clause"
|
||||
./dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb: LICENSE = "MIT"
|
||||
./recipes-bsp/atf/qoriq-atf-2.6.inc: LICENSE = "BSD-3-Clause"
|
||||
./recipes-bsp/atf/qoriq-atf-2.12.inc: LICENSE = "BSD-3-Clause"
|
||||
./recipes-bsp/boot-format/boot-format_git.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-bsp/ddr-phy/ddr-phy_git.bb: LICENSE = "NXP-Binary-EULA"
|
||||
./recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/firmware-imx/firmware-ele-imx_2.0.1.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/firmware-imx/firmware-imx-8.27.inc: LICENSE = "Proprietary"
|
||||
./recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/firmware-imx/firmware-imx-8.28.inc: LICENSE = "Proprietary"
|
||||
./recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb: LICENSE = "BSD-3-Clause"
|
||||
./recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-bsp/imx-atf/imx-atf_2.10.bb: LICENSE = "BSD-3-Clause"
|
||||
./recipes-bsp/imx-atf/imx-atf_2.12.bb: LICENSE = "BSD-3-Clause"
|
||||
./recipes-bsp/imx-kobs/imx-kobs_git.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-bsp/imx-lib/imx-lib_git.bb: LICENSE = "LGPL-2.1-only"
|
||||
./recipes-bsp/imx-mkimage/imx-boot_1.0.bb: LICENSE = "GPL-2.0-only"
|
||||
|
|
@ -32,8 +32,8 @@ This file lists all licenses used by recipes in the meta-freescale layer.
|
|||
./recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/inphi/inphi_git.bb: LICENSE = "NXP-Binary-EULA"
|
||||
./recipes-bsp/isp-imx/basler-camera_4.2.2.25.1.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/isp-imx/isp-imx_4.2.2.25.1.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/isp-imx/basler-camera_4.2.2.25.2.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/isp-imx/isp-imx_4.2.2.25.2.bb: LICENSE = "Proprietary"
|
||||
./recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb: LICENSE = "LGPL-2.1-only"
|
||||
./recipes-bsp/ls2-phy/ls2-phy_git.bb: LICENSE = "NXP-Binary-EULA"
|
||||
./recipes-bsp/mc-utils/mc-utils_git.bb: LICENSE = "BSD-3-Clause"
|
||||
|
|
@ -43,7 +43,7 @@ This file lists all licenses used by recipes in the meta-freescale layer.
|
|||
./recipes-bsp/rcw/rcw_git.bb: LICENSE = "BSD-3-Clause"
|
||||
./recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc: LICENSE = "GPL-2.0-or-later"
|
||||
./recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc: LICENSE = "GPL-2.0-or-later"
|
||||
./recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb: LICENSE = "GPL-2.0-only & BSD-3-Clause & BSD-2-Clause & LGPL-2.0-only & LGPL-2.1-only"
|
||||
./recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb: LICENSE = "GPL-2.0-only & BSD-3-Clause & BSD-2-Clause & LGPL-2.0-only & LGPL-2.1-only"
|
||||
./recipes-bsp/uefi/uefi_git.bb: LICENSE = "NXP-Binary-EULA"
|
||||
./recipes-core/udev/udev-rules-imx.bb: LICENSE = "MIT"
|
||||
./recipes-core/udev/udev-rules-qoriq.bb: LICENSE = "MIT"
|
||||
|
|
@ -54,6 +54,7 @@ This file lists all licenses used by recipes in the meta-freescale layer.
|
|||
./recipes-devtools/utp-com/utp-com_git.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-devtools/uuu/uuu-bin_1.5.165.bb: LICENSE = "BSD-3-Clause & LGPL-2.1-or-later"
|
||||
./recipes-devtools/uuu/uuu_git.bb: LICENSE = "BSD-3-Clause"
|
||||
./recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb: LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
|
||||
./recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb: LICENSE = "MIT"
|
||||
./recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb: LICENSE = "Apache-2.0"
|
||||
./recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb: LICENSE = "Apache-2.0 & MIT"
|
||||
|
|
@ -88,24 +89,25 @@ This file lists all licenses used by recipes in the meta-freescale layer.
|
|||
./recipes-fsl/mcore-demos/imx-mcore-demos.inc: LICENSE = "Proprietary"
|
||||
./recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb: LICENSE = "MIT"
|
||||
./recipes-graphics/drm/libdrm_2.4.123.imx.bb: LICENSE = "MIT"
|
||||
./recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb: LICENSE = "Proprietary"
|
||||
./recipes-graphics/imx-g2d/imx-dpu-g2d_2.4.0.0.bb: LICENSE = "Proprietary"
|
||||
./recipes-graphics/imx-g2d/imx-g2d-samples_git.bb: LICENSE = "BSD-3-Clause"
|
||||
./recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb: LICENSE = "Proprietary"
|
||||
./recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.2.bb: LICENSE = "Proprietary"
|
||||
./recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb: LICENSE = "Proprietary"
|
||||
./recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb: LICENSE = "MIT"
|
||||
./recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc: LICENSE = "Proprietary"
|
||||
./recipes-graphics/mali/mali-imx_r53.0.bb: LICENSE = "Proprietary"
|
||||
./recipes-graphics/mali/mali-imx_r54.0.bb: LICENSE = "Proprietary"
|
||||
./recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb: LICENSE = "MIT"
|
||||
./recipes-graphics/wayland/wayland-protocols_1.37.imx.bb: LICENSE = "MIT"
|
||||
./recipes-graphics/vulkan/vulkan-wsi-layer_git.bb: LICENSE = "MIT"
|
||||
./recipes-graphics/wayland/wayland-protocols_1.41.imx.bb: LICENSE = "MIT"
|
||||
./recipes-graphics/wayland/weston_10.0.5.imx.bb: LICENSE = "MIT"
|
||||
./recipes-graphics/wayland/weston_14.0.1.imx.bb: LICENSE = "MIT"
|
||||
./recipes-graphics/wayland/weston_14.0.2.imx.bb: LICENSE = "MIT"
|
||||
./recipes-graphics/xwayland/xwayland_24.1.6.imx.bb: LICENSE = "MIT"
|
||||
./recipes-kernel/ceetm/ceetm_git.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-kernel/kernel-modules/kernel-module-ar_git.bb: LICENSE = "GPL-2.0-only & BSD"
|
||||
./recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-kernel/kernel-modules/kernel-module-ipc.inc: LICENSE = "BSD"
|
||||
./recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.2.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb: LICENSE = "GPL-2.0-or-later"
|
||||
./recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb: LICENSE = "GPL-2.0-only"
|
||||
./recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb: LICENSE = "GPL-2.0-only"
|
||||
|
|
@ -128,38 +130,37 @@ LICENSE:libpostproc = "GPL-2.0-or-later"
|
|||
LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||
LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||
LICENSE_FLAGS = "commercial"
|
||||
./recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb: LICENSE = "LGPL-2.0-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.7.imx.bb: LICENSE_FLAGS = "commercial"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb: LICENSE_FLAGS = "commercial"
|
||||
LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb: LICENSE = "LGPL-2.0-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
|
||||
LICENSE_FLAGS = "commercial"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb: LICENSE = "LGPL-2.1-or-later"
|
||||
./recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb: LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.1-only"
|
||||
./recipes-multimedia/imx-codec/imx-codec_4.9.3.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-codec/imx-codec_4.10.0.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.7.0.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-parser/imx-parser_4.9.3.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-parser/imx-parser_4.10.0.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb: LICENSE = "LGPL-2.1-only"
|
||||
./recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb: LICENSE = "LGPL-2.1-only"
|
||||
./recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb: LICENSE = "Proprietary"
|
||||
./recipes-multimedia/nxp-afe/nxp-afe_git.bb: LICENSE = "BSD-3-Clause"
|
||||
./recipes-multimedia/tinycompress/tinycompress_1.2.5.bb: LICENSE = "LGPL-2.1-only | BSD-3-Clause"
|
||||
./recipes-security/optee-imx/optee-client-fslc.inc: LICENSE = "BSD-2-Clause"
|
||||
./recipes-security/optee-imx/optee-os-fslc.inc: LICENSE = "BSD-2-Clause"
|
||||
./recipes-security/optee-imx/optee-test-fslc.inc: LICENSE = "BSD-2-Clause & GPL-2.0-only"
|
||||
./recipes-security/optee-qoriq/optee-client.nxp.inc: LICENSE = "BSD"
|
||||
./recipes-security/optee-qoriq/optee-os.nxp.inc: LICENSE = "BSD"
|
||||
./recipes-security/optee-qoriq/optee-test.nxp.inc: LICENSE = "BSD & GPL-2.0-only"
|
||||
./recipes-security/smw/keyctl-caam_git.bb: LICENSE = "BSD-3-Clause"
|
||||
./recipes-security/smw/smw_git.bb: LICENSE = "BSD-3-Clause"
|
||||
LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib"
|
||||
|
|
|
|||
|
|
@ -62,6 +62,8 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V53 = "44a8052c384584ba09077e85
|
|||
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56 = "10c0fda810c63b052409b15a5445671a"
|
||||
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57 = "ca53281cc0caa7e320d4945a896fb837"
|
||||
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58 = "c0fb372b5d7f12181de23ef480f225f3"
|
||||
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60 = "cf2070b16b9d4acf60a98e8cbc32a25a"
|
||||
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62 = "a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
FSL_EULA_FILE_MD5SUMS = " \
|
||||
${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
|
||||
|
|
@ -120,11 +122,13 @@ FSL_EULA_FILE_MD5SUMS = " \
|
|||
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V56} \
|
||||
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V57} \
|
||||
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58} \
|
||||
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60} \
|
||||
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62} \
|
||||
"
|
||||
|
||||
# The checksum for the EULA in the layer
|
||||
FSL_EULA_FILE_MD5SUM ?= \
|
||||
"${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V58}"
|
||||
"${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62}"
|
||||
|
||||
LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
|
||||
LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE"
|
||||
|
|
|
|||
|
|
@ -528,30 +528,20 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin"
|
|||
MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin"
|
||||
|
||||
# GStreamer forked recipes
|
||||
PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp ??= "1.26.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp ??= "1.26.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.26.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.26.0.imx"
|
||||
|
||||
|
||||
# GStreamer copied recipes
|
||||
PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx"
|
||||
PREFERRED_VERSION_gst-examples:mx8-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx"
|
||||
PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx"
|
||||
PREFERRED_VERSION_gst-examples:mx9-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.24.0.imx"
|
||||
PREFERRED_VERSION_gst-devtools:imx-nxp-bsp ??= "1.26.0.imx"
|
||||
PREFERRED_VERSION_gst-examples:imx-nxp-bsp ??= "1.24.7.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-libav:imx-nxp-bsp ??= "1.26.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-ugly:imx-nxp-bsp ??= "1.26.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-python:imx-nxp-bsp ??= "1.26.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-rtsp-server:imx-nxp-bsp ??= "1.26.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-vaapi:imx-nxp-bsp ??= "1.26.0.imx"
|
||||
|
||||
# GStreamer downgrade ffmpeg
|
||||
PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1"
|
||||
|
|
@ -587,19 +577,20 @@ PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d"
|
|||
PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d"
|
||||
PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d"
|
||||
|
||||
PREFERRED_VERSION_weston:imx-nxp-bsp ??= "14.0.1.imx"
|
||||
PREFERRED_VERSION_weston:imx-nxp-bsp ??= "14.0.2.imx"
|
||||
# i.MX 6 & 7 stay on weston 10.0 for fbdev
|
||||
PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx"
|
||||
PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx"
|
||||
PREFERRED_VERSION_weston:imx-mainline-bsp = ""
|
||||
|
||||
PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.37.imx"
|
||||
PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.41.imx"
|
||||
|
||||
PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx"
|
||||
|
||||
# Use i.MX libdrm Version
|
||||
PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx"
|
||||
|
||||
PREFERRED_VERSION_glslang:imxvulkan ??= "1.3.275.0.imx"
|
||||
PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.275.0.imx"
|
||||
PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.275.0.imx"
|
||||
PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.275.0.imx"
|
||||
|
|
@ -608,12 +599,10 @@ PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.275.0.imx"
|
|||
PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
|
||||
|
||||
# Use i.MX optee Version
|
||||
PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.4.0.imx"
|
||||
PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.4.0.imx"
|
||||
PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.4.0.imx"
|
||||
PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.4.0.imx"
|
||||
PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.4.0.imx"
|
||||
PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.4.0.imx"
|
||||
PREFERRED_VERSION_optee-os:imx-nxp-bsp ??= "4.6.0.imx"
|
||||
PREFERRED_VERSION_optee-client:imx-nxp-bsp ??= "4.6.0.imx"
|
||||
PREFERRED_VERSION_optee-test:imx-nxp-bsp ??= "4.6.0.imx"
|
||||
PREFERRED_VERSION_optee-os-tadevkit:imx-nxp-bsp ??= "4.6.0.imx"
|
||||
|
||||
# Use i.MX opencv Version
|
||||
PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
|
||||
|
|
|
|||
|
|
@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
UBOOT_DTB_LOADADDRESS = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
UBOOT_DTB_LOADADDRESS = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
UBOOT_DTB_LOADADDRESS = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
UBOOT_DTB_LOADADDRESS = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
UBOOT_DTB_LOADADDRESS = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
UBOOT_DTB_LOADADDRESS = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
UBOOT_DTB_LOADADDRESS = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
UBOOT_DTB_LOADADDRESS = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:ls2088a:"
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
UBOOT_DTB_LOADADDRESS = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:lx2160a:"
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
DTB_LOAD = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:lx2162a:"
|
|||
|
||||
MACHINE_FEATURES += "optee"
|
||||
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
|
||||
|
||||
DTB_LOAD = "0x90000000"
|
||||
UBOOT_ENTRYPOINT = "0x80080000"
|
||||
|
|
|
|||
|
|
@ -3,10 +3,9 @@ DESCRIPTION = "ARM Trusted Firmware"
|
|||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
|
||||
|
||||
ATF_BRANCH ?= "lf_v2.6"
|
||||
ATF_BRANCH ?= "lf_v2.12"
|
||||
ATF_SRC ?= "git://github.com/nxp-qoriq/atf.git;protocol=https"
|
||||
SRC_URI = "${ATF_SRC};branch=${ATF_BRANCH}"
|
||||
SRCREV = "616a4588f333522d50a55bedd2b9a90a51474a75"
|
||||
SRCREV = "6ddd57019494cabfca5065368349109c37f2cc9f"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
@ -9,7 +9,6 @@ PV:append = "+${SRCPV}"
|
|||
|
||||
SRC_URI += "git://github.com/ARMmbed/mbedtls;protocol=https;nobranch=1;destsuffix=git/mbedtls;name=mbedtls \
|
||||
git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=git/ddr-phy-binary;name=ddr \
|
||||
file://tf-a-tests-no-warn-rwx-segments.patch \
|
||||
"
|
||||
SRCREV_mbedtls = "0795874acdf887290b2571b193cafd3c4041a708"
|
||||
SRCREV_ddr = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
|
||||
|
|
@ -3,13 +3,13 @@ SUMMARY = "NXP i.MX ELE firmware"
|
|||
DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs"
|
||||
SECTION = "base"
|
||||
LICENSE = "Proprietary"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
|
||||
|
||||
SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
|
||||
IMX_SRCREV_ABBREV = "19b6ee2"
|
||||
SRC_URI[sha256sum] = "14ad172ed70d2f16decca4b55e508dad32923390a298f10a598e8bc7778b6b66"
|
||||
IMX_SRCREV_ABBREV = "89161a8"
|
||||
SRC_URI[sha256sum] = "2d29f0a4de3662ba15f6a7d9069702d4eaed415d96a17f29d5b127f2c6fdd634"
|
||||
|
||||
S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ do_install() {
|
|||
}
|
||||
|
||||
do_deploy () {
|
||||
# Deploy the related firmware to be package by imx-boot
|
||||
# Deploy the related firmware to be packaged by imx-boot
|
||||
install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
|
||||
}
|
||||
addtask deploy after do_install before do_build
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
# Copyright (C) 2012-2016 Freescale Semiconductor
|
||||
# Copyright 2017-2024 NXP
|
||||
# Copyright 2017-2025 NXP
|
||||
# Copyright (C) 2018 O.S. Systems Software LTDA.
|
||||
SECTION = "base"
|
||||
LICENSE = "Proprietary"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
# Note: This .inc file is used from differently named recipes, so the package
|
||||
# name must be hard-coded, i.e., ${BPN} cannot be used.
|
||||
SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
|
||||
IMX_SRCREV_ABBREV = "5af0ceb"
|
||||
SRC_URI[sha256sum] = "61f925e606ab020b1a36f3f7f7e459c6847f5b9dbc79421f9ef86e8fc124eb2f"
|
||||
IMX_SRCREV_ABBREV = "994fa14"
|
||||
SRC_URI[sha256sum] = "55996f340e87825685a00cd309901189066ec9545ee607734f942c3cde4d69dc"
|
||||
|
||||
S = "${WORKDIR}/firmware-imx-${PV}-${IMX_SRCREV_ABBREV}"
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# Copyright (C) 2012-2016 Freescale Semiconductor
|
||||
# Copyright 2017-2021,2024 NXP
|
||||
# Copyright 2017-2021,2024-2025 NXP
|
||||
# Copyright (C) 2018 O.S. Systems Software LTDA.
|
||||
SUMMARY = "Freescale i.MX firmware"
|
||||
DESCRIPTION = "Freescale i.MX firmware such as for the VPU"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright 2020-2024 NXP
|
||||
# Copyright 2020-2025 NXP
|
||||
|
||||
SUMMARY = "Wi-Fi firmware redistributed by NXP"
|
||||
DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \
|
||||
|
|
@ -7,11 +7,12 @@ should be preferred."
|
|||
|
||||
SECTION = "kernel"
|
||||
LICENSE = "Proprietary"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
|
||||
SRCBRANCH = "lf-6.12.3_1.0.0"
|
||||
SRCREV = "eef7ef94bc44cacd3b068f66658ef33391547daa"
|
||||
SRCBRANCH = "lf-6.12.20_2.0.0"
|
||||
SRCREV = "d31ea8aaba67e188ba0071a90da0364e3946c83a"
|
||||
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
@ -69,8 +70,10 @@ PACKAGES =+ " \
|
|||
${PN}-nxp9098-pcie \
|
||||
${PN}-nxp9098-common \
|
||||
${PN}-nxp9098-sdio \
|
||||
${PN}-nxpaw693-pcie \
|
||||
${PN}-nxpiw416-sdio \
|
||||
${PN}-nxpiw610-sdio \
|
||||
${PN}-nxpiw610-usb \
|
||||
${PN}-nxpiw612-sdio \
|
||||
"
|
||||
|
||||
|
|
@ -162,6 +165,7 @@ RCONFLICTS:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
|
|||
FILES:${PN}-nxpiw610-sdio += " \
|
||||
${nonarch_base_libdir}/firmware/nxp/sd_iw610.bin.se \
|
||||
${nonarch_base_libdir}/firmware/nxp/sduart_iw610.bin.se \
|
||||
${nonarch_base_libdir}/firmware/nxp/sduartspi_iw610.bin.se \
|
||||
${nonarch_base_libdir}/firmware/nxp/uart_iw610_bt.bin.se \
|
||||
${nonarch_base_libdir}/firmware/nxp/uartspi_iw610.bin.se \
|
||||
"
|
||||
|
|
@ -170,6 +174,11 @@ RPROVIDES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
|
|||
RREPLACES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
|
||||
RCONFLICTS:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
|
||||
|
||||
FILES:${PN}-nxpiw610-usb += " \
|
||||
${nonarch_base_libdir}/firmware/nxp/usb*_iw610.bin.se \
|
||||
"
|
||||
RDEPENDS:${PN}-nxpiw610-usb += "${PN}-nxp-common"
|
||||
|
||||
FILES:${PN}-nxpiw612-sdio = " \
|
||||
${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \
|
||||
${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
|
||||
|
|
@ -182,6 +191,12 @@ RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
|
|||
RREPLACES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
|
||||
RCONFLICTS:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
|
||||
|
||||
FILES:${PN}-nxpaw693-pcie += " \
|
||||
${nonarch_base_libdir}/firmware/nxp/pcie*aw693* \
|
||||
${nonarch_base_libdir}/firmware/nxp/uart*aw693* \
|
||||
"
|
||||
RDEPENDS:${PN}-nxpaw693-pcie += "${PN}-nxp-common"
|
||||
|
||||
RDEPENDS:${PN}-all-sdio = " \
|
||||
${PN}-nxp8801-sdio \
|
||||
${PN}-nxp8987-sdio \
|
||||
|
|
@ -194,4 +209,9 @@ RDEPENDS:${PN}-all-sdio = " \
|
|||
RDEPENDS:${PN}-all-pcie = " \
|
||||
${PN}-nxp8997-pcie \
|
||||
${PN}-nxp9098-pcie \
|
||||
${PN}-nxpaw693-pcie \
|
||||
"
|
||||
|
||||
RDEPENDS:${PN}-all-usb = " \
|
||||
${PN}-nxpiw610-usb \
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (C) 2018-2024 NXP
|
||||
# Copyright (C) 2018-2025 NXP
|
||||
SUMMARY = "Freescale i.MX Firmware files used for boot"
|
||||
|
||||
require firmware-imx-${PV}.inc
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (C) 2017-2024 NXP
|
||||
# Copyright (C) 2017-2025 NXP
|
||||
|
||||
DESCRIPTION = "i.MX ARM Trusted Firmware"
|
||||
SECTION = "BSP"
|
||||
|
|
@ -9,8 +9,8 @@ PV .= "+git${SRCPV}"
|
|||
|
||||
SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
|
||||
file://0001-imx93-trdc-Fix-header-guard.patch"
|
||||
SRCBRANCH = "lf_v2.10"
|
||||
SRCREV = "78a14c75a06dea39036c44ae0f9d23acc7bcaef2"
|
||||
SRCBRANCH = "lf_v2.12"
|
||||
SRCREV = "6ddd57019494cabfca5065368349109c37f2cc9f"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ PE = "1"
|
|||
PV = "5.9+${SRCPV}"
|
||||
|
||||
SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
|
||||
SRCBRANCH = "lf-6.12.3_1.0.0"
|
||||
SRCBRANCH = "lf-6.12.20_2.0.0"
|
||||
SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ DEPENDS = "zlib-native openssl-native"
|
|||
SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
|
||||
file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
|
||||
"
|
||||
SRCBRANCH = "lf-6.12.3_1.0.0"
|
||||
SRCREV = "9e60b1f7a87a6397cf8db10e07293075f489e974"
|
||||
SRCBRANCH = "lf-6.12.20_2.0.0"
|
||||
SRCREV = "4c2e5b25232f5aa003976ddca9d1d2fb9667beb1"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
|
|||
|
|
@ -14,14 +14,15 @@ DEPENDS:append:mx6-nxp-bsp = " imx-lib"
|
|||
DEPENDS:append:mx7-nxp-bsp = " imx-lib"
|
||||
DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib"
|
||||
DEPENDS:append:mx93-nxp-bsp = " imx-lib"
|
||||
DEPENDS:append:mx943-nxp-bsp = " imx-lib"
|
||||
|
||||
PE = "1"
|
||||
PV = "7.0+${SRCPV}"
|
||||
|
||||
SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
|
||||
file://memtool_profile"
|
||||
SRCBRANCH = "lf-6.12.3_1.0.0"
|
||||
SRCREV = "92a497313016bfa536d561e13fcbad2d273ded4c"
|
||||
SRCBRANCH = "lf-6.12.20_2.0.0"
|
||||
SRCREV = "38f9cf1f08bb6fcdd6aaf9191e0b53f02e02537b"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
@ -42,6 +43,7 @@ PLATFORM:mx8-nxp-bsp = "IMX8"
|
|||
PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
|
||||
PLATFORM:mx91-nxp-bsp = "IMX8"
|
||||
PLATFORM:mx93-nxp-bsp = "IMX8ULP"
|
||||
PLATFORM:mx943-nxp-bsp = "IMX8ULP"
|
||||
PLATFORM:mx95-nxp-bsp = "IMX8"
|
||||
|
||||
PARALLEL_MAKE = "-j 1"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Copyright (C) 2016 Freescale Semiconductor
|
||||
# Copyright (C) 2017-2019,2024 NXP
|
||||
# Copyright (C) 2017-2019,2024-2025 NXP
|
||||
SUMMARY = "A Daemon wait for NXP mfgtools host's command"
|
||||
SECTION = "base"
|
||||
DEPENDS = "virtual/kernel dosfstools-native"
|
||||
|
|
@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
|||
PR = "r1"
|
||||
PV = "0.5.1+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master"
|
||||
SRC_URI = "git://github.com/nxp-imx/imx-uuc.git;protocol=https;branch=master"
|
||||
SRCREV = "25f65e10368aa07056f9536e88ed911ac7f38f99"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
DESCRIPTION = "Basler camera binary drivers"
|
||||
LICENSE = "Proprietary"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
IMX_SRCREV_ABBREV = "d1f506a"
|
||||
IMX_SRCREV_ABBREV = "dd86758"
|
||||
|
||||
inherit fsl-eula-unpack
|
||||
|
||||
SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
|
||||
|
||||
SRC_URI[sha256sum] = "49d1b3691d18e2ba5f43a6e2c59ac16767b6e077a118cafec7f51293d6bf30f3"
|
||||
SRC_URI[sha256sum] = "aa86adeb0c53c3306f7e1c004ffa78ebb7db3e9136c78759e4029b4b5e1b1a64"
|
||||
|
||||
S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 3443f18dc9ab8950071d6299c7a5da86055f3318 Mon Sep 17 00:00:00 2001
|
||||
From d24c74528fefd1316f1633f0a7f1a5acea40454f Mon Sep 17 00:00:00 2001
|
||||
From: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
Date: Thu, 19 Jan 2023 15:51:24 +0000
|
||||
Subject: [PATCH] isp-imx: start_isp: don't report error if no camera is
|
||||
Subject: [PATCH 1/5] isp-imx: start_isp: don't report error if no camera is
|
||||
configured
|
||||
|
||||
The script currently returns '6' when no known camera is configured
|
||||
|
|
@ -17,10 +17,10 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/imx/start_isp.sh b/imx/start_isp.sh
|
||||
index 95cbc19..d603f8f 100755
|
||||
index d544b4ca2a57..22e7783437d6 100755
|
||||
--- a/imx/start_isp.sh
|
||||
+++ b/imx/start_isp.sh
|
||||
@@ -74,5 +74,5 @@ elif [ $NR_DEVICE_TREE_OS08A20 -eq 2 ]; then
|
||||
@@ -72,5 +72,5 @@ elif [ $NR_DEVICE_TREE_OS08A20 -eq 2 ]; then
|
||||
else
|
||||
# no device tree found exit with code no device or address
|
||||
echo "No device tree found for Basler camera or os08a20, check dtb file!" >&2
|
||||
|
|
@ -28,4 +28,5 @@ index 95cbc19..d603f8f 100755
|
|||
+ exit 0
|
||||
fi
|
||||
--
|
||||
2.35.3
|
||||
2.42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,134 @@
|
|||
From 5b69b60bd4d0d5ed1474c6457561d48cdbabc778 Mon Sep 17 00:00:00 2001
|
||||
From: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
Date: Fri, 25 Jul 2025 09:19:58 +0000
|
||||
Subject: [PATCH 2/5] appshell: cmake: bump min version to 3.5
|
||||
|
||||
CMake 4 no longer supports min version set to before 3.5
|
||||
|
||||
| CMake Error at CMakeLists.txt:28 (cmake_minimum_required):
|
||||
| Compatibility with CMake < 3.5 has been removed from CMake.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
---
|
||||
appshell/CMakeLists.txt | 2 +-
|
||||
appshell/display/CMakeLists.txt | 2 +-
|
||||
appshell/display/wayland-client/CMakeLists.txt | 2 +-
|
||||
appshell/v4l_drm_test/CMakeLists.txt | 2 +-
|
||||
appshell/vvext/CMakeLists.txt | 2 +-
|
||||
appshell/yuv/CMakeLists.txt | 2 +-
|
||||
units/CMakeLists.txt | 2 +-
|
||||
units/isi/CMakeLists.txt | 2 +-
|
||||
units/isi/drv/OS08a20/CMakeLists.txt | 2 +-
|
||||
units/isi/drv/OS08a20/calib/CMakeLists.txt | 2 +-
|
||||
10 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/appshell/CMakeLists.txt b/appshell/CMakeLists.txt
|
||||
index 22092ce975b5..cf14e254c812 100644
|
||||
--- a/appshell/CMakeLists.txt
|
||||
+++ b/appshell/CMakeLists.txt
|
||||
@@ -25,7 +25,7 @@
|
||||
# *****************************************************************************/
|
||||
|
||||
|
||||
-cmake_minimum_required(VERSION 3.1.0)
|
||||
+cmake_minimum_required(VERSION 3.5.0)
|
||||
project(ISP_APP_SHELL)
|
||||
|
||||
if(DEFINED QTLESS)
|
||||
diff --git a/appshell/display/CMakeLists.txt b/appshell/display/CMakeLists.txt
|
||||
index 491f086adf55..458a46b165b4 100755
|
||||
--- a/appshell/display/CMakeLists.txt
|
||||
+++ b/appshell/display/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.6)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
|
||||
|
||||
diff --git a/appshell/display/wayland-client/CMakeLists.txt b/appshell/display/wayland-client/CMakeLists.txt
|
||||
index 78247528b0e4..0639d79d8346 100644
|
||||
--- a/appshell/display/wayland-client/CMakeLists.txt
|
||||
+++ b/appshell/display/wayland-client/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.6)
|
||||
|
||||
set(WAYLAND_XML_PRIFIX ${SDKTARGETSYSROOT}/usr/share/wayland-protocols)
|
||||
set(GEN_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/display/wayland-client)
|
||||
diff --git a/appshell/v4l_drm_test/CMakeLists.txt b/appshell/v4l_drm_test/CMakeLists.txt
|
||||
index cf4685c84204..309e5d465e99 100755
|
||||
--- a/appshell/v4l_drm_test/CMakeLists.txt
|
||||
+++ b/appshell/v4l_drm_test/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
project(ISP_V4L_DRM_TEST)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
diff --git a/appshell/vvext/CMakeLists.txt b/appshell/vvext/CMakeLists.txt
|
||||
index a5d6c12929fa..63c1eb5f7073 100755
|
||||
--- a/appshell/vvext/CMakeLists.txt
|
||||
+++ b/appshell/vvext/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
project(ISP_V4L_DRM_TEST)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
diff --git a/appshell/yuv/CMakeLists.txt b/appshell/yuv/CMakeLists.txt
|
||||
index 131766fcb5d4..0f3591918e08 100755
|
||||
--- a/appshell/yuv/CMakeLists.txt
|
||||
+++ b/appshell/yuv/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
set (CMAKE_CXX_FLAGS_DEBUG "")
|
||||
set (CMAKE_C_FLAGS_DEBUG "")
|
||||
|
||||
diff --git a/units/CMakeLists.txt b/units/CMakeLists.txt
|
||||
index 37fa65ed4ea8..10abbef1c16c 100755
|
||||
--- a/units/CMakeLists.txt
|
||||
+++ b/units/CMakeLists.txt
|
||||
@@ -24,7 +24,7 @@
|
||||
# *
|
||||
# *****************************************************************************/
|
||||
|
||||
-cmake_minimum_required(VERSION 3.1.0)
|
||||
+cmake_minimum_required(VERSION 3.5.0)
|
||||
project(ISPcore_SW_STACK)
|
||||
if( NOT DEFINED APPSHELL_TOP_COMPILE)
|
||||
|
||||
diff --git a/units/isi/CMakeLists.txt b/units/isi/CMakeLists.txt
|
||||
index a91699b4a1a5..ea01aa7d9424 100755
|
||||
--- a/units/isi/CMakeLists.txt
|
||||
+++ b/units/isi/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
# define module name
|
||||
set (module isi)
|
||||
diff --git a/units/isi/drv/OS08a20/CMakeLists.txt b/units/isi/drv/OS08a20/CMakeLists.txt
|
||||
index d27dc97f7945..12c6e9ef993a 100755
|
||||
--- a/units/isi/drv/OS08a20/CMakeLists.txt
|
||||
+++ b/units/isi/drv/OS08a20/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
# define module name & interface version
|
||||
set (module os08a20)
|
||||
diff --git a/units/isi/drv/OS08a20/calib/CMakeLists.txt b/units/isi/drv/OS08a20/calib/CMakeLists.txt
|
||||
index b44b08248135..18119086b967 100755
|
||||
--- a/units/isi/drv/OS08a20/calib/CMakeLists.txt
|
||||
+++ b/units/isi/drv/OS08a20/calib/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
# use upper level module name
|
||||
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
From db07010535d47d7d7eaf3865d97dcec045e19930 Mon Sep 17 00:00:00 2001
|
||||
From: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
Date: Fri, 25 Jul 2025 09:57:22 +0000
|
||||
Subject: [PATCH 3/5] appshell: cmake: drop deprecated use of
|
||||
target_link_libraries
|
||||
|
||||
Works around:
|
||||
|
||||
| CMake Error at display/CMakeLists.txt:48 (target_link_libraries):
|
||||
| Cannot specify link libraries for target "wayland-client" which is not
|
||||
| built by this project.
|
||||
|
||||
caused by CMake 4 deprecating https://cmake.org/cmake/help/v3.5/policy/CMP0016.html
|
||||
|
||||
CMP0016 states that the command is silently ignored, thus drop it.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
---
|
||||
appshell/display/CMakeLists.txt | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/appshell/display/CMakeLists.txt b/appshell/display/CMakeLists.txt
|
||||
index 458a46b165b4..160755312368 100755
|
||||
--- a/appshell/display/CMakeLists.txt
|
||||
+++ b/appshell/display/CMakeLists.txt
|
||||
@@ -43,7 +43,6 @@ if (WAYLAND_SUPPORT)
|
||||
file(GLOB pub_headers *.h)
|
||||
file(GLOB libsources *.cpp ./wayland-client/*.c)
|
||||
include_directories(./wayland-client)
|
||||
- target_link_libraries(wayland-client)
|
||||
else (WAYLAND_SUPPORT)
|
||||
file(GLOB pub_headers *.h)
|
||||
file(GLOB libsources *.cpp)
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
From d7e06f57c067e50d86369577b8dc3bccdde6fd40 Mon Sep 17 00:00:00 2001
|
||||
From: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
Date: Fri, 25 Jul 2025 10:44:40 +0000
|
||||
Subject: [PATCH 4/5] units/targets.cmake: fix check if a target exists
|
||||
|
||||
| CMake Error at units/targets.cmake:35 (get_target_property):
|
||||
| get_target_property() called with non-existent target "lib".
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
---
|
||||
units/targets.cmake | 9 +++------
|
||||
1 file changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/units/targets.cmake b/units/targets.cmake
|
||||
index 663a024d9129..d78dbf8b8a45 100755
|
||||
--- a/units/targets.cmake
|
||||
+++ b/units/targets.cmake
|
||||
@@ -32,8 +32,7 @@ add_dependencies(create_alldir ${module}_create_dir)
|
||||
# Settings for target LIB
|
||||
###############################################################################
|
||||
# check if lib target already exists and create it, this is to assure that only one target called lib will be generated
|
||||
-get_target_property(LIB_TARGET lib TYPE)
|
||||
-if(NOT LIB_TARGET)
|
||||
+if(NOT TARGET lib)
|
||||
add_custom_target(lib)
|
||||
endif()
|
||||
# the library itself is a dependency for the target lib
|
||||
@@ -83,8 +82,7 @@ if(HAVE_PUBLIC_HEADERS)
|
||||
endif()
|
||||
|
||||
# check if lib_install target already exists and create it
|
||||
-get_target_property(LIB_INSTALL_TARGET lib_install TYPE)
|
||||
-if(NOT LIB_INSTALL_TARGET)
|
||||
+if(NOT TARGET lib_install)
|
||||
add_custom_target(lib_install)
|
||||
endif()
|
||||
|
||||
@@ -104,8 +102,7 @@ add_custom_target(${module}_copy_header
|
||||
COMMENT "Copying Headers of ${module}")
|
||||
|
||||
# check if copy_header target already exists and create it
|
||||
-get_target_property(COPY_HEADER_TARGET copy_header TYPE)
|
||||
-if(NOT COPY_HEADER_TARGET)
|
||||
+if(NOT TARGET copy_header)
|
||||
add_custom_target(copy_header)
|
||||
endif()
|
||||
# if copy_header is selected, modulename_copy_header target must be created
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
From 72d6160d1efc9df8bdee4e3dc9da67560f2206b4 Mon Sep 17 00:00:00 2001
|
||||
From: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
Date: Fri, 25 Jul 2025 10:52:52 +0000
|
||||
Subject: [PATCH 5/5] units: cmake: fix use of add_dependencies
|
||||
|
||||
With CMake 4 we get during configure:
|
||||
|
||||
| CMake Error at isp-imx/4.2.2.25.2/sources/isp-imx-4.2.2.25.2-3cac1fb:
|
||||
| The dependency target "drv/OS08a20" of target "copy_shell_libs_isi" does
|
||||
| not exist.
|
||||
|
||||
Comment out that the add_dependencies. The driver for OS08a20 is still
|
||||
part of the built packages.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
---
|
||||
units/isi/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/units/isi/CMakeLists.txt b/units/isi/CMakeLists.txt
|
||||
index ea01aa7d9424..2f5c3d803e67 100755
|
||||
--- a/units/isi/CMakeLists.txt
|
||||
+++ b/units/isi/CMakeLists.txt
|
||||
@@ -93,7 +93,7 @@ add_custom_target(copy_shell_libs_${module} ALL
|
||||
COMMAND ${CMAKE_COMMAND} -E copy ${UNITS_TOP_DIRECTORY}/isi/drv/*/*.cfg ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/bin/
|
||||
COMMAND ${CMAKE_COMMAND} -E copy ${UNITS_TOP_DIRECTORY}/isi/drv/*.cfg ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/bin/
|
||||
)
|
||||
-add_dependencies(copy_shell_libs_${module} drv/OS08a20)
|
||||
+#add_dependencies(copy_shell_libs_${module} os08a20_shared)
|
||||
|
||||
endif (GENERATE_PARTITION_BUILD)
|
||||
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
|
@ -2,21 +2,25 @@
|
|||
|
||||
DESCRIPTION = "i.MX Verisilicon Software ISP"
|
||||
LICENSE = "Proprietary"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 jsoncpp patchelf-native"
|
||||
|
||||
SRC_URI = " \
|
||||
${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ISP_SYSTEMD_PATCH}', '', d)} \
|
||||
file://0002-appshell-cmake-bump-min-version-to-3.5.patch \
|
||||
file://0003-appshell-cmake-drop-deprecated-use-of-target_link_li.patch \
|
||||
file://0004-units-targets.cmake-fix-check-if-a-target-exists.patch \
|
||||
file://0005-units-cmake-fix-use-of-add_dependencies.patch \
|
||||
"
|
||||
ISP_SYSTEMD_PATCH = "file://0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch"
|
||||
|
||||
IMX_SRCREV_ABBREV = "327f21d"
|
||||
IMX_SRCREV_ABBREV = "3cac1fb"
|
||||
S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
|
||||
|
||||
SRC_URI[sha256sum] = "f57c6fe1c2dd1c8e5991a625d0b3a1dbfdfe6d39a1a116a904d543faa0f4f6f0"
|
||||
SRC_URI[sha256sum] = "8fa5094da6438505287f4dcc8033dad3057ab81bf98c858884f7c3a2e521b252"
|
||||
|
||||
inherit fsl-eula-unpack cmake systemd use-imx-headers
|
||||
inherit fsl-eula-unpack cmake pkgconfig systemd use-imx-headers
|
||||
|
||||
PACKAGECONFIG = ""
|
||||
# Note: building with tuningext fails with boost 1.87.
|
||||
|
|
@ -39,7 +43,6 @@ EXTRA_OECMAKE += " \
|
|||
-DCMAKE_BUILD_TYPE=release \
|
||||
-DISP_VERSION=ISP8000NANO_V1802 \
|
||||
-DPLATFORM=ARM64 \
|
||||
-DTUNINGEXT=1 \
|
||||
-DQTLESS=1 \
|
||||
-DFULL_SRC_COMPILE=1 \
|
||||
-DWITH_DRM=1 \
|
||||
|
|
@ -51,7 +54,7 @@ EXTRA_OECMAKE += " \
|
|||
-Wno-dev \
|
||||
"
|
||||
|
||||
do_configure:prepend () {
|
||||
do_configure_disable:prepend () {
|
||||
# FIXME: should be rebuild.
|
||||
patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/mediacontrol/install/bin/isp_media_server
|
||||
patchelf --replace-needed libjsoncpp.so.25 libjsoncpp.so.26 ${S}/mediacontrol/install/lib/libmedia_server.so
|
||||
|
|
@ -62,9 +65,6 @@ do_configure:prepend () {
|
|||
}
|
||||
|
||||
do_install() {
|
||||
# FIXME: provided by the basler-camera package, do not install them here additionally
|
||||
rm -f ${S}/dewarp/dewarp_config//daA3840_30mc*.json
|
||||
|
||||
# The Makefile unconditionally installs tuningext even if it is not built
|
||||
if ${@bb.utils.contains('PACKAGECONFIG','tuningext','false','true',d)}; then
|
||||
touch ${B}/generated/release/bin/tuningext
|
||||
|
|
@ -8,7 +8,7 @@ DEPENDS += "dtc-native"
|
|||
inherit deploy
|
||||
|
||||
SRC_URI = "git://github.com/nxp-qoriq/mc-utils;protocol=https;nobranch=1"
|
||||
SRCREV = "5ccc2688b72c4a05119a393cbe3573b5f81d10bc"
|
||||
SRCREV = "f5c4b2c9d2b1d5122a7d97f236894f87959b3831"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ DEPENDS += "tcl-native"
|
|||
inherit deploy siteinfo
|
||||
|
||||
SRC_URI = "git://github.com/nxp-qoriq/rcw;protocol=https;nobranch=1"
|
||||
SRCREV = "64abe70cf0abab053c37db460c12e367e6adf7a4"
|
||||
SRCREV = "45e69253690452656a4dfe933c4c9f55e1eb0f5f"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,20 +10,24 @@ LIC_FILES_CHKSUM = " \
|
|||
file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
|
||||
file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
|
||||
file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
|
||||
file://Licenses/lgpl-2.0.txt;md5=4cf66a4984120007c9881cc871cf49db \
|
||||
file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
|
||||
"
|
||||
|
||||
SRC_URI = "git://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1"
|
||||
SRCREV = "1c0116f3da250c5a52858c53efb8b38c0963f477"
|
||||
PV:append = "+${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
B = "${WORKDIR}/build"
|
||||
UBOOT_BRANCH ?= "lf_v2025.04"
|
||||
UBOOT_SRC ?= "git://github.com/nxp-qoriq/u-boot.git;protocol=https"
|
||||
SRC_URI = "${UBOOT_SRC};branch=${UBOOT_BRANCH}"
|
||||
SRCREV = "9383f8387dc76524524da69992db96c22195a57c"
|
||||
|
||||
PV:append = "+fslgit"
|
||||
LOCALVERSION = "+fsl"
|
||||
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python3-native python3-setuptools-native"
|
||||
DEPENDS = "libgcc virtual/cross-cc bison-native bc-native gnutls-native swig-native python3-native"
|
||||
DEPENDS:append:qoriq-arm64 = " dtc-native"
|
||||
DEPENDS:append:qoriq-arm = " dtc-native"
|
||||
DEPENDS:append:qoriq-ppc = " boot-format-native"
|
||||
|
|
@ -80,8 +84,6 @@ do_compile:append:qoriq() {
|
|||
boot_format ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
|
||||
${config}/u-boot-${type}.${UBOOT_SUFFIX} -spi ${config}/u-boot.format.bin
|
||||
cp ${config}/u-boot.format.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX}
|
||||
elif [ "qspi" = "${type}" ];then
|
||||
cp ${config}/${binary} ${config}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
|
@ -92,6 +94,46 @@ do_compile:append:qoriq() {
|
|||
unset i
|
||||
}
|
||||
|
||||
do_deploy:append:lx2162a () {
|
||||
if [ -n "${UBOOT_CONFIG}" ]
|
||||
then
|
||||
for config in ${UBOOT_MACHINE}; do
|
||||
i=$(expr $i + 1);
|
||||
for type in ${UBOOT_CONFIG}; do
|
||||
j=$(expr $j + 1);
|
||||
if [ $j -eq $i ]
|
||||
then
|
||||
if [ "tfa-verified-boot" = "${type}" ];then
|
||||
install -m 644 ${B}/${config}/u-boot.dtb ${DEPLOYDIR}/u-boot.dtb
|
||||
fi
|
||||
fi
|
||||
done
|
||||
unset j
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
}
|
||||
|
||||
do_deploy:append:ls102xa () {
|
||||
if [ -n "${UBOOT_CONFIG}" ]
|
||||
then
|
||||
for config in ${UBOOT_MACHINE}; do
|
||||
i=$(expr $i + 1);
|
||||
for type in ${UBOOT_CONFIG}; do
|
||||
j=$(expr $j + 1);
|
||||
if [ $j -eq $i ]
|
||||
then
|
||||
if expr "$type" : sdcard;then
|
||||
install -m 644 ${B}/${config}/u-boot-dtb.bin ${DEPLOYDIR}/u-boot-dtb.${UBOOT_SUFFIX}-${type}
|
||||
install -m 644 ${B}/${config}/spl/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl.${UBOOT_SUFFIX}-${type}
|
||||
fi
|
||||
fi
|
||||
done
|
||||
unset j
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
}
|
||||
|
||||
PACKAGES += "${PN}-images"
|
||||
FILES:${PN}-images += "/boot"
|
||||
|
|
@ -9,3 +9,12 @@ SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="1af0000", NAME="fm1-m
|
|||
|
||||
# Rename macless0 to "macless0"
|
||||
SUBSYSTEM=="net", ATTR{device_type}=="macless0", NAME="macless0"
|
||||
|
||||
# Rules for handling the Upstream DPAA ethernet ports
|
||||
SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae0000*", NAME="fm1-mac1"
|
||||
SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae2000*", NAME="fm1-mac2"
|
||||
SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae4000*", NAME="fm1-mac3"
|
||||
SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae6000*", NAME="fm1-mac4"
|
||||
SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1ae8000*", NAME="fm1-mac5"
|
||||
SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1aea000*", NAME="fm1-mac6"
|
||||
SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1af0000*", NAME="fm1-mac9"
|
||||
|
|
|
|||
|
|
@ -1 +1,5 @@
|
|||
# Rules for handling the SDK DPAA ethernet ports
|
||||
SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", ATTR{device_addr}=="1af2000", NAME="fm1-mac10"
|
||||
|
||||
# Rules for handling the Upstream DPAA ethernet ports
|
||||
SUBSYSTEM=="net", DRIVERS=="fsl_dpa*", KERNELS=="1af2000*", NAME="fm1-mac10"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ SRC_URI = "gitsm://github.com/nxp-qoriq/qemu;protocol=https;nobranch=1 \
|
|||
file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \
|
||||
"
|
||||
|
||||
SRCREV = "14fda5a42df6c72e890d6a97ff88c5852172604b"
|
||||
SRCREV = "a46ddbbe661677dcfa342f00ab7ab71e5f6f1a09"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
From 81ec65e72f357fb2c395e40c5195434bbaddf7f7 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 16 May 2020 08:21:52 -0700
|
||||
Subject: [PATCH] tools: Mark struct input_field file_field extern
|
||||
|
||||
This struct is already defined in common/parse_utils.c
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
tools/header_generation/create_hdr_common.c | 2 +-
|
||||
tools/pbi_creation/create_pbi_common.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/header_generation/create_hdr_common.c b/tools/header_generation/create_hdr_common.c
|
||||
index bfa90a3..edf632c 100644
|
||||
--- a/tools/header_generation/create_hdr_common.c
|
||||
+++ b/tools/header_generation/create_hdr_common.c
|
||||
@@ -39,7 +39,7 @@
|
||||
#include <crypto_utils.h>
|
||||
|
||||
extern struct g_data_t gd;
|
||||
-struct input_field file_field;
|
||||
+extern struct input_field file_field;
|
||||
|
||||
extern char line_data[];
|
||||
static struct option long_options[] = {
|
||||
diff --git a/tools/pbi_creation/create_pbi_common.c b/tools/pbi_creation/create_pbi_common.c
|
||||
index ff2ed84..bd976da 100644
|
||||
--- a/tools/pbi_creation/create_pbi_common.c
|
||||
+++ b/tools/pbi_creation/create_pbi_common.c
|
||||
@@ -57,7 +57,7 @@ static char *parse_list[] = {
|
||||
|
||||
extern struct g_data_t gd;
|
||||
extern char line_data[];
|
||||
-struct input_field file_field;
|
||||
+extern struct input_field file_field;
|
||||
|
||||
#define NUM_PARSE_LIST (sizeof(parse_list) / sizeof(char *))
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
@ -16,10 +16,8 @@ inherit kernel-arch
|
|||
#SECURE_PRI_KEY = "/path/srk.pri"
|
||||
#SECURE_PUB_KEY = "/path/srk.pub"
|
||||
|
||||
SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1 \
|
||||
file://0001-tools-Mark-struct-input_field-file_field-extern.patch \
|
||||
"
|
||||
SRCREV = "e96dead3c339f6addb1600249be67e1884cdbcc5"
|
||||
SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1"
|
||||
SRCREV = "892d2ed3207d78a3cb5533eeb91bcc73967e3e36"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
@ -41,3 +39,5 @@ do_install () {
|
|||
|
||||
FILES:${PN}-dbg += "${bindir}/cst/.debug"
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
INSANE_SKIP:${PN}-dbg += " buildpaths"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
From 4cede5edcff96134baf35953d58595c4aa5f1fc5 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
Date: Sun, 7 Feb 2021 01:30:39 +0000
|
||||
Subject: [PATCH] generate glslang pkg-config
|
||||
|
||||
Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch
|
||||
|
||||
Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371]
|
||||
|
||||
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
---
|
||||
glslang/CMakeLists.txt | 2 ++
|
||||
glslang/glslang.pc.cmake.in | 11 +++++++++++
|
||||
2 files changed, 13 insertions(+)
|
||||
create mode 100644 glslang/glslang.pc.cmake.in
|
||||
|
||||
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
|
||||
index 37eecaad..6974935c 100644
|
||||
--- a/glslang/CMakeLists.txt
|
||||
+++ b/glslang/CMakeLists.txt
|
||||
@@ -251,6 +251,8 @@ if(PROJECT_IS_TOP_LEVEL)
|
||||
")
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
||||
endif()
|
||||
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY)
|
||||
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
|
||||
set(PUBLIC_HEADERS
|
||||
Public/ResourceLimits.h
|
||||
diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in
|
||||
new file mode 100644
|
||||
index 00000000..43104e68
|
||||
--- /dev/null
|
||||
+++ b/glslang/glslang.pc.cmake.in
|
||||
@@ -0,0 +1,11 @@
|
||||
+prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+exec_prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
+
|
||||
+Name: @PROJECT_NAME@
|
||||
+Description: OpenGL and OpenGL ES shader front end and validator
|
||||
+Requires:
|
||||
+Version: @GLSLANG_VERSION@
|
||||
+Libs: -L${libdir} -lglslang -lHLSL -lSPVRemapper
|
||||
+Cflags: -I${includedir}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Fri, 2 Aug 2024 22:44:21 +0100
|
||||
Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> include
|
||||
|
||||
Without the change `glslang` build fails on upcoming `gcc-15` as:
|
||||
|
||||
In file included from /build/source/SPIRV/GlslangToSpv.cpp:45:
|
||||
SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared
|
||||
248 | Id makeDebugLexicalBlock(uint32_t line);
|
||||
| ^~~~~~~~
|
||||
---
|
||||
SPIRV/SpvBuilder.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd]
|
||||
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
||||
|
||||
diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
|
||||
index f86dd81b3..d688436a6 100644
|
||||
--- a/SPIRV/SpvBuilder.h
|
||||
+++ b/SPIRV/SpvBuilder.h
|
||||
@@ -56,6 +56,7 @@ namespace spv {
|
||||
}
|
||||
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <set>
|
||||
--
|
||||
2.34.1
|
||||
|
||||
36
recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
Normal file
36
recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
SUMMARY = "OpenGL / OpenGL ES Reference Compiler"
|
||||
DESCRIPTION = "Glslang is the official reference compiler front end for the \
|
||||
OpenGL ES and OpenGL shading languages. It implements a strict interpretation \
|
||||
of the specifications for these languages. It is open and free for anyone to use, \
|
||||
either from a command line or programmatically."
|
||||
SECTION = "graphics"
|
||||
HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
|
||||
LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
|
||||
|
||||
SRCREV = "a91631b260cba3f22858d6c6827511e636c2458a"
|
||||
SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \
|
||||
file://0001-generate-glslang-pkg-config.patch \
|
||||
file://0002-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch"
|
||||
PE = "1"
|
||||
# These recipes need to be updated in lockstep with each other:
|
||||
# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
|
||||
# vulkan-validation-layers, vulkan-utility-libraries.
|
||||
# The tags versions should always be sdk-x.y.z, as this is what
|
||||
# upstream considers a release.
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
inherit cmake python3native
|
||||
|
||||
DEPENDS = "spirv-tools"
|
||||
|
||||
EXTRA_OECMAKE = " \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DBUILD_SHARED_LIBS=ON \
|
||||
-DENABLE_PCH=OFF \
|
||||
-DENABLE_CTEST=OFF \
|
||||
-DBUILD_EXTERNAL=OFF \
|
||||
-DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
|
@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9c7bd5e45d066db084bdb3543d55b1ac"
|
|||
PR = "r1"
|
||||
|
||||
SRC_URI = "git://github.com/nxp-qoriq/fmlib;protocol=https;nobranch=1"
|
||||
SRCREV = "9fb916f255214013aa6003496c47bab0b5add2d9"
|
||||
SRCREV = "7a58ecaf0d90d71d6b78d3ac7998282a472c4394"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
From 5392152e704ff001c41de03445d668227237a87e Mon Sep 17 00:00:00 2001
|
||||
From: Ting Liu <ting.liu@nxp.com>
|
||||
Date: Fri, 15 Oct 2021 09:36:04 +0530
|
||||
Subject: [PATCH] disable manpage generation
|
||||
|
||||
Upstream-Status: Inappropriate [Cross-compile specific]
|
||||
Signed-off-by: Ting Liu <ting.liu@nxp.com>
|
||||
---
|
||||
Makefile | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index ee669ae..ab6e499 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -60,7 +60,6 @@ install: restool scripts/ls-main scripts/ls-append-dpl scripts/ls-debug scripts/
|
||||
install -D -m 755 scripts/ls-debug $(DESTDIR)$(bindir)/ls-debug
|
||||
$(foreach symlink, $(RESTOOL_SCRIPT_SYMLINKS), sh -c "cd $(DESTDIR)$(bindir) && ln -sf ls-main $(symlink)" ;)
|
||||
install -D -m 755 scripts/restool_completion.sh $(DESTDIR)$(bindir_completion)/restool
|
||||
- install -m 0644 -D $(MANPAGE) $(call get_manpage_destination,$(MANPAGE))
|
||||
|
||||
clean:
|
||||
rm -f $(OBJ) $(MANPAGE) \
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -2,10 +2,8 @@ SUMMARY = "DPAA2 Resource Manager Tool"
|
|||
LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=83af78c71766dd5fb1c1c3dd64a75ee7"
|
||||
|
||||
SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \
|
||||
file://disable-manpage-generation.patch \
|
||||
"
|
||||
SRCREV = "8c45e04363bf2a984a87b24d1dac80a286dd40d8"
|
||||
SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1"
|
||||
SRCREV = "8f73f2600111440d034227966d6ff03ec47d8f1a"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,113 @@
|
|||
From 2be7793ca658015470fe0d60c0c973e12ce68d73 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Hochstein <tom.hochstein@nxp.com>
|
||||
Date: Thu, 12 Jun 2025 06:49:58 -0700
|
||||
Subject: [PATCH 1/2] YOCIMX-9281-1: Fix gcc15 errors
|
||||
|
||||
Fix several instances of the following errors:
|
||||
|
||||
```
|
||||
| inmates/lib/include/inmate_common.h:87:16: error: cannot use keyword 'true' as enumeration constant
|
||||
| 87 | typedef enum { true = 1, false = 0 } bool;
|
||||
| | ^~~~
|
||||
```
|
||||
|
||||
```
|
||||
| In file included from configs/arm64/hikey.c:16:
|
||||
| include/jailhouse/cell-config.h:318:41: error: initializer-string for array of 'char' truncates NUL terminator but destination lacks 'nonstring' attribute (6 chars into 5 available) [-Werror=unterminated-string-initialization]
|
||||
| 318 | #define JAILHOUSE_SYSTEM_SIGNATURE "JHSYS"
|
||||
| | ^~~~~~~
|
||||
| configs/arm64/hikey.c:26:30: note: in expansion of macro 'JAILHOUSE_SYSTEM_SIGNATURE'
|
||||
| 26 | .signature = JAILHOUSE_SYSTEM_SIGNATURE,
|
||||
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
```
|
||||
|
||||
Upstream-Status: Backport [Pending]
|
||||
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
||||
Signed-off-by: Peng Fan <peng.fan@nxp.com>
|
||||
---
|
||||
hypervisor/include/jailhouse/header.h | 2 +-
|
||||
hypervisor/include/jailhouse/types.h | 2 ++
|
||||
include/jailhouse/cell-config.h | 4 ++--
|
||||
include/jailhouse/hypercall.h | 2 +-
|
||||
inmates/lib/include/inmate_common.h | 2 ++
|
||||
5 files changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/hypervisor/include/jailhouse/header.h b/hypervisor/include/jailhouse/header.h
|
||||
index 518bc5cb..324eb94b 100644
|
||||
--- a/hypervisor/include/jailhouse/header.h
|
||||
+++ b/hypervisor/include/jailhouse/header.h
|
||||
@@ -55,7 +55,7 @@ struct jailhouse_header {
|
||||
/** Signature "JAILHOUS" used for basic validity check of the
|
||||
* hypervisor image.
|
||||
* @note Filled at build time. */
|
||||
- char signature[8];
|
||||
+ char signature[8] __attribute__ ((nonstring));
|
||||
/** Size of hypervisor core.
|
||||
* It starts with the hypervisor's header and ends after its bss
|
||||
* section. Rounded up to page boundary.
|
||||
diff --git a/hypervisor/include/jailhouse/types.h b/hypervisor/include/jailhouse/types.h
|
||||
index 6d78ad6d..f79d7428 100644
|
||||
--- a/hypervisor/include/jailhouse/types.h
|
||||
+++ b/hypervisor/include/jailhouse/types.h
|
||||
@@ -19,7 +19,9 @@
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
+#if __GNUC__ < 15
|
||||
typedef enum { true = 1, false = 0 } bool;
|
||||
+#endif
|
||||
|
||||
/** Describes a CPU set. */
|
||||
struct cpu_set {
|
||||
diff --git a/include/jailhouse/cell-config.h b/include/jailhouse/cell-config.h
|
||||
index 17d59306..affce1c2 100644
|
||||
--- a/include/jailhouse/cell-config.h
|
||||
+++ b/include/jailhouse/cell-config.h
|
||||
@@ -91,7 +91,7 @@
|
||||
* structure.
|
||||
*/
|
||||
struct jailhouse_cell_desc {
|
||||
- char signature[5];
|
||||
+ char signature[5] __attribute__ ((nonstring));
|
||||
__u8 architecture;
|
||||
__u16 revision;
|
||||
|
||||
@@ -330,7 +330,7 @@ struct jailhouse_pio {
|
||||
* General descriptor of the system.
|
||||
*/
|
||||
struct jailhouse_system {
|
||||
- char signature[5];
|
||||
+ char signature[5] __attribute__ ((nonstring));
|
||||
__u8 architecture;
|
||||
__u16 revision;
|
||||
|
||||
diff --git a/include/jailhouse/hypercall.h b/include/jailhouse/hypercall.h
|
||||
index 07574d3d..cf58a4c9 100644
|
||||
--- a/include/jailhouse/hypercall.h
|
||||
+++ b/include/jailhouse/hypercall.h
|
||||
@@ -107,7 +107,7 @@
|
||||
|
||||
#define COMM_REGION_GENERIC_HEADER \
|
||||
/** Communication region magic JHCOMM */ \
|
||||
- char signature[6]; \
|
||||
+ char signature[6] __attribute__ ((nonstring)); \
|
||||
/** Communication region ABI revision */ \
|
||||
__u16 revision; \
|
||||
/** Cell state, initialized by hypervisor, updated by cell. */ \
|
||||
diff --git a/inmates/lib/include/inmate_common.h b/inmates/lib/include/inmate_common.h
|
||||
index 1c20a0af..43cd7a20 100644
|
||||
--- a/inmates/lib/include/inmate_common.h
|
||||
+++ b/inmates/lib/include/inmate_common.h
|
||||
@@ -84,7 +84,9 @@ typedef u32 __u32;
|
||||
typedef s64 __s64;
|
||||
typedef u64 __u64;
|
||||
|
||||
+#if __GNUC__ < 15
|
||||
typedef enum { true = 1, false = 0 } bool;
|
||||
+#endif
|
||||
|
||||
#include <jailhouse/hypercall.h>
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
From 98f6f8dc23d6b3d4fe5b15045ccb3d3ef36747be Mon Sep 17 00:00:00 2001
|
||||
From: Peng Fan <peng.fan@nxp.com>
|
||||
Date: Mon, 25 Aug 2025 09:48:05 +0800
|
||||
Subject: [PATCH 2/2] YOCIMX-9281-2: hypervisor: arm64: fix strh usage
|
||||
|
||||
hypervisor/arch/arm64/entry.S:555: Error: immediate offset out of range
|
||||
|
||||
Per ARM spec:
|
||||
STRH (immediate)
|
||||
<pimm> Is the optional positive immediate byte offset, a multiple of 2 in
|
||||
the range 0 to 8190, defaulting to 0 and encoded in the "imm12" field
|
||||
as <pimm>/2.
|
||||
|
||||
So align sdei_event to 2 bytes aligned.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Peng Fan <peng.fan@nxp.com>
|
||||
---
|
||||
hypervisor/arch/arm64/include/asm/percpu_fields.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hypervisor/arch/arm64/include/asm/percpu_fields.h b/hypervisor/arch/arm64/include/asm/percpu_fields.h
|
||||
index 32f42a53..844a9417 100644
|
||||
--- a/hypervisor/arch/arm64/include/asm/percpu_fields.h
|
||||
+++ b/hypervisor/arch/arm64/include/asm/percpu_fields.h
|
||||
@@ -18,4 +18,4 @@
|
||||
bool suspended; \
|
||||
bool suspending; \
|
||||
bool resuming; \
|
||||
- bool sdei_event;
|
||||
+ bool sdei_event __attribute__((aligned(2)));
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -16,12 +16,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
|
|||
PROVIDES = "jailhouse"
|
||||
RPROVIDES:${PN} += "jailhouse"
|
||||
|
||||
SRCBRANCH = "lf-6.6.52_2.2.0"
|
||||
SRCREV = "44dd492a745cd8b8313fb6c7c03fb45a36d70e8a"
|
||||
SRCBRANCH = "lf-6.12.20_2.0.0"
|
||||
SRCREV = "399d65450e9a377b4aaff4b0627619174e1c8c46"
|
||||
|
||||
PV = "2023.03+git${SRCPV}"
|
||||
|
||||
IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
|
||||
SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \
|
||||
file://arm-arm64-Makefile-Remove-march-option-from-Makefile.patch \
|
||||
file://0001-YOCIMX-9281-1-Fix-gcc15-errors.patch \
|
||||
file://0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch \
|
||||
"
|
||||
|
||||
DEPENDS = " \
|
||||
|
|
@ -107,6 +111,12 @@ RDEPENDS:pyjailhouse = " \
|
|||
python3-shell \
|
||||
"
|
||||
|
||||
INSANE_SKIP:${PN} = "ldflags"
|
||||
INSANE_SKIP:${PN} = "ldflags buildpaths"
|
||||
INSANE_SKIP:${PN}-dbg = "buildpaths"
|
||||
|
||||
# The QA error in package kernel-module-${KERNEL_VERSION} cannot be skipped with
|
||||
# INSANE_SKIP, so adjust at the ERROR_QA level
|
||||
ERROR_QA:remove = "buildpaths"
|
||||
INSANE_SKIP:kernel-module-${KERNEL_VERSION} = "buildpaths"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx8m-nxp-bsp|mx8ulp-nxp-bsp|mx9-nxp-bsp)"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
The M4 demo app version of each SoCs are followed:
|
||||
* 2.16.000 -- i.MX 7ULP, 8MQ, 8MM
|
||||
* 2.16.000 -- i.MX 7ULP
|
||||
* 25.03.00 -- i.MX 8MQ, 8MM
|
||||
* 2.9.0 -- i.MX 8DXL, 8QM, 8QXP
|
||||
* 1.0.1 -- i.MX 7D
|
||||
|
||||
The M7 demo app version of each SoCs are followed:
|
||||
* 2.16.000 -- i.MX 8MP , 8MNULite, 8MN
|
||||
* 24.12.00 -- i.MX95
|
||||
* 25.03.00 -- i.MX 8MP , 8MNULite, 8MN
|
||||
* 25.06.00 -- i.MX95
|
||||
|
||||
The M33 demo app version of each SoCs are followed:
|
||||
* 2.16.000 -- i.MX 8ULP, i.MX 93
|
||||
* 25.03.00 -- i.MX 8ULP
|
||||
* 25.06.00 -- i.MX 93
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
# Copyright 2023-2024 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
require imx-mcore-demos.inc
|
||||
|
||||
LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
|
||||
LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
|
||||
|
||||
SRC_URI[imx8ulp.sha256sum] = "2d1d48eb3f01d020917f42281581835a3c085233e9764ec845940c1e49ac317b"
|
||||
|
||||
SRC_URI[imx93.sha256sum] = "c954b9bc32cfdea9b696fa0b02f934812054e3ab445b5dd8eb7898d427e47526"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx93-nxp-bsp)"
|
||||
11
recipes-fsl/mcore-demos/imx-m33-demos_25.03.00.bb
Normal file
11
recipes-fsl/mcore-demos/imx-m33-demos_25.03.00.bb
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
# Copyright 2023-2025 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
require imx-mcore-demos.inc
|
||||
|
||||
LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
SRC_URI[imx8ulp.sha256sum] = "8147efc6b1da5aa9bbda8cc06c8aa0d03455f74d8c85a988db5e3f839717e190"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp)"
|
||||
|
||||
11
recipes-fsl/mcore-demos/imx-m33-demos_25.06.00.bb
Normal file
11
recipes-fsl/mcore-demos/imx-m33-demos_25.06.00.bb
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
# Copyright 2023-2025 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
require imx-mcore-demos.inc
|
||||
|
||||
LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
SRC_URI[imx93.sha256sum] = "275256ab9a7aca0b72dbd2ddb4f237f2ad9b02a83ae63242b2d9e6804a918b93"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx93-nxp-bsp)"
|
||||
|
||||
|
|
@ -4,13 +4,7 @@
|
|||
require imx-mcore-demos.inc
|
||||
|
||||
LIC_FILES_CHKSUM:mx7ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
|
||||
LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
|
||||
LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
|
||||
|
||||
SRC_URI[imx7ulp.sha256sum] = "1fbb26f8e0a69a2e3925e07cf0cc4a13b13e3ff6321a2ba3dc39c454c82b398b"
|
||||
|
||||
SRC_URI[imx8mm.sha256sum] = "a335b54b797c37be05c5b4e6aeabd02099f401de907186723361d1fc25ea3f24"
|
||||
|
||||
SRC_URI[imx8mq.sha256sum] = "09b7195ce553dae5808afcefaf6f76c79f7122ce4dd31fabd679b768607dea25"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp|mx8mm-nxp-bsp|mx8mq-nxp-bsp)"
|
||||
COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp)"
|
||||
|
|
|
|||
13
recipes-fsl/mcore-demos/imx-m4-demos_25.03.00.bb
Normal file
13
recipes-fsl/mcore-demos/imx-m4-demos_25.03.00.bb
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
# Copyright 2017-2025 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
require imx-mcore-demos.inc
|
||||
|
||||
LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
SRC_URI[imx8mm.sha256sum] = "30fcf9032a3bd71211b8df03c654acf98d5dd4631d18a34635d5b1ba61201d6c"
|
||||
SRC_URI[imx8mq.sha256sum] = "652c0521587d9594d56115b549b23d75ea598237f36a79d5a7eede97d9f56574"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx8mm-nxp-bsp|mx8mq-nxp-bsp)"
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
# Copyright 2023-2024 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
require imx-mcore-demos.inc
|
||||
|
||||
LIC_FILES_CHKSUM:mx8mn-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
|
||||
LIC_FILES_CHKSUM:mx8mnul-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
|
||||
|
||||
LIC_FILES_CHKSUM:mx8mp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
|
||||
LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
|
||||
|
||||
LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
|
||||
|
||||
SRC_URI[imx8mn.sha256sum] = "ab608d621c8d74f42514799a732414184bd22f058a8a87a0ab75147a0fd5d99c"
|
||||
|
||||
SRC_URI[imx8mnddr3l.sha256sum] = "9c9477db2581640395ec3bc7524f89c2c09ffd2947d9186959343a8cf764ad28"
|
||||
|
||||
SRC_URI[imx8mp.sha256sum] = "672af1e1d8fcc1ebd12b45c6dc4cfc7abc85ea9ebbf114d15f4bfe7540e24ea1"
|
||||
|
||||
SRC_URI[imx95.sha256sum] = "8d394b62a4fbad8303acf43f9f8672e5d1c17f1af8f47d7665740272819c0cc1"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp|mx95-nxp-bsp)"
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
# Copyright 2023-2024 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
require imx-mcore-demos.inc
|
||||
|
||||
LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
|
||||
|
||||
SRC_URI[imx95.sha256sum] = "01603b53fd01181631b71f5139a4a3e215f7e03cc531638ef4fa805a678ede3d"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
|
||||
19
recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb
Normal file
19
recipes-fsl/mcore-demos/imx-m7-demos_25.03.00.bb
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# Copyright 2023-2025 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
require imx-mcore-demos.inc
|
||||
|
||||
LIC_FILES_CHKSUM:mx8mn-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
LIC_FILES_CHKSUM:mx8mnul-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
LIC_FILES_CHKSUM:mx8mp-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
SRC_URI[imx8mn.sha256sum] = "66e160a4267efcd2660b932d46ad6bcc645c9f2865c8ea873d4194d67fcf342c"
|
||||
|
||||
SRC_URI[imx8mnddr3l.sha256sum] = "45c770ed5539c5e0d5dd8aee2ad0a6ef91b28c99be3aaa9f336bda6ec34a7083"
|
||||
|
||||
SRC_URI[imx8mp.sha256sum] = "94b85ec4dcbf1664a8997e3cfb7bde6b7f1e5825482096302971a7da853b145f"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp)"
|
||||
|
||||
11
recipes-fsl/mcore-demos/imx-m7-demos_25.06.00.bb
Normal file
11
recipes-fsl/mcore-demos/imx-m7-demos_25.06.00.bb
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
# Copyright 2023-2025 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
require imx-mcore-demos.inc
|
||||
|
||||
LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
SRC_URI[imx95.sha256sum] = "8b33ca53bd2692ba92fe928c42d0ec75f1abd3f33879f71660efca9983e9eb88"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
|
||||
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
# Copyright (C) 2016 Freescale Semiconductor
|
||||
# Copyright 2017-2024 NXP
|
||||
# Copyright 2017-2025 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
DESCRIPTION = "G2D library using i.MX DPU"
|
||||
LICENSE = "Proprietary"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
DEPENDS = "libdrm ${LIBGAL_IMX}"
|
||||
LIBGAL_IMX = ""
|
||||
|
|
@ -15,13 +15,13 @@ PROVIDES += "virtual/libg2d"
|
|||
SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}"
|
||||
IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}"
|
||||
|
||||
IMX_SRCREV_ABBREV = "8d2a88d"
|
||||
IMX_SRCREV_ABBREV = "9e8bbf1"
|
||||
IMX_SRC_URI_NAME = "v1"
|
||||
SRC_URI[v1.sha256sum] = "20325a7c6090b79e012339aed25fa4c3b760efcc32be339e389a36a15e44bdfc"
|
||||
SRC_URI[v1.sha256sum] = "67be9b56a5d2196613460d3cc3a734d7a088e2177377e27f83287766d5d8cf70"
|
||||
|
||||
IMX_SRCREV_ABBREV:imxmali = "8d2a88d"
|
||||
IMX_SRCREV_ABBREV:imxmali = "9e8bbf1"
|
||||
IMX_SRC_URI_NAME:imxmali = "v2"
|
||||
SRC_URI[v2.sha256sum] = "eb7108256cb55d996c07f6941d0d4a76beaf73458494b2c902d907bc8228eeeb"
|
||||
SRC_URI[v2.sha256sum] = "f56dae607f89e0f414625657d8345c5d1b68b79d3ac61e50016fbe4d49a91402"
|
||||
|
||||
S = "${WORKDIR}/${IMX_BIN_NAME}"
|
||||
|
||||
|
|
@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
|
|||
|
||||
DEPENDS = "cairo"
|
||||
|
||||
PV = "2.3+git${SRCPV}"
|
||||
PV = "2.4+git"
|
||||
|
||||
SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}"
|
||||
GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https"
|
||||
SRCBRANCH = "imx_2.3"
|
||||
SRCBRANCH = "imx_2.4"
|
||||
SRCREV = "7d12c50c07d73650b4c97906ce917aff429238f8"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
@ -23,6 +23,7 @@ PACKAGECONFIG_IMPLEMENTATION:mx95-nxp-bsp = "dpu95"
|
|||
PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm"
|
||||
PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev"
|
||||
PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp = "pxp"
|
||||
PACKAGECONFIG_IMPLEMENTATION:mx943-nxp-bsp = "pxp"
|
||||
|
||||
PACKAGECONFIG[dpu] = " \
|
||||
BUILD_IMPLEMENTATION=dpu, \
|
||||
|
|
@ -73,4 +74,4 @@ FILES:${PN} += "/opt"
|
|||
|
||||
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
|
||||
|
||||
COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp|mx95-nxp-bsp)"
|
||||
COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp|mx943-nxp-bsp|mx95-nxp-bsp)"
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
# Copyright (C) 2016 Freescale Semiconductor
|
||||
# Copyright 2017-2024 NXP
|
||||
# Copyright 2017-2022 NXP
|
||||
# Copyright 2018 (C) O.S. Systems Software LTDA.
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
DESCRIPTION = "G2D library using i.MX GPU"
|
||||
LICENSE = "Proprietary"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
DEPENDS = "libgal-imx"
|
||||
PROVIDES = "virtual/libg2d"
|
||||
|
||||
SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
|
||||
IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}"
|
||||
IMX_SRCREV_ABBREV = "c600d03"
|
||||
SRC_URI[aarch64.sha256sum] = "e6c336c0b876efab7598a2d7817111772284487f646d5d83c400692f2cdfebe3"
|
||||
SRC_URI[arm.sha256sum] = "6e1a42f2c570582b8038d1b5c86dbdcd645e75cc10a1db23e716f662d1c1329f"
|
||||
IMX_SRCREV_ABBREV = "3c5e429"
|
||||
SRC_URI[aarch64.sha256sum] = "190bc9203e60e5de508e1dcf057b36d2c9bc3667c6972fd12f7df797e508a22d"
|
||||
SRC_URI[arm.sha256sum] = "aaf9a38fe446af579b16a836bf297f8cb1b2842ca3a784bedc21e32d37271ab4"
|
||||
|
||||
S = "${WORKDIR}/${IMX_BIN_NAME}"
|
||||
|
||||
|
|
@ -1,29 +1,31 @@
|
|||
# Copyright (C) 2016 Freescale Semiconductor
|
||||
# Copyright 2017-2024 NXP
|
||||
# Copyright 2017-2025 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
DESCRIPTION = "G2D library using i.MX PXP"
|
||||
LICENSE = "Proprietary"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
PROVIDES += "virtual/libg2d"
|
||||
|
||||
PV = "2.3+git${SRCPV}"
|
||||
PV = "2.4+git"
|
||||
|
||||
SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}"
|
||||
IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https"
|
||||
SRCBRANCH = "imx_2.3"
|
||||
SRCREV = "f3aabbcb7977a0a17c962c62b02bc829855f8edf"
|
||||
SRCBRANCH = "imx_2.4"
|
||||
SRCREV = "c3368ea82e4507d7b35aee258c28d04f9f8fb8e9"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit use-imx-headers
|
||||
|
||||
EXTRA_OEMAKE = "PLATFORM=IMX93 INCLUDE='-I${STAGING_INCDIR_IMX}' DEST_DIR=${D}"
|
||||
EXTRA_OEMAKE = "PLATFORM=${IMX_PLATFORM} INCLUDE='-I${STAGING_INCDIR_IMX}' DEST_DIR=${D}"
|
||||
IMX_PLATFORM:mx93-nxp-bsp = "IMX93"
|
||||
IMX_PLATFORM:mx943-nxp-bsp = "IMX943"
|
||||
|
||||
do_install() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
|
||||
COMPATIBLE_MACHINE = "(mx93-nxp-bsp)"
|
||||
COMPATIBLE_MACHINE = "(mx93-nxp-bsp|mx943-nxp-bsp)"
|
||||
|
|
|
|||
|
|
@ -330,7 +330,6 @@ FILES:libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/
|
|||
INSANE_SKIP:libegl-imx += "dev-so"
|
||||
|
||||
FILES:libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
|
||||
FILES:libgal-imx-dev:remove = "${includedir}/HAL"
|
||||
RDEPENDS:libgal-imx += "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'valgrind', '', d)}"
|
||||
RPROVIDES:libgal-imx += "libgal-imx"
|
||||
RRECOMMENDS:libgal-imx += "kernel-module-imx-gpu-viv"
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
require imx-gpu-viv-6.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
|
||||
IMX_SRCREV_ABBREV = "c600d03"
|
||||
|
||||
SRC_URI[sha256sum] = "fe8fc231f18047b9547a038e111c08e855760190d0e9848ead22b383d793499d"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
require imx-gpu-viv-6.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
|
||||
IMX_SRCREV_ABBREV = "c600d03"
|
||||
|
||||
SRC_URI[sha256sum] = "82e1bb6304d2aac70c72b691239d1bb5f6738cadfa812d07196db2f580c63d29"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
require imx-gpu-viv-6.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
IMX_SRCREV_ABBREV = "3c5e429"
|
||||
|
||||
SRC_URI[sha256sum] = "ea7ffb01fd7cd88f2a308e5b12b40cc3c9553b8ff2941c4867943b4fee265d27"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
require imx-gpu-viv-6.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
IMX_SRCREV_ABBREV = "3c5e429"
|
||||
|
||||
SRC_URI[sha256sum] = "bf6fe102e8aa7a16373392efcf6ac45d705bbb95f5c39501da8aaa30957c554f"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
|
||||
|
|
@ -45,6 +45,7 @@ FILES:${PN}-opencl-icd = " \
|
|||
${sysconfdir}/OpenCL"
|
||||
FILES:${PN}-libvulkan = " \
|
||||
${sysconfdir}/vulkan"
|
||||
RDEPENDS:${PN}-libvulkan = "vulkan-wsi-layer"
|
||||
|
||||
FILES:${PN}-dev = " \
|
||||
${bindir}/malisc"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
require mali-imx.inc
|
||||
|
||||
LICENSE = "Proprietary"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
|
||||
|
||||
SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
|
||||
SRC_URI[sha256sum] = "67a008bc64af4f3d9ad91465af3c0c3ac90ff8dcbcdaed96036eccc62880c7a3"
|
||||
IMX_SRCREV_ABBREV = "f2226b0"
|
||||
SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
|
||||
SRC_URI[sha256sum] = "df89c80456c73ee8c235201b98c0b678d993083540912eab968dc0cbf683ad26"
|
||||
IMX_SRCREV_ABBREV = "2943b3d"
|
||||
|
||||
S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
|
||||
S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
|
||||
|
||||
inherit fsl-eula-unpack
|
||||
|
||||
|
|
@ -1,10 +1,6 @@
|
|||
PROVIDES:remove:imxgpu = "virtual/egl"
|
||||
PROVIDES:remove:imxgpu3d = "virtual/libgl virtual/libgles1 virtual/libgles2"
|
||||
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
|
||||
SRC_URI:append:mx93-nxp-bsp = " file://0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch"
|
||||
SRC_URI:append:imx-nxp-bsp = " file://0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch"
|
||||
|
||||
PACKAGECONFIG:remove:imxgpu = "egl gbm"
|
||||
PACKAGECONFIG:remove:imxgpu3d = "gles"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
From 612c3dc98d5d050b9cfee16ec77ca3c8358caa0d Mon Sep 17 00:00:00 2001
|
||||
From: Wujian Sun <wujian.sun_1@nxp.com>
|
||||
Date: Mon, 29 Apr 2024 17:29:16 +0800
|
||||
Subject: [PATCH] MGS-7599 cso: fix virgl driver assert issue
|
||||
|
||||
A workaround that remove PIPE_MAX_SAMPLERS and
|
||||
PIPE_MAX_CONSTANT_BUFFERS assert.
|
||||
|
||||
Upstream-Status: Inappropriate [i.MX-specific]
|
||||
|
||||
Signed-off-by: Wujian Sun <wujian.sun_1@nxp.com>
|
||||
---
|
||||
src/gallium/auxiliary/cso_cache/cso_context.c | 2 --
|
||||
src/gallium/drivers/virgl/virgl_screen.c | 2 +-
|
||||
2 files changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
|
||||
index 3e86def31c5..ffc6d22da9c 100644
|
||||
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
|
||||
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
|
||||
@@ -403,10 +403,8 @@ cso_unbind_context(struct cso_context *ctx)
|
||||
PIPE_SHADER_CAP_MAX_CONST_BUFFERS);
|
||||
int maximg = scr->get_shader_param(scr, sh,
|
||||
PIPE_SHADER_CAP_MAX_SHADER_IMAGES);
|
||||
- assert(maxsam <= PIPE_MAX_SAMPLERS);
|
||||
assert(maxview <= PIPE_MAX_SHADER_SAMPLER_VIEWS);
|
||||
assert(maxssbo <= PIPE_MAX_SHADER_BUFFERS);
|
||||
- assert(maxcb <= PIPE_MAX_CONSTANT_BUFFERS);
|
||||
assert(maximg <= PIPE_MAX_SHADER_IMAGES);
|
||||
if (maxsam > 0) {
|
||||
ctx->base.pipe->bind_sampler_states(ctx->base.pipe, sh, 0, maxsam, zeros);
|
||||
diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
|
||||
index 389a1935cc3..7c7f8ba576b 100644
|
||||
--- a/src/gallium/drivers/virgl/virgl_screen.c
|
||||
+++ b/src/gallium/drivers/virgl/virgl_screen.c
|
||||
@@ -435,7 +435,7 @@ virgl_get_shader_param(struct pipe_screen *screen,
|
||||
return 1;
|
||||
case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
|
||||
return MIN2(vscreen->caps.caps.v2.max_shader_sampler_views,
|
||||
- PIPE_MAX_SHADER_SAMPLER_VIEWS);
|
||||
+ PIPE_MAX_SAMPLERS);
|
||||
case PIPE_SHADER_CAP_INTEGERS:
|
||||
return vscreen->caps.caps.v1.glsl_level >= 130;
|
||||
case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH:
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From 188d7b01037e5a0249e63c2600cf15a288a9ff3f Mon Sep 17 00:00:00 2001
|
||||
From: Wujian Sun <wujian.sun_1@nxp.com>
|
||||
Date: Fri, 19 Apr 2024 18:38:17 +0800
|
||||
Subject: [PATCH] MGS-7673 egl/dri2: fix video showing wrong frame
|
||||
|
||||
Softpipe driver doesn't support EGL_EXT_image_dma_buf_import_modifiers
|
||||
extension.
|
||||
Should not report the extension.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Wujian Sun <wujian.sun_1@nxp.com>
|
||||
---
|
||||
src/egl/drivers/dri2/egl_dri2.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
|
||||
index 992f0e3d46d..6ee209d4b47 100644
|
||||
--- a/src/egl/drivers/dri2/egl_dri2.c
|
||||
+++ b/src/egl/drivers/dri2/egl_dri2.c
|
||||
@@ -942,7 +942,8 @@ dri2_setup_screen(_EGLDisplay *disp)
|
||||
|
||||
#ifdef HAVE_LIBDRM
|
||||
if (dri2_dpy->image->base.version >= 8 &&
|
||||
- dri2_dpy->image->createImageFromDmaBufs) {
|
||||
+ dri2_dpy->image->createImageFromDmaBufs &&
|
||||
+ strcmp("softpipe", pscreen->get_name(pscreen))) {
|
||||
disp->Extensions.EXT_image_dma_buf_import = EGL_TRUE;
|
||||
disp->Extensions.EXT_image_dma_buf_import_modifiers = EGL_TRUE;
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
From c14b65106687b1097f5d50a993707d8a2f99005b Mon Sep 17 00:00:00 2001
|
||||
From: jiajia Qian <jiajia.qian@nxp.com>
|
||||
Date: Tue, 19 Dec 2023 13:23:33 +0800
|
||||
Subject: [PATCH] tests: Fix cl test Include Directories: error : Error(0,8) :
|
||||
Cannot find the header file include_test.h.
|
||||
|
||||
Modified CMakeLists.txt to install include_test.h file in piglit/tests/cl/program/build/ folder.
|
||||
|
||||
Modified the relative path in include-directories.cl from "tests/cl/program/build" to "../lib/piglit/tests/cl/program/build".
|
||||
|
||||
Upstream-Status: Pending [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/853]
|
||||
Signed-off-by: jiajia Qian <jiajia.qian@nxp.com>
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
tests/cl/program/build/include-directories.cl | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: git/tests/cl/program/build/include-directories.cl
|
||||
===================================================================
|
||||
--- git.orig/tests/cl/program/build/include-directories.cl
|
||||
+++ git/tests/cl/program/build/include-directories.cl
|
||||
@@ -2,7 +2,7 @@
|
||||
[config]
|
||||
name: Include Directories
|
||||
clc_version_min: 10
|
||||
-build_options: -I . -I tests/cl/program/build
|
||||
+build_options: -I . -I ../lib/piglit/tests/cl/program/build
|
||||
!*/
|
||||
|
||||
#include "include_test.h"
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From 2673c2adc81a408a4238f786cb2d795a65308ce6 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Guo <eric.guo@nxp.com>
|
||||
Date: Fri, 11 Apr 2025 17:15:40 +0800
|
||||
Subject: [PATCH] cl: Add mutually exclusive memory flags for
|
||||
CL_MEM_KERNEL_READ_AND_WRITE
|
||||
|
||||
Fix cl-api-create-buffer on mali DDK.
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/1004]
|
||||
Signed-off-by: Eric Guo <eric.guo@nxp.com>
|
||||
---
|
||||
tests/util/piglit-util-cl-enum.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/util/piglit-util-cl-enum.c b/tests/util/piglit-util-cl-enum.c
|
||||
index 5d43bc102..f2c185c9c 100644
|
||||
--- a/tests/util/piglit-util-cl-enum.c
|
||||
+++ b/tests/util/piglit-util-cl-enum.c
|
||||
@@ -979,7 +979,7 @@ PIGLIT_CL_DEFINE_ENUM_2(cl_command_queue_properties, 2, 2, 2, 4, 4 /* really? */
|
||||
PIGLIT_CL_DEFINE_ENUM_PTR_2(cl_command_queue_properties);
|
||||
|
||||
|
||||
-PIGLIT_CL_DEFINE_ENUM(cl_mem_flags, cl_mem_flags_mutexes, 5, 5, 8, 8, 8) = {
|
||||
+PIGLIT_CL_DEFINE_ENUM(cl_mem_flags, cl_mem_flags_mutexes, 5, 5, 8, 11, 11) = {
|
||||
CL_MEM_READ_WRITE | CL_MEM_READ_ONLY,
|
||||
CL_MEM_READ_WRITE | CL_MEM_WRITE_ONLY,
|
||||
CL_MEM_READ_ONLY | CL_MEM_WRITE_ONLY,
|
||||
@@ -990,6 +990,11 @@ PIGLIT_CL_DEFINE_ENUM(cl_mem_flags, cl_mem_flags_mutexes, 5, 5, 8, 8, 8) = {
|
||||
CL_MEM_HOST_WRITE_ONLY | CL_MEM_HOST_NO_ACCESS,
|
||||
CL_MEM_HOST_READ_ONLY | CL_MEM_HOST_NO_ACCESS,
|
||||
#endif //CL_VERSION_1_2
|
||||
+#if defined(CL_VERSION_2_0)
|
||||
+ CL_MEM_KERNEL_READ_AND_WRITE | CL_MEM_READ_ONLY,
|
||||
+ CL_MEM_KERNEL_READ_AND_WRITE | CL_MEM_WRITE_ONLY,
|
||||
+ CL_MEM_KERNEL_READ_AND_WRITE | CL_MEM_READ_WRITE,
|
||||
+#endif //CL_VERSION_2_0
|
||||
};
|
||||
PIGLIT_CL_DEFINE_ENUM_PTR(cl_mem_flags, cl_mem_flags_mutexes);
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,6 +1,23 @@
|
|||
PACKAGECONFIG:remove:imxgpu = "glx"
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
PACKAGECONFIG:append:mx8-nxp-bsp = " opencl"
|
||||
PACKAGECONFIG:append:mx9-nxp-bsp = " opencl"
|
||||
SRC_URI += "file://0001-tests-Fix-cl-test-Include-Directories-error-Error-0-.patch \
|
||||
file://0002-cl-Add-mutually-exclusive-memory-flags-for-CL_MEM_KE.patch"
|
||||
|
||||
PACKAGECONFIG:append = " ${PACKAGECONFIG_APPEND}"
|
||||
PACKAGECONFIG:remove = " ${PACKAGECONFIG_REMOVE}"
|
||||
|
||||
PACKAGECONFIG_APPEND ?= " \
|
||||
gbm \
|
||||
opencl \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}"
|
||||
PACKAGECONFIG_APPEND:imxgpu:mx6-nxp-bsp = ""
|
||||
PACKAGECONFIG_APPEND:imxgpu:mx7-nxp-bsp = ""
|
||||
|
||||
PACKAGECONFIG_REMOVE ?= ""
|
||||
PACKAGECONFIG_REMOVE:imxgpu = "glx"
|
||||
PACKAGECONFIG_REMOVE:imxgpu:mx6-nxp-bsp = "glx x11"
|
||||
PACKAGECONFIG_REMOVE:imxgpu:mx7-nxp-bsp = "glx x11"
|
||||
|
||||
PACKAGECONFIG[gbm] = "-DPIGLIT_USE_GBM=1,-DPIGLIT_USE_GBM=0,virtual/libgbm"
|
||||
|
||||
CFLAGS:append:imxgpu:toolchain-clang = " -Wno-error=int-conversion"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 3448c245b15928aa5a5a3695d9271fb201eb2e3b Mon Sep 17 00:00:00 2001
|
||||
From 91aff12a127428ff558d57d93b91b0b909321c35 Mon Sep 17 00:00:00 2001
|
||||
From: Yuan Tian <yuan.tian@nxp.com>
|
||||
Date: Sat, 27 Apr 2024 06:06:54 +0800
|
||||
Subject: [PATCH] LF-11869 change mali wsi layer activating order
|
||||
|
|
@ -11,18 +11,18 @@ Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
|
|||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/loader/loader.c b/loader/loader.c
|
||||
index e646b28b4..55912c178 100644
|
||||
index 9064cd633..5b00870a4 100644
|
||||
--- a/loader/loader.c
|
||||
+++ b/loader/loader.c
|
||||
@@ -2906,6 +2906,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
|
||||
@@ -3034,6 +3034,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
|
||||
#if !defined(_WIN32)
|
||||
char temp_path[2048];
|
||||
#endif
|
||||
+ bool has_wsi_layer = false;
|
||||
|
||||
// Now, parse the paths
|
||||
next_file = search_path;
|
||||
@@ -2965,6 +2966,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
|
||||
char *next_file = search_path;
|
||||
@@ -3100,6 +3101,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
|
||||
name = full_path;
|
||||
|
||||
VkResult local_res;
|
||||
|
|
@ -33,7 +33,7 @@ index e646b28b4..55912c178 100644
|
|||
local_res = add_if_manifest_file(inst, name, out_files);
|
||||
|
||||
// Incomplete means this was not a valid data file.
|
||||
@@ -2975,6 +2980,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
|
||||
@@ -3110,6 +3115,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -47,6 +47,3 @@ index e646b28b4..55912c178 100644
|
|||
loader_closedir(inst, dir_stream);
|
||||
if (vk_result != VK_SUCCESS) {
|
||||
goto out;
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
From 3448c245b15928aa5a5a3695d9271fb201eb2e3b Mon Sep 17 00:00:00 2001
|
||||
From: Yuan Tian <yuan.tian@nxp.com>
|
||||
Date: Sat, 27 Apr 2024 06:06:54 +0800
|
||||
Subject: [PATCH] LF-11869 change mali wsi layer activating order
|
||||
|
||||
Upstream-Status: Inappropriate [i.MX specific]
|
||||
|
||||
Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
|
||||
---
|
||||
loader/loader.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/loader/loader.c b/loader/loader.c
|
||||
index e646b28b4..55912c178 100644
|
||||
--- a/loader/loader.c
|
||||
+++ b/loader/loader.c
|
||||
@@ -2906,6 +2906,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
|
||||
#if !defined(_WIN32)
|
||||
char temp_path[2048];
|
||||
#endif
|
||||
+ bool has_wsi_layer = false;
|
||||
|
||||
// Now, parse the paths
|
||||
next_file = search_path;
|
||||
@@ -2965,6 +2966,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
|
||||
name = full_path;
|
||||
|
||||
VkResult local_res;
|
||||
+ if(!strcmp(name,"/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json")) {
|
||||
+ has_wsi_layer = true;
|
||||
+ continue;
|
||||
+ }
|
||||
local_res = add_if_manifest_file(inst, name, out_files);
|
||||
|
||||
// Incomplete means this was not a valid data file.
|
||||
@@ -2975,6 +2980,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
|
||||
break;
|
||||
}
|
||||
}
|
||||
+
|
||||
+ if(has_wsi_layer) {
|
||||
+ name = "/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json";
|
||||
+ vk_result = add_if_manifest_file(inst, name, out_files);
|
||||
+ has_wsi_layer = false;
|
||||
+ }
|
||||
+
|
||||
loader_closedir(inst, dir_stream);
|
||||
if (vk_result != VK_SUCCESS) {
|
||||
goto out;
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -4,10 +4,12 @@ SRC_URI:append:imx-nxp-bsp = " \
|
|||
file://0001-LF-11869-change-mali-wsi-layer-activating-order.patch \
|
||||
"
|
||||
|
||||
PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
|
||||
|
||||
# libvulkan.so is loaded dynamically, so put it in the main package
|
||||
SOLIBS = ".so*"
|
||||
FILES_SOLIBSDEV = ""
|
||||
INSANE_SKIP:${PN} += "dev-so"
|
||||
SOLIBS:imx-nxp-bsp = ".so*"
|
||||
FILES_SOLIBSDEV:imx-nxp-bsp = ""
|
||||
INSANE_SKIP:${PN}:imx-nxp-bsp += "dev-so"
|
||||
|
||||
# Override default mesa drivers with i.MX GPU drivers
|
||||
RRECOMMENDS:${PN}:imxviv = "libvulkan-imx"
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
From ada74fb0ca3099f33d173eb664bd7e42025a3277 Mon Sep 17 00:00:00 2001
|
||||
From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
|
||||
Date: Mon, 9 Dec 2024 09:15:11 +0800
|
||||
Subject: [PATCH 1/2] MGS-6801 [#ccc] vkmark on wayland
|
||||
|
||||
Extend the wayland surface properties with VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR
|
||||
|
||||
Upstream-Status: Inappropriate [i.MX-specific]
|
||||
Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
|
||||
Signed-off-by: Jiyu Yang <jiyu.yang@nxp.com>
|
||||
---
|
||||
wsi/wayland/surface_properties.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/wsi/wayland/surface_properties.cpp b/wsi/wayland/surface_properties.cpp
|
||||
index e6435b9..bc1a737 100644
|
||||
--- a/wsi/wayland/surface_properties.cpp
|
||||
+++ b/wsi/wayland/surface_properties.cpp
|
||||
@@ -89,7 +89,7 @@ VkResult surface_properties::get_surface_capabilities(VkPhysicalDevice physical_
|
||||
|
||||
/* Composite alpha */
|
||||
pSurfaceCapabilities->supportedCompositeAlpha = static_cast<VkCompositeAlphaFlagBitsKHR>(
|
||||
- VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR | VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR);
|
||||
+ VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR | VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR);
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
--
|
||||
2.37.1
|
||||
|
||||
|
|
@ -0,0 +1,243 @@
|
|||
From 4293d8835eaa45168c070793eefd8867c6ec7605 Mon Sep 17 00:00:00 2001
|
||||
From: Yuan Tian <yuan.tian@nxp.com>
|
||||
Date: Thu, 27 Jul 2023 18:25:16 +0800
|
||||
Subject: [PATCH 2/2] MGS-6823 [#nxp] Add support of
|
||||
VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR feature
|
||||
|
||||
Mali vulkan driver doesn't support VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR. It caused unwanted blending effect in many vulkan cases.
|
||||
Add support of this feature to solve the problem.
|
||||
|
||||
Upstream-Status: Inappropriate [i.MX-specific]
|
||||
Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
|
||||
Signed-off-by: Jiyu Yang <jiyu.yang@nxp.com>
|
||||
---
|
||||
wsi/wayland/swapchain.cpp | 161 ++++++++++++++++++++++++++++++++++++++
|
||||
wsi/wayland/swapchain.hpp | 9 +++
|
||||
2 files changed, 170 insertions(+)
|
||||
|
||||
Index: git/wsi/wayland/swapchain.cpp
|
||||
===================================================================
|
||||
--- git.orig/wsi/wayland/swapchain.cpp
|
||||
+++ git/wsi/wayland/swapchain.cpp
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <cstdio>
|
||||
#include <climits>
|
||||
#include <functional>
|
||||
+#include <poll.h>
|
||||
|
||||
#include "util/drm/drm_utils.hpp"
|
||||
#include "util/log.hpp"
|
||||
@@ -72,12 +73,152 @@ swapchain::~swapchain()
|
||||
wsialloc_delete(m_wsi_allocator);
|
||||
}
|
||||
m_wsi_allocator = nullptr;
|
||||
+ if (wlc.opaque_region)
|
||||
+ {
|
||||
+ wl_compositor_destroy(wlc.wl_compositor);
|
||||
+ wl_registry_destroy(wlc.registry);
|
||||
+ wl_region_destroy(wlc.opaque_region);
|
||||
+ wlc = {0};
|
||||
+ }
|
||||
if (m_buffer_queue != nullptr)
|
||||
{
|
||||
wl_event_queue_destroy(m_buffer_queue);
|
||||
}
|
||||
}
|
||||
|
||||
+static inline int
|
||||
+poll_event(struct wl_display *wl_dpy, short int events, int timeout)
|
||||
+{
|
||||
+ int ret;
|
||||
+ struct pollfd pfd[1];
|
||||
+
|
||||
+ pfd[0].fd = wl_display_get_fd(wl_dpy);
|
||||
+ pfd[0].events = events;
|
||||
+
|
||||
+ do
|
||||
+ {
|
||||
+ ret = poll(pfd, 1, timeout);
|
||||
+ }
|
||||
+ while (ret == -1 && errno == EINTR);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int
|
||||
+dispatch_queue_op(struct wl_display *wl_dpy,
|
||||
+ struct wl_event_queue *wl_queue, int timeout)
|
||||
+{
|
||||
+ int ret;
|
||||
+
|
||||
+ if (wl_display_prepare_read_queue(wl_dpy, wl_queue) == -1)
|
||||
+ {
|
||||
+ return wl_display_dispatch_queue_pending(wl_dpy, wl_queue);
|
||||
+ }
|
||||
+
|
||||
+ for (;;)
|
||||
+ {
|
||||
+ ret = wl_display_flush(wl_dpy);
|
||||
+
|
||||
+ if (ret != -1 || errno != EAGAIN)
|
||||
+ break;
|
||||
+
|
||||
+ if (poll_event(wl_dpy, POLLOUT, -1) == -1)
|
||||
+ {
|
||||
+ wl_display_cancel_read(wl_dpy);
|
||||
+ return -1;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Don't stop if flushing hits an EPIPE; continue so we can read any
|
||||
+ * protocol error that may have triggered it. */
|
||||
+ if (ret < 0 && errno != EPIPE)
|
||||
+ {
|
||||
+ wl_display_cancel_read(wl_dpy);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ ret = poll_event(wl_dpy, POLLIN, timeout);
|
||||
+
|
||||
+ /* cancel read when on error or timeout. */
|
||||
+ if (ret == -1 || ret == 0)
|
||||
+ {
|
||||
+ wl_display_cancel_read(wl_dpy);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ if (wl_display_read_events(wl_dpy) == -1)
|
||||
+ return -1;
|
||||
+
|
||||
+ return wl_display_dispatch_queue_pending(wl_dpy, wl_queue);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
|
||||
+{
|
||||
+ int *done = (int *)data;
|
||||
+
|
||||
+ *done = 1;
|
||||
+ wl_callback_destroy(callback);
|
||||
+}
|
||||
+
|
||||
+static const struct wl_callback_listener sync_listener = {
|
||||
+ sync_callback
|
||||
+};
|
||||
+
|
||||
+static int
|
||||
+roundtrip_queue(struct wl_display *wl_dpy, struct wl_event_queue *wl_queue)
|
||||
+{
|
||||
+ struct wl_callback *callback;
|
||||
+ int done, ret = 0;
|
||||
+
|
||||
+ done = 0;
|
||||
+
|
||||
+ /*
|
||||
+ * This is to block read & dispatch events in other threads, so that the
|
||||
+ * callback is with correct queue and listener when 'done' event.
|
||||
+ */
|
||||
+ while (wl_display_prepare_read_queue(wl_dpy, wl_queue) == -1)
|
||||
+ wl_display_dispatch_queue_pending(wl_dpy, wl_queue);
|
||||
+
|
||||
+ callback = wl_display_sync(wl_dpy);
|
||||
+
|
||||
+ if (callback == NULL)
|
||||
+ {
|
||||
+ wl_display_cancel_read(wl_dpy);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ wl_proxy_set_queue((struct wl_proxy *) callback, wl_queue);
|
||||
+ wl_callback_add_listener(callback, &sync_listener, &done);
|
||||
+
|
||||
+ wl_display_cancel_read(wl_dpy);
|
||||
+
|
||||
+ while (!done && ret >= 0)
|
||||
+ ret = dispatch_queue_op(wl_dpy, wl_queue, 5);
|
||||
+
|
||||
+ if (ret == -1 && !done)
|
||||
+ wl_callback_destroy(callback);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+registry_handle_global(void *data, struct wl_registry *registry, uint32_t name,
|
||||
+ const char *interface, uint32_t version)
|
||||
+{
|
||||
+ wl_context *pwlc = (wl_context *)data;
|
||||
+
|
||||
+ if(!pwlc->wl_compositor)
|
||||
+ {
|
||||
+ pwlc->wl_compositor = (wl_compositor *)wl_registry_bind(registry, name, &wl_compositor_interface, 1);
|
||||
+ wl_proxy_set_queue((struct wl_proxy *)pwlc->wl_compositor, pwlc->wl_queue);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static const struct wl_registry_listener registry_listener = {
|
||||
+ registry_handle_global
|
||||
+};
|
||||
+
|
||||
VkResult swapchain::init_platform(VkDevice device, const VkSwapchainCreateInfoKHR *swapchain_create_info,
|
||||
bool &use_presentation_thread)
|
||||
{
|
||||
@@ -124,6 +265,21 @@ VkResult swapchain::init_platform(VkDevi
|
||||
use_presentation_thread =
|
||||
WAYLAND_FIFO_PRESENTATION_THREAD_ENABLED && (m_present_mode != VK_PRESENT_MODE_MAILBOX_KHR);
|
||||
|
||||
+ if (swapchain_create_info->compositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)
|
||||
+ {
|
||||
+ wlc.wl_queue = m_buffer_queue;
|
||||
+ wlc.registry = wl_display_get_registry(m_display);
|
||||
+ wl_proxy_set_queue((struct wl_proxy *)(wlc.registry), m_buffer_queue);
|
||||
+ wl_registry_add_listener(wlc.registry, ®istry_listener, &wlc);
|
||||
+
|
||||
+ roundtrip_queue(m_display, m_buffer_queue);
|
||||
+
|
||||
+ wlc.opaque_region = wl_compositor_create_region(wlc.wl_compositor);
|
||||
+ wl_proxy_set_queue((struct wl_proxy *)(wlc.opaque_region), m_buffer_queue);
|
||||
+
|
||||
+ wl_region_add(wlc.opaque_region, 0, 0, swapchain_create_info->imageExtent.width, swapchain_create_info->imageExtent.height);
|
||||
+ }
|
||||
+
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -494,6 +650,11 @@ void swapchain::present_image(const pend
|
||||
set_error_state(VK_ERROR_SURFACE_LOST_KHR);
|
||||
}
|
||||
|
||||
+ if (wlc.opaque_region)
|
||||
+ {
|
||||
+ wl_surface_set_opaque_region(m_surface, wlc.opaque_region);
|
||||
+ }
|
||||
+
|
||||
wl_surface_attach(m_surface, image_data->buffer, 0, 0);
|
||||
|
||||
auto present_sync_fd = image_data->present_fence.export_sync_fd();
|
||||
Index: git/wsi/wayland/swapchain.hpp
|
||||
===================================================================
|
||||
--- git.orig/wsi/wayland/swapchain.hpp
|
||||
+++ git/wsi/wayland/swapchain.hpp
|
||||
@@ -78,6 +78,14 @@ struct image_creation_parameters
|
||||
}
|
||||
};
|
||||
|
||||
+struct wl_context
|
||||
+{
|
||||
+ struct wl_event_queue *wl_queue;
|
||||
+ struct wl_compositor *wl_compositor;
|
||||
+ struct wl_registry *registry;
|
||||
+ struct wl_region *opaque_region;
|
||||
+};
|
||||
+
|
||||
class swapchain : public wsi::swapchain_base
|
||||
{
|
||||
public:
|
||||
@@ -190,6 +198,7 @@ private:
|
||||
|
||||
struct wl_display *m_display;
|
||||
struct wl_surface *m_surface;
|
||||
+ struct wl_context wlc = {0};
|
||||
/** Raw pointer to the WSI Surface that this swapchain was created from. The Vulkan specification ensures that the
|
||||
* surface is valid until swapchain is destroyed. */
|
||||
surface *m_wsi_surface;
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
From 0c4ed8178a25135ced9df8c8a8909e2882bfe869 Mon Sep 17 00:00:00 2001
|
||||
From: Maged Elnaggar <maged.elnaggar@arm.com>
|
||||
Date: Tue, 17 Jun 2025 10:33:44 +0000
|
||||
Subject: [PATCH] Update minimum version of CMake
|
||||
|
||||
Set CMake minimum required version range to 3.4.3...4.0
|
||||
to silence compatibility errors in CMake 4.0
|
||||
by explicitly opting into all policies up to 4.0
|
||||
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/commit/1eafebc56a7f735cd4e8298956d596c64ac9f681]
|
||||
Signed-off-by: Maged Elnaggar <maged.elnaggar@arm.com>
|
||||
Change-Id: I2e0527dde4e764e9c17f519fc0ddd3c0e382fa31
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4dc800c..b91cd54 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,7 +20,7 @@
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
-cmake_minimum_required(VERSION 3.4.3)
|
||||
+cmake_minimum_required(VERSION 3.4.3...4.0)
|
||||
project(VkLayer_window_system_integration)
|
||||
|
||||
find_package(PkgConfig REQUIRED)
|
||||
--
|
||||
2.34.1
|
||||
|
||||
54
recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
Normal file
54
recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
DESCRIPTION = "Vulkan Window System Integration Layer"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=c2e771b72d60a13d2de384cb49055d00"
|
||||
DEPENDS = "libdrm vulkan-loader"
|
||||
|
||||
PV = "0.0+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://gitlab.freedesktop.org/mesa/vulkan-wsi-layer.git;protocol=https;branch=main \
|
||||
file://0001-MGS-6801-ccc-vkmark-on-wayland.patch \
|
||||
file://0002-MGS-6823-nxp-Add-support-of-VK_COMPOSITE_ALPHA_OPAQU.patch \
|
||||
file://0003-Update-minimum-version-of-CMake.patch"
|
||||
SRCREV = "cb1a50cf7e640ad7306e673131ded98c0f133628"
|
||||
|
||||
inherit cmake pkgconfig
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'headless', d)}"
|
||||
|
||||
PACKAGECONFIG[headless] = " \
|
||||
-DBUILD_WSI_HEADLESS=1, \
|
||||
-DBUILD_WSI_HEADLESS=0, \
|
||||
,,, \
|
||||
wayland"
|
||||
PACKAGECONFIG[wayland] = " \
|
||||
-DBUILD_WSI_WAYLAND=1 -DENABLE_WAYLAND_FIFO_PRESENTATION_THREAD=1 -DSELECT_EXTERNAL_ALLOCATOR=dma_buf_heaps, \
|
||||
-DBUILD_WSI_WAYLAND=0, \
|
||||
wayland wayland-native wayland-protocols,,, \
|
||||
headless"
|
||||
|
||||
EXTRA_OECMAKE = " \
|
||||
-DBUILD_WSI_DISPLAY=0 \
|
||||
-DBUILD_WSI_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN=1 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
|
||||
-DENABLE_INSTRUMENTATION=1 \
|
||||
-DKERNEL_HEADER_DIR=${KERNEL_HEADER_DIR} \
|
||||
-DVULKAN_WSI_LAYER_EXPERIMENTAL=0 "
|
||||
|
||||
# The KERNEL_HEADER_DIR setting is required by the CMake apparently
|
||||
# in order to find the DRM headers. However, the Yocto build provides
|
||||
# the DRM headers via a separate recipe libdrm in order to avoid the
|
||||
# kernel dependency. The CMake fails if the variable is not defined,
|
||||
# so set it to an invalid value in case the build ever actually needs
|
||||
# the kernel headers for something else.
|
||||
KERNEL_HEADER_DIR = "KERNEL_HEADER_DIR_NOT_PROVIDED_BY_YOCTO"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${sysconfdir}/vulkan/implicit_layer.d
|
||||
install -m 0755 ${B}/libVkLayer_window_system_integration.so ${D}${sysconfdir}/vulkan/implicit_layer.d/
|
||||
install -m 0644 ${B}/VkLayer_window_system_integration.json ${D}${sysconfdir}/vulkan/implicit_layer.d
|
||||
}
|
||||
|
||||
# Adjust packaging variables for unversioned library
|
||||
SOLIBS = ".so"
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
|
@ -11,12 +11,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7b12b6702da38ca028ace54aae3d484 \
|
|||
|
||||
SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH}"
|
||||
WAYLAND_PROTOCOLS_SRC ?= "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https"
|
||||
SRCBRANCH = "wayland-protocols-imx-${@oe.utils.trim_version("${PV}", 2)}"
|
||||
SRCREV = "831a5389062e56dcb1aac4a5419e55e3002aafaf"
|
||||
SRCBRANCH = "wayland-protocols-imx-1.41"
|
||||
SRCREV = "7213a4e09837c77112bce2d241491600e00dd095"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
|
||||
UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags"
|
||||
UPSTREAM_CHECK_REGEX = "releases/(?P<pver>.+)"
|
||||
|
||||
DEPENDS += "wayland-native"
|
||||
|
||||
# NOTE: For i.MX drop allarch since the recipe is SOCARCH
|
||||
#inherit meson pkgconfig allarch
|
||||
|
|
@ -24,9 +27,6 @@ inherit meson pkgconfig
|
|||
|
||||
EXTRA_OEMESON += "-Dtests=false"
|
||||
|
||||
PACKAGES = "${PN}"
|
||||
FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
|
||||
|
|
@ -68,7 +68,7 @@ PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false"
|
|||
# Weston on framebuffer
|
||||
PACKAGECONFIG[fbdev] = "-Ddeprecated-backend-fbdev=true,-Ddeprecated-backend-fbdev=false,udev mtdev"
|
||||
# Weston on RDP
|
||||
PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp"
|
||||
PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp"
|
||||
# weston-launch
|
||||
PACKAGECONFIG[launch] = "-Ddeprecated-weston-launch=true,-Ddeprecated-weston-launch=false,drm"
|
||||
# VA-API desktop recorder
|
||||
|
|
@ -144,7 +144,7 @@ RDEPENDS:${PN}-xwayland += "xwayland"
|
|||
|
||||
RDEPENDS:${PN} += "xkeyboard-config"
|
||||
RRECOMMENDS:${PN} = "weston-init liberation-fonts"
|
||||
RRECOMMENDS:${PN}-dev += "wayland-protocols"
|
||||
RDEPENDS:${PN}-dev += "wayland-protocols-dev"
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
GROUPADD_PARAM:${PN} = "--system weston-launch"
|
||||
|
|
@ -206,6 +206,6 @@ EXTRA_OEMESON += "-Ddeprecated-wl-shell=true"
|
|||
LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
|
||||
COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)"
|
||||
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
|
||||
|
||||
########### End of i.MX overrides #########
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# recipe. The second section customizes the recipe for i.MX.
|
||||
|
||||
########### OE-core copy ##################
|
||||
# Upstream hash: 23271a1f908a223b4eb56d6034cbb1ac23da14fe
|
||||
# Upstream hash: 8996690a79ac42a1dee6d041eeb1c1fe29fdac84
|
||||
|
||||
SUMMARY = "Weston, a Wayland compositor"
|
||||
DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
|
||||
|
|
@ -14,14 +14,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
|
|||
"
|
||||
|
||||
SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
|
||||
file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \
|
||||
file://weston.png \
|
||||
file://weston.desktop \
|
||||
file://xwayland.weston-start \
|
||||
file://systemd-notify.weston-start \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093"
|
||||
SRC_URI[sha256sum] = "a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags"
|
||||
UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
|
||||
|
|
@ -33,13 +32,13 @@ inherit meson pkgconfig useradd
|
|||
require ${THISDIR}/required-distro-features.inc
|
||||
|
||||
DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
|
||||
DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
|
||||
DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native libdisplay-info"
|
||||
|
||||
LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
|
||||
|
||||
WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
|
||||
|
||||
EXTRA_OEMESON += "-Dpipewire=false"
|
||||
EXTRA_OEMESON += "-Dpipewire=false -Dtests=false"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
|
||||
|
|
@ -80,9 +79,7 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
|
|||
# Weston with systemd support
|
||||
PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus"
|
||||
# Weston with Xwayland support (requires X11 and Wayland)
|
||||
PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland"
|
||||
# colord CMS support
|
||||
PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord"
|
||||
PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xwayland"
|
||||
# Clients support
|
||||
PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
|
||||
# Virtual remote output with GStreamer on DRM backend
|
||||
|
|
@ -147,7 +144,7 @@ RDEPENDS:${PN}-xwayland += "xwayland"
|
|||
|
||||
RDEPENDS:${PN} += "xkeyboard-config"
|
||||
RRECOMMENDS:${PN} = "weston-init liberation-fonts"
|
||||
RRECOMMENDS:${PN}-dev += "wayland-protocols"
|
||||
RDEPENDS:${PN}-dev += "wayland-protocols-dev"
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
GROUPADD_PARAM:${PN} = "--system weston-launch"
|
||||
|
|
@ -162,27 +159,21 @@ LIC_FILES_CHKSUM += "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
|
|||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
DEPENDS:append = " libdisplay-info"
|
||||
|
||||
SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} "
|
||||
WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
|
||||
SRCBRANCH = "weston-imx-14.0.1"
|
||||
SRCREV = "0fd5d3ab75346e525b565039a7b8bf5d9008be78"
|
||||
S = "${WORKDIR}/git"
|
||||
SRCBRANCH = "weston-imx-14.0.2"
|
||||
SRCREV = "c267ba8e6eed3a824e042a200bcc1b4c370ba88f"
|
||||
|
||||
SRC_URI:remove = "file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch"
|
||||
|
||||
PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
|
||||
PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}"
|
||||
PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
|
||||
|
||||
PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}"
|
||||
PACKAGECONFIG_G2D ??= ""
|
||||
PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d"
|
||||
PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
|
||||
|
||||
# Remove no longer supported colord
|
||||
PACKAGECONFIG[colord] = ""
|
||||
PACKAGECONFIG_G2D ??= ""
|
||||
PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d"
|
||||
PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
|
||||
PACKAGECONFIG_G2D:mx943-nxp-bsp ??= "imxg2d"
|
||||
|
||||
# Weston with i.MX G2D renderer
|
||||
PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# Copyright (C) 2015-2016 Freescale Semiconductor
|
||||
# Copyright (C) 2017-2024 NXP
|
||||
# Copyright (C) 2017-2025 NXP
|
||||
|
||||
SUMMARY = "Kernel loadable module for Vivante GPU"
|
||||
DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \
|
||||
|
|
@ -7,12 +7,12 @@ allowing flexibility to use a newer graphics release with an older kernel."
|
|||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
|
||||
|
||||
SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \
|
||||
SRC_URI = "${LINUX_IMX_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=${S}/src \
|
||||
file://Add-makefile.patch"
|
||||
KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
|
||||
LINUX_IMX_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
|
||||
SRCBRANCH = "lf-6.12.y"
|
||||
LOCALVERSION = "-6.12.3-1.0.0"
|
||||
SRCREV = "d8c9f00d41b313a1ac122530524a62604c6871c9"
|
||||
LOCALVERSION = "-6.12.20-2.0.0"
|
||||
SRCREV = "d53b3fa8a69bef5ead825e81aa62dbdd08e1409c"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (C) 2020-2023 NXP
|
||||
# Copyright (C) 2020-2025 NXP
|
||||
|
||||
DESCRIPTION = "Kernel loadable module for ISP"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
|
|
@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
|
|||
|
||||
SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
|
||||
ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
|
||||
SRCBRANCH = "lf-6.12.y_1.0.0"
|
||||
SRCREV = "78d717bb22819df9d988ef1b4e3cca1acf61095d"
|
||||
SRCBRANCH = "lf-6.12.y_2.0.0"
|
||||
SRCREV = "dc686fbb8b5b2f4cbc58d83756f65ad970b03ac2"
|
||||
|
||||
|
||||
S = "${WORKDIR}/git/vvcam/v4l2"
|
||||
|
||||
|
|
@ -8,13 +8,13 @@ RREPLACES:${PN} = "kernel-module-nxp89xx"
|
|||
RPROVIDES:${PN} = "kernel-module-nxp89xx"
|
||||
RCONFLICTS:${PN} = "kernel-module-nxp89xx"
|
||||
|
||||
SRCBRANCH = "lf-6.12.3_1.0.0"
|
||||
SRCBRANCH = "lf-6.12.20_2.0.0"
|
||||
MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
|
||||
SRC_URI = " \
|
||||
${MRVL_SRC};branch=${SRCBRANCH} \
|
||||
file://mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch \
|
||||
"
|
||||
SRCREV = "0396cfb38ad73a3d587cd0f8c139b47801e70891"
|
||||
SRCREV = "7a8beaa1605cb0870dc7ba3312c76df91cb0d6cf"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,10 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
|
|||
# conflicts, prioritizing NXP BSP source code as the latest vendor updates.
|
||||
# Additional commits may exist to better acommodate yocto builds.
|
||||
#
|
||||
# $ git log --oneline --no-merges v6.12.3.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y
|
||||
# $ git log --oneline --no-merges v6.12.34.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y
|
||||
# - 8d94e52076a1 Revert "firmware: arm_scmi: Fix i.MX build dependency"
|
||||
# - adefe4ecd9c6 Revert "PCI: imx6: Fix suspend/resume support on i.MX6QDL"
|
||||
# - 2837cecae149 imx8mp-olimex.dts: CSI GPIO pins
|
||||
# - 29efe53139ac hwrng: optee: support generic crypto
|
||||
# - 7f80ce9b7c82 arm64: dts: imx8mq: drop cpu-idle-states
|
||||
# - 5e3b6ecf85c4 of: enable using OF_DYNAMIC without OF_UNITTEST
|
||||
|
|
@ -68,14 +71,14 @@ require linux-imx.inc
|
|||
|
||||
KBRANCH = "6.12-1.0.x-imx"
|
||||
SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
|
||||
SRCREV = "29efe53139acb64d96bfcc119cd10d10c552801b"
|
||||
SRCREV = "c63da44a120c9ad720877a74f0c94e2d9b08cab1"
|
||||
|
||||
# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
|
||||
# required by kernel-yocto.bbclass.
|
||||
#
|
||||
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
|
||||
# should be updated once patchlevel is merged.
|
||||
LINUX_VERSION = "6.12.3"
|
||||
LINUX_VERSION = "6.12.34"
|
||||
|
||||
KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
|
||||
KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=
|
|||
#
|
||||
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
|
||||
# should be updated once patchlevel is merged.
|
||||
LINUX_VERSION = "6.1.72"
|
||||
LINUX_VERSION = "6.1.111"
|
||||
|
||||
KBRANCH = "6.1.x+fslc"
|
||||
SRCREV = "b80c9dede70132da3ae7feb949fe0803aad3db24"
|
||||
SRCREV = "195925841506cd58552d73ebabadd08d6016e4c6"
|
||||
|
||||
KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
|
||||
KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=
|
|||
#
|
||||
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
|
||||
# should be updated once patchlevel is merged.
|
||||
LINUX_VERSION = "6.6.50"
|
||||
LINUX_VERSION = "6.6.52"
|
||||
|
||||
KBRANCH = "6.6.x+fslc"
|
||||
SRCREV = "2473dfed9007471b503efe1f7de74d63eaf4c699"
|
||||
SRCREV = "3768fbd9dd8e0da9e7a24366b6a65a7f8ca25986"
|
||||
|
||||
KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
|
||||
KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
|
||||
|
|
|
|||
|
|
@ -24,12 +24,12 @@ DEPENDS += " \
|
|||
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
|
||||
# should be updated once patchlevel is merged.
|
||||
#
|
||||
# Linux kernel stable 6.12.28 changelog:
|
||||
# https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.28
|
||||
LINUX_VERSION = "6.12.28"
|
||||
# Linux kernel stable 6.12.34 changelog:
|
||||
# https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.34
|
||||
LINUX_VERSION = "6.12.34"
|
||||
|
||||
KBRANCH = "6.12.x+fslc"
|
||||
SRCREV = "7a7717289cd3915e484b02c02557de380352b030"
|
||||
SRCREV = "e92f5b7050c74e8052f071fd2f1d233d9a4b2f30"
|
||||
|
||||
KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
|
||||
KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright 2017-2024 NXP
|
||||
# Copyright 2017-2025 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
SUMMARY = "Installs i.MX-specific kernel headers"
|
||||
|
|
@ -13,7 +13,7 @@ SRC_URI = " \
|
|||
"
|
||||
SRCBRANCH = "lf-6.12.y"
|
||||
LOCALVERSION = "-lts-${SRCBRANCH}"
|
||||
SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"
|
||||
SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Copyright 2013-2016 (C) Freescale Semiconductor
|
||||
# Copyright 2017-2024 (C) NXP
|
||||
# Copyright 2017-2025 (C) NXP
|
||||
# Copyright 2018 (C) O.S. Systems Software LTDA.
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
#
|
||||
|
|
@ -13,15 +13,15 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU
|
|||
require recipes-kernel/linux/linux-imx.inc
|
||||
|
||||
SRCBRANCH = "lf-6.12.y"
|
||||
LOCALVERSION = "-6.12.3-1.1.0"
|
||||
SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"
|
||||
LOCALVERSION = "-6.12.20-2.0.0"
|
||||
SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
|
||||
|
||||
# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
|
||||
# required by kernel-yocto.bbclass.
|
||||
#
|
||||
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
|
||||
# should be updated once patchlevel is merged.
|
||||
LINUX_VERSION = "6.12.3"
|
||||
LINUX_VERSION = "6.12.20"
|
||||
|
||||
KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
|
||||
KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
inherit kernel qoriq_build_64bit_kernel siteinfo
|
||||
inherit fsl-kernel-localversion
|
||||
inherit fsl-kernel-localversion kernel-yocto
|
||||
|
||||
SUMMARY = "Linux Kernel for NXP QorIQ platforms"
|
||||
SECTION = "kernel"
|
||||
|
|
@ -8,8 +8,9 @@ LICENSE = "GPL-2.0-only"
|
|||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS:append = " libgcc"
|
||||
DEPENDS:append = " libgcc coreutils-native"
|
||||
# not put Images into /boot of rootfs, install kernel-image if needed
|
||||
RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
|
||||
RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
|
||||
|
||||
KERNEL_CC:append = " ${TOOLCHAIN_OPTIONS}"
|
||||
KERNEL_LD:append = " ${TOOLCHAIN_OPTIONS}"
|
||||
|
|
@ -23,12 +24,16 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
|
|||
|
||||
SCMVERSION ?= "y"
|
||||
LOCALVERSION = ""
|
||||
|
||||
DELTA_KERNEL_DEFCONFIG ?= ""
|
||||
DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm64 = "lsdk.config "
|
||||
DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm = "multi_v7_lpae.config lsdk.config "
|
||||
|
||||
do_merge_delta_config[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot bison-native:do_populate_sysroot"
|
||||
do_merge_delta_config[depends] += "virtual/cross-cc:do_populate_sysroot bison-native:do_populate_sysroot"
|
||||
do_merge_delta_config[dirs] = "${B}"
|
||||
do_kernel_metadata[noexec] = "1"
|
||||
do_kernel_configme[noexec] = "1"
|
||||
do_kernel_configcheck[noexec] = "1"
|
||||
|
||||
do_merge_delta_config() {
|
||||
# create config with make config
|
||||
|
|
@ -52,7 +57,9 @@ do_merge_delta_config() {
|
|||
done
|
||||
cp .config ${WORKDIR}/defconfig
|
||||
}
|
||||
|
||||
addtask merge_delta_config before do_kernel_localversion after do_patch
|
||||
|
||||
FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/zImage*"
|
||||
INSANE_SKIP:${PN}-src += " buildpaths"
|
||||
COMPATIBLE_MACHINE = "(qoriq)"
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
|
||||
|
||||
LINUX_VERSION = "5.10.52"
|
||||
|
||||
SRC_URI = "git://github.com/nxp-qoriq/linux;protocol=https;nobranch=1"
|
||||
SRCREV = "a11753a89ec610768301d4070e10b8bd60fde8cd"
|
||||
|
||||
require recipes-kernel/linux/linux-qoriq.inc
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user