diff options
405 files changed, 10053 insertions, 7412 deletions
@@ -1,9 +1,8 @@ -LA_OPT_NXP_Software_License v27 July 2021 - +LA_OPT_NXP_Software_License v39 August 2022 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 -accept the terms of the Agreement and you acknowledge that you have the +accept the terms of the Agreement, and you acknowledge that you have the authority, for yourself or on behalf of your company, to bind your company to these terms. You may then download or install the file. In the event of a conflict between the terms of this Agreement and any license terms and @@ -14,7 +13,6 @@ then that agreement shall govern your use of the Licensed Software and shall supersede this Agreement. NXP SOFTWARE LICENSE AGREEMENT - This is a legal agreement between your employer, of which you are an authorized representative, or, if you have no employer, you as an individual ("you" or "Licensee"), and NXP B.V. ("NXP"). It concerns your rights to use the software @@ -30,9 +28,7 @@ Software in your possession or control. Any copies of the Licensed Software that you have already distributed, where permitted, and do not destroy will continue to be governed by this Agreement. Your prior use will also continue to be governed by this Agreement. - 1. DEFINITIONS - 1.1. "Affiliate" means, with respect to a party, any corporation or other legal entity that now or hereafter Controls, is Controlled by or is under common Control with such party; where "Control" means the direct or indirect @@ -40,62 +36,49 @@ ownership of greater than fifty percent (50%) of the shares or similar interests entitled to vote for the election of directors or other persons performing similar functions. An entity is considered an Affiliate only so long as such Control exists. - -1.2 "Authorized System" means either (i) Licensee's hardware product -which incorporates an NXP Product or (ii) Licensee's software program which is -used exclusively in connection with an NXP Product and with which the Licensed +1.2 "Authorized System" means either (i) Licensee's hardware product which +incorporates an NXP Product or (ii) Licensee's software program which is used +exclusively in connection with an NXP Product and with which the Licensed Software will be integrated. - -1.3. "Derivative Work" means a work based upon one or more pre-existing +1.3. "Derivative Work" means a work based upon one or more pre-existing works. A work consisting of editorial revisions, annotations, elaborations, or other modifications which, as a whole, represent an original work of authorship, is a Derivative Work. - -1.4 "Intellectual Property Rights" means any and all rights under -statute, common law or equity in and under copyrights, trade secrets, and -patents (including utility models), and analogous rights throughout the world, +1.4 "Intellectual Property Rights" means any and all rights under statute, +common law or equity in and under copyrights, trade secrets, and patents +(including utility models), and analogous rights throughout the world, including any applications for and the right to apply for, any of the foregoing. - -1.5 "NXP Product" means a hardware product (e.g. a microprocessor, -microcontroller, sensor or digital signal processor) supplied directly or -indirectly from NXP or an NXP Affiliate, unless there is a product specified in -the Software Content Register, in which case this definition is limited to such -product. - +1.5 "NXP Product" means a hardware product (e.g. a microprocessor, +microcontroller, sensor or digital signal processor) and/or services (e.g. +cloud platform services) supplied directly or indirectly from NXP or an NXP +Affiliate, unless there is a product specified in the Software Content +Register, in which case this definition is limited to such product. 1.6 "Software Content Register" means the documentation which may accompany the Licensed Software which identifies the contents of the Licensed Software, including but not limited to identification of any Third Party Software, if any, and may also contain other related information as whether the license in 2.3 is applicable. - 1.7 "Third Party Software" means, any software included in the Licensed Software that is not NXP proprietary software, and is not open source software, and to which different license terms may apply. - 2. LICENSE GRANT. - 2.1. If you are not expressly granted the distribution license in Section 2.3 in the Software Content Register, then you are only granted the rights in Section 2.2 and not in 2.3. If you are expressly granted the distribution license in Section 2.3 in the Software Content Register, then you are granted the rights in both Section 2.2 and 2.3. - -2.2. Standard License. Subject to the terms and conditions of this +2.2. Standard License. Subject to the terms and conditions of this Agreement, NXP grants you a worldwide, personal, non-transferable, non-exclusive, non-sublicensable license, solely for the development of an Authorized System: - -(a) to use and reproduce the Licensed Software (and its Derivative Works +(a) to use and reproduce the Licensed Software (and its Derivative Works prepared under the license in Section 2.2(b)) solely in combination with a NXP Product; and - -(b) for Licensed Software provided to you in source code form (human +(b) for Licensed Software provided to you in source code form (human readable), to prepare Derivative Works of the Licensed Software solely for use in combination with a NXP Product. - You may not distribute or sublicense the Licensed Software to others under the license granted in this Section 2.2. - You may demonstrate the Licensed Software to your direct customers as part of an Authorized System so long as such demonstration is directly controlled by you and without prior approval by NXP; however, to all other third parties only @@ -103,76 +86,63 @@ if NXP has provided its advance, written approval (e.g. email approval) of your demonstrating the Licensed Software to specified third parties or at specified event(s). You may not leave the Licensed Software with a direct customer or any other third party at any time. - 2.3. Additional Distribution License. If expressly authorized in the Software Content Register, subject to the terms and conditions of this Agreement, NXP grants you a worldwide, personal, non-transferable, non-exclusive, non-sublicensable license solely in connection with your manufacturing and distribution of an Authorized System: - -(a) to manufacture (or have manufactured), distribute, and market -the Licensed Software (and its Derivative Works prepared under the license in +(a) to manufacture (or have manufactured), distribute, and market the +Licensed Software (and its Derivative Works prepared under the license in 2.2(b)) in object code (machine readable format) only as part of, or embedded within, Authorized Systems and not on a standalone basis solely for use in combination with a NXP Product. Notwithstanding the foregoing, those files marked as .h files ("Header files") may be distributed in source or object code form, but only as part of, or embedded within Authorized Systems; and - -(b) to copy and distribute as needed, solely in connection with an +(b) to copy and distribute as needed, solely in connection with an Authorized System and for use in combination with a NXP Product, non-confidential NXP information provided as part of the Licensed Software for the purpose of maintaining and supporting Authorized Systems with which the Licensed Software is integrated. - -2.4 Separate license grants to Third Party Software, or other terms +2.4 Separate license grants to Third Party Software, or other terms applicable to the Licensed Software if different from those granted in this Section 2, are contained in Appendix A. The Licensed Software may be accompanied by a Software Content Register which will identify that portion of the Licensed Software, if any, that is subject to the different terms in Appendix A. - -2.5. You may use subcontractors on your premises to exercise your -rights under Section 2.2 and Section 2.3, if any, so long as you have an -agreement in place with the subcontractor containing confidentiality -restrictions no less stringent than those contained in this Agreement. You will -remain liable for your subcontractors' adherence to the terms of this Agreement -and for any and all acts and omissions of such subcontractors with respect to -this Agreement and the Licensed Software. - +2.5. You may use subcontractors to exercise your rights under Section +2.2 and Section 2.3, if any, so long as you have an agreement in place with the +subcontractor containing confidentiality restrictions no less stringent than +those contained in this Agreement. You will remain liable for your +subcontractors' adherence to the terms of this Agreement and for any and all +acts and omissions of such subcontractors with respect to this Agreement and +the Licensed Software. 3. LICENSE LIMITATIONS AND RESTRICTIONS. - 3.1. The licenses granted above in Section 2 only extend to NXP Intellectual Property Rights that would be infringed by the unmodified Licensed Software prior to your preparation of any Derivative Work. - 3.2. The Licensed Software is licensed to you, not sold. Title to Licensed Software delivered hereunder remains vested in NXP or NXP's licensor and cannot be assigned or transferred. You are expressly forbidden from selling or otherwise distributing the Licensed Software, or any portion thereof, except as expressly permitted herein. This Agreement does not grant to you any implied rights under any NXP or third party Intellectual Property Rights. - 3.3. You may not translate, reverse engineer, decompile, or disassemble the Licensed Software except to the extent applicable law specifically prohibits such restriction. You must prohibit your subcontractors or customers (if distribution is permitted) from translating, reverse engineering, decompiling, or disassembling the Licensed Software except to the extent applicable law specifically prohibits such restriction. - 3.4. You must reproduce any and all of NXP's (or its third-party licensor's) copyright notices and other proprietary legends on copies of Licensed Software. - 3.5. If you distribute the Licensed Software to the United States Government, then the Licensed Software is "restricted computer software" and is subject to FAR 52.227-19. - 3.6. You grant to NXP a non-exclusive, non-transferable, irrevocable, perpetual, worldwide, royalty-free, sub-licensable license under your Intellectual Property Rights to use without restriction and for any purpose any suggestion, comment or other feedback related to the Licensed Software (including, but not limited to, error corrections and bug fixes). - 3.7. You will not take or fail to take any action that could subject the Licensed Software to an Excluded License. An Excluded License means any license that requires, as a condition of use, modification or distribution of @@ -180,13 +150,11 @@ software subject to the Excluded License, that such software or other software combined and/or distributed with the software be (i) disclosed or distributed in source code form; (ii) licensed for the purpose of making Derivative Works; or (iii) redistributable at no charge. - 3.8. You may not publish or distribute reports associated with the use 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. - 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 @@ -194,12 +162,9 @@ BSD License, Apache License or the GNU Lesser General Public License. Your use of the open source software is subject to the terms of each applicable license. You must agree to the terms of each applicable license, or you cannot use the open source software. - 5. INTELLECTUAL PROPERTY RIGHTS. - Upon request, you must provide NXP the source code of any derivative of the Licensed Software. - Unless prohibited by law, the following paragraph shall apply. Your modifications to the Licensed Software, and all intellectual property rights associated with, and title thereto, will be the property of NXP. You agree to @@ -212,30 +177,24 @@ rights of identification of authorship and all rights of approval, restriction, or limitation on use or subsequent modification. Notwithstanding the foregoing, you will have the license rights granted in Section 2 hereto to any such modifications made by you or your licensees. - Otherwise, you agree to grant an irrevocable, worldwide, and perpetual license to NXP to make, have made, use, sell, offer to sell, import, commercialize, sublicense and reproduce your modifications or derivative works to the Licensed Software without any payment to Licensee. You agree to provide all assistance reasonably requested by NXP to establish, preserve or enforce such right. - 6. ESSENTIAL PATENTS. NXP has no obligation to identify or obtain any license to any Intellectual Property Right of a third-party that may be necessary for use in connection with technology that is incorporated into the Authorized System (whether or not as part of the Licensed Software). - 7. TERM AND TERMINATION. This Agreement will remain in effect unless terminated as provided in this Section. - 7.1. You may terminate this Agreement immediately upon written notice to NXP at the address provided below. - 7.2. Either party may terminate this Agreement if the other party is in default of any of the terms and conditions of this Agreement, and termination is effective if the defaulting party fails to correct such default within 30 days after written notice thereof by the non-defaulting party to the defaulting party at the address below. - 7.3. Notwithstanding the foregoing, NXP may terminate this Agreement immediately upon written notice if you: breach any of your confidentiality obligations or the license restrictions under this Agreement; become bankrupt, @@ -243,17 +202,13 @@ insolvent, or file a petition for bankruptcy or insolvency; make an assignment for the benefit of its creditors; enter proceedings for winding up or dissolution; are dissolved; or are nationalized or become subject to the expropriation of all or substantially all of your business or assets. - 7.4. Upon termination of this Agreement, all licenses granted under Section 2 will expire. - 7.5. After termination of this Agreement by either party you will destroy all parts of Licensed Software and its Derivative Works (if any) and will provide to NXP a statement certifying the same. - 7.6. Notwithstanding the termination of this Agreement for any reason, the terms of Sections 1 and 3 through 24 will survive. - 8. SUPPORT. NXP is not obligated to provide any support, upgrades or new releases of the Licensed Software under this Agreement. If you wish, you may contact NXP and report problems and provide suggestions regarding the @@ -261,7 +216,6 @@ Licensed Software. NXP has no obligation to respond to such a problem report or suggestion. NXP may make changes to the Licensed Software at any time, without any obligation to notify or provide updated versions of the Licensed Software to you. - 9. NO WARRANTY. To the maximum extent permitted by law, NXP expressly disclaims any warranty for the Licensed Software. The Licensed Software is provided "AS IS", without warranty of any kind, either express or implied, @@ -269,13 +223,11 @@ 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). - 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 permitted) of the Licensed Software or (2) your violation of the terms and conditions of this Agreement. - 11. LIMITATION OF LIABILITY. EXCLUDING LIABILITY FOR A BREACH OF SECTION 2 (LICENSE GRANTS), SECTION 3 (LICENSE LIMITATIONS AND RESTRICTIONS), SECTION 16 (CONFIDENTIAL INFORMATION), OR CLAIMS UNDER SECTION 10 (INDEMNITY), @@ -288,7 +240,6 @@ 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. Each party shall comply with all applicable export and import control laws and regulations including but not limited to the US Export Administration Regulation (including restrictions on certain military @@ -304,9 +255,7 @@ or destination to which such transfer, diversion, export or re-export is restricted or prohibited, without obtaining prior written authorization from the applicable competent government authorities to the extent required by those laws. - 13. GOVERNMENT CONTRACT COMPLIANCE - 13.1. If you sell Authorized Systems directly to any government or public entity, including U.S., state, local, foreign or international governments or public entities, or indirectly via a prime contractor or subcontractor of such @@ -314,7 +263,6 @@ governments or entities, NXP makes no representations, certifications, or warranties whatsoever about compliance with government or public entity acquisition statutes or regulations, including, without limitation, statutes or regulations that may relate to pricing, quality, origin or content. - 13.2. The Licensed Software has been developed at private expense and is a "Commercial Item" as defined in 48 C.F.R. Section 2.101, consisting of "Commercial Computer Software", and/or "Commercial Computer Software @@ -325,7 +273,6 @@ within, Authorized Systems. Any agreement pursuant to which you share the Licensed Software will include a provision that reiterates the limitations of this document and requires all sub-agreements to similarly contain such limitations. - 14. CRITICAL APPLICATIONS. In some cases, NXP may promote certain software for use in the development of, or for incorporation into, products or services (a) used in applications requiring fail-safe performance or (b) in @@ -343,7 +290,6 @@ APPLICATIONS BY LICENSEE. Accordingly, Licensee will indemnify and hold NXP harmless from any claims, liabilities, damages and associated costs and expenses (including attorneys' fees) that NXP may incur related to Licensee’s incorporation of the Licensed Software in a Critical Application. - 15. CHOICE OF LAW; VENUE. This Agreement will be governed by, construed, and enforced in accordance with the laws of The Netherlands, without regard to conflicts of laws principles, will apply to all matters relating to @@ -351,7 +297,6 @@ this Agreement or the Licensed Software, and you agree that any litigation will be subject to the exclusive jurisdiction of the courts of Amsterdam, The Netherlands. The United Nations Convention on Contracts for the International Sale of Goods will not apply to this document. - 16. CONFIDENTIAL INFORMATION. Subject to the license grants and restrictions contained herein, you must treat the Licensed Software as confidential information and you agree to retain the Licensed Software in @@ -368,16 +313,13 @@ that you notify NXP of such requirement prior to disclosure, which you only disclose the minimum of the required information, and that you allow NXP the opportunity to object to such court or other legal body requiring such disclosure. - 17. TRADEMARKS. You are not authorized to use any NXP trademarks, brand names, or logos. - 18. ENTIRE AGREEMENT. This Agreement constitutes the entire agreement between you and NXP regarding the subject matter of this Agreement, and supersedes all prior communications, negotiations, understandings, agreements or representations, either written or oral, if any. This Agreement may only be amended in written form, signed by you and NXP. - 19. SEVERABILITY. If any provision of this Agreement is held for any reason to be invalid or unenforceable, then the remaining provisions of this Agreement will be unimpaired and, unless a modification or replacement of the @@ -386,11 +328,9 @@ material benefit, in which case the Agreement will immediately terminate, the invalid or unenforceable provision will be replaced with a provision that is valid and enforceable and that comes closest to the intention underlying the invalid or unenforceable provision. - 20. NO WAIVER. The waiver by NXP of any breach of any provision of this Agreement will not operate or be construed as a waiver of any other or a subsequent breach of the same or a different provision. - 21. AUDIT. You will keep full, clear and accurate records with respect to your compliance with the limited license rights granted under this Agreement for three years following expiration or termination of this Agreement. NXP will @@ -400,33 +340,28 @@ and during normal business hours, all such records that may bear upon your compliance with the limited license rights granted above. You must make prompt adjustment to compensate for any errors and/or omissions disclosed by such examination or audit. - 22. NOTICES. All notices and communications under this Agreement will be made in writing, and will be effective when received at the following addresses: + NXP: NXP B.V. + High Tech Campus 60 + 5656 AG Eindhoven + The Netherlands + ATTN: Legal Department - NXP: NXP B.V. - High Tech Campus 60 - 5656 AG Eindhoven - The Netherlands - - ATTN: Legal Department - - You: The address provided at registration will be used. + You: The address provided at registration will be used. 23. RELATIONSHIP OF THE PARTIES. The parties are independent contractors. Nothing in this Agreement will be construed to create any partnership, joint venture, or similar relationship. Neither party is authorized to bind the other to any obligations with third parties. - 24. SUCCESSION AND ASSIGNMENT. This Agreement will be binding upon and inure to the benefit of the parties and their permitted successors and assigns. You may not assign this Agreement, or any part of this Agreement, without the prior written approval of NXP, which approval will not be unreasonably withheld or delayed. NXP may assign this Agreement, or any part of this Agreement, in its sole discretion. - -25. PRIVACY. By agreeing to this Agreement and/or utilizing the Licensed +25. PRIVACY. By agreeing to this Agreement and/or utilizing the Licensed Software, Licensee consents to use of certain personal information, including but not limited to name, email address, and location, for the purpose of NXP’s internal analysis regarding future software offerings. NXP’s @@ -435,7 +370,6 @@ https://www.nxp.com/company/our-company/about-nxp/privacy-statement:PRIVACYPRACT ICES. APPENDIX A - Other License Grants and Restrictions: The Licensed Software may include some or all of the following software, which @@ -446,6 +380,10 @@ Party Software or specific components of the NXP proprietary software, the following terms apply to the extent they deviate from the terms in the Agreement: +Airbiquity Inc.: The Airbiquity software may only be used in object code and +Licensee may not sublicense the Airbiquity software to any third party. +Licensee’s license to use the Airbiquity software expires on June 30, 2023. + Amazon: Use of the Amazon software constitutes your acceptance of the terms of the Amazon Program Materials License Agreement (including the AVS Component Schedule, if applicable), located at @@ -469,9 +407,16 @@ Any dispute or claim relating to your use of the Greengrass software will be resolved by binding arbitration, rather than in court, except that you may assert claims in small claims court if your claims qualify. +Amazon: AWS Fleetwise software must be used consistent with the terms found +here: https://github.com/aws/aws-iot-fleetwise-edge/blob/main/LICENSE. + Amphion Semiconductor Ltd.: Distribution of Amphion software must be a part of, or embedded within, Authorized Systems that include an Amphion Video Decoder. +Apple MFi Software Development Kit: Use of Apple MFi Software and associated +documentation is restricted to current Apple MFi licensees in accordance with +the terms of their own valid and in-effect license from Apple. + Aquantia Corp.: You may use Aquantia's API binaries solely to flash the API software to an NXP Product which mates with an Aquantia device. @@ -489,11 +434,8 @@ Au-Zone Technologies: eIQ Portal, Model Tool, DeepViewRT and ModelRunner are distributed by NXP under license from Au-Zone Technologies. Your use of the Licensed Software, examples and related documentation is subject to the following: - (1) Use of Software is limited to Authorized System only - (2) In no event may Licensee Sublicense the Software - (3) AU-ZONE TECHNOLOGIES SHALL NOT BE LIABLE FOR USE OF LICENSED SOFTWARE IN CRITICAL APPLICATIONS BY LICENSEE @@ -545,7 +487,6 @@ Embedded Systems Academy GmbH (EmSA): Any use of Micro CANopen Plus is subject to the acceptance of the license conditions described in the LICENSE.INFO file distributed with all example projects and in the documentation and the additional clause described below. - Clause 1: Micro CANopen Plus may not be used for any competitive or comparative purpose, including the publication of any form of run time or compile time metric, without the express permission of EmSA. @@ -555,6 +496,10 @@ software product be used in any way that would compete with any product from Fenopix. License to the CanvasJS software will terminate immediately without notice if Licensee fail to comply with any provision of this Agreement. +Fraunhofer IIS: Fraunhofer MPEG Audio Decoder (Fraunhofer copyright) - If you +are provided MPEG-H decoding functionality, you understand that NXP will +provide Fraunhofer your name and contact information. + Future Technology Devices International Ltd.: Future Technology Devices International software must be used consistent with the terms found here: http://www.ftdichip.com/Drivers/FTDriverLicenceTerms.htm @@ -563,6 +508,12 @@ Global Locate (Broadcom Corporation): Use of Global Locate, Inc. software is limited to evaluation and demonstration only. Permitted distributions must be similarly limited. Further rights must be obtained from Global Locate. +LC3plus: the LC3plus Low Complexity Communication Codec Plus (LC3plus) per ETSI +TS 103 634 V1.3.1, is subject to ETSI Intellectual Property Rights Policy, See +https://portal.etsi.org/directives/45_directives_jun_2022.pdf. For application +in an End Product, Fraunhofer communication applies, see +https://www.iis.fraunhofer.de/en/ff/amm/communication/lc3.html + Microsoft: Except for Microsoft PlayReady software, if the Licensed Software includes software owned by Microsoft Corporation ("Microsoft"), it is subject to the terms of your license with Microsoft (the "Microsoft Underlying Licensed @@ -605,6 +556,10 @@ MQX RTOS Code: MQX RTOS source code may not be re-distributed by any NXP Licensee under any circumstance, even by a signed written amendment to this Agreement. +NXP Voice Software: VoiceSpot, VoiceSeeker (including AEC), and Conversa may be +used for evaluation or demonstration purposes only. Any commercial distribution +rights are subject to a separate royalty agreement obtained from NXP. + NXP Wireless Charging Library: License to the Software is limited to use in inductive coupling or wireless charging applications @@ -649,16 +604,12 @@ SanDisk Corporation: If the Licensed Software includes software developed by SanDisk Corporation ("SanDisk"), you must separately obtain the rights to reproduce and distribute this software in source code form from SanDisk. Please follow these easy steps to obtain the license and software: - (1) Contact your local SanDisk sales representative to obtain the SanDisk License Agreement. - (2) Sign the license agreement. Fax the signed agreement to SanDisk USA marketing department at 408-542-0403. The license will be valid when fully executed by SanDisk. - (3) If you have specific questions, please send an email to sales@sandisk.com - You may only use the SanDisk Corporation Licensed Software on products compatible with a SanDisk Secure Digital Card. You may not use the SanDisk Corporation Licensed Software on any memory device product. SanDisk retains @@ -672,22 +623,48 @@ Cortex-M3, Cortex-M4, Cortex-M33, Cortex-M7, and Cortex-A7 based products only. SEGGER Microcontroller - J-Link/J-Trace Software: Segger software must be used consistent with the terms found here: http://www.segger.com/jlink-software.html +Synopsys/BLE Software: Your use of the Synopsys/BLE Software and related +documentation is subject to the following: +(1) Synopsys is third-party beneficiaries of, and thus may enforce against you, +the license restrictions and confidentiality obligations in this agreement with +respect to their intellectual property and proprietary information. +(2) Your distribution of the Licensed Software shall subject any recipient to a +written agreement at least as protective of the Licensed Software as provided +in this Agreement. + Synopsys/Target Compiler Technologies: Your use of the Synopsys/Target Compiler Technologies Licensed Software and related documentation is subject to the following: - (1) Duration of the license for the Licensed Software is limited to 12 months, unless otherwise specified in the license file. - (2) The Licensed Software is usable by one user at a time on a single designated computer, unless otherwise agreed by Synopsys. - (3) Licensed Software and documentation are to be used only on a designated computer at the designated physical address provided by you on the APEX license form. - (4) The Licensed Software is not sub-licensable. +T2 Labs / T2 Software: As a condition to the grant of any license under this +Agreement, you represent and warrant that you will comply with all licenses, +agreements, rules and bylaws of the Bluetooth SIG (Special Interest Group ) +applicable to the licensed software and documentation and its use which may +affect when and if you may take certain actions under licenses granted +hereunder. + +The license grant under this Agreement is conditional to you being (i) a +Bluetooth SIG Associate member until such time as the specifications for the +software are made public to Bluetooth SIG members of any level and (ii) +thereafter a Bluetooth SIG member of any level. + +Notwithstanding the terms contained in Section 2.3 (a), if the licensed +software includes proprietary software in source code format, you may make +modifications and create derivative works only to the extent necessary for +improving the performance of the source code with the NXP products or your +products and for creating enhancements of such products. You may not further +sublicense or otherwise distribute the source code, or any modifications or +derivatives thereof as stand-alone products. You will be responsible for +qualifying any modifications or derivatives with the Bluetooth SIG and any +other qualifying bodies. TARA Systems: Use of TARA Systems GUI technology Embedded Wizard is limited to evaluation and demonstration only. Permitted distributions must be similarly limited. Further rights must be obtained directly from TARA Systems. diff --git a/SCR/SCR-5.10.52-2.1.0.txt b/SCR/SCR-5.15.71-2.2.0.txt index 5a911cd8..de067127 100644 --- a/SCR/SCR-5.10.52-2.1.0.txt +++ b/SCR/SCR-5.15.71-2.2.0.txt @@ -1,41 +1,41 @@ NXP Software Content Register -Release - Linux 5.10.52-2.1.0 - September 2021 +Release - Linux 5.15.71-2.2.0 + December 2022 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies -License File: COPYING +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 - Additional distribution license granted - Section 2.3 applies +License File: EULA.txt Yocto Project recipe manifest: -repo init -u https://source.codeaurora.org/external/imx/imx-manifest -b imx-linux-hardknott -m imx-5.10.52-2.1.0.xml +repo init -u https://github.com/nxp-imx/imx-manifest -b imx-linux-kirkstone -m imx_5.15.71-2.2.0.xml -Release tag: lf-5.10.52-2.1.0 +Release tag: lf-5.15.71-2.2.0 -------------------------------------------- BSP Packages -------------------------------------------- Package: linux-imx.git -Version: 5.10 +Version: 5.15 Outgoing License: GPL-2.0 WITH Linux-syscall-note License File: COPYING Package Category: BSP Type of Content: source Description and comments: The Linux kernel with i.MX-specific drivers -Release Location: https://source.codeaurora.org/external/imx/linux-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/linux-imx -b lf-5.15.71-2.2.0 Origin: NXP (GPL-2.0) kernel.org (GPL-2.0) - https://www.kernel.org/ -------------------------------------------- Package: uboot-imx.git -Version: 2021.04 +Version: 2022.04 Outgoing License: GPL-2.0 License File: Licenses/gpl-2.0.txt Package Category: BSP Type of Content: source Description and comments: Bootloader with i.MX-specific capabilities -Release Location: https://source.codeaurora.org/external/imx/uboot-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/uboot-imx -b lf-5.15.71-2.2.0 Origin: NXP (GPL-2.0) Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome Android Open Source Project (BSD-2-Clause) - https://source.android.com/ @@ -44,21 +44,21 @@ Origin: NXP (GPL-2.0) -------------------------------------------- Package: imx-atf.git -Version: 2.4 +Version: 2.6 Outgoing License: BSD-3-Clause License File: docs/license.rst Package Category: BSP Type of Content: source Description and comments: ARM Trusted Firmware -Release Location: https://source.codeaurora.org/external/imx/imx-atf -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/imx-atf -b lf-5.15.71-2.2.0 Origin: NXP (BSD-3-clause) arm-trusted-firmware - ARM Limited (BSD-3-clause) - http://github.com/ARM-software/arm-trusted-firmware/ -------------------------------------------- -Package: imx-sc-firmware-1.10.0.bin -Version: 1.10.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-sc-firmware-1.15.0.bin +Version: 1.15.0 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: BSP Type of Content: binary @@ -69,9 +69,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: firmware-imx-8.13.bin -Version: 8.13 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: firmware-imx-8.18.bin +Version: 8.18 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: BSP Type of Content: binary @@ -80,7 +80,7 @@ Release Location: Mirror Origin: NXP (proprietary) In addition, these components contain code from the companies listed below. - DDR: origin: Synopsys (proprietary) + DDR: origin: Synopsys DDR (proprietary) EASRC: origin: NXP (proprietary) EPDC: origin: E Ink Corporation (proprietary) HDMI: origin: Cadence Design Systems, Inc. (proprietary) @@ -101,9 +101,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: firmware-sentinel-0.2.bin -Version: 0.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: firmware-sentinel-0.8.bin +Version: 0.8 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: BSP Type of Content: binary @@ -113,9 +113,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: firmware-upower-0.1.bin -Version: 0.1 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: firmware-upower-1.1.0.bin +Version: 1.1.0 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: BSP Type of Content: binary @@ -132,7 +132,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Make Image BootLoader -Release Location: https://source.codeaurora.org/external/imx/imx-mkimage -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/imx-mkimage -b lf-5.15.71-2.2.0 Origin: NXP (GPL-2.0) Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome @@ -145,7 +145,7 @@ License File: COPYING-LGPL-2.1 Package Category: BSP Type of Content: source Description and comments: BSP libraries -Release Location: https://source.codeaurora.org/external/imx/imx-lib -b master +Release Location: https://github.com/nxp-imx/imx-lib -b master Origin: NXP (LGPL-2.1) -------------------------------------------- @@ -157,7 +157,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Linux unit test applications -Release Location: https://source.codeaurora.org/external/imx/imx-test -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/imx-test -b lf-5.15.71-2.2.0 Origin: NXP (GPL-2.0) module_test: NXP (GPL-2.0+) Hantro Products Oy. (GPL-2.0+) @@ -223,7 +223,7 @@ Origin: NXP (GPL-2.0) Package: imx-firmware.git Version: -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Outgoing License: LA_OPT_NXP_Software_License v34 February 2022 Additional distribution license granted - Section 2.3 applies License File: EULA.txt Package Category: BSP Type of Content: binary @@ -242,14 +242,26 @@ License File: mxm_wifiex/wlan_src/gpl-2.0.txt Package Category: BSP Type of Content: source Description and comments: NXP Wi-Fi linux SDK -Release Location: https://source.codeaurora.org/external/imx/mwifiex -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/mwifiex -b lf-5.15.71-2.2.0 +Origin: NXP (GPL-2.0) + +-------------------------------------------- + +Package: mwifiex-iw612.git +Version: +Outgoing License: GPL-2.0 +License File: gpl-2.0.txt +Package Category: BSP +Type of Content: source +Description and comments: NXP Wi-Fi IW612 linux SDK +Release Location: https://github.com/nxp-imx/mwifiex-iw612 -b lf-5.15.71-2.2.0 Origin: NXP (GPL-2.0) -------------------------------------------- -Package: imx-seco-3.8.2.bin -Version: 3.8.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-seco-5.9.0.bin +Version: 5.9.0 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: BSP Type of Content: binary @@ -261,18 +273,18 @@ Origin: NXP (proprietary) Package: imx-seco-libs.git Version: -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Outgoing License: LA_OPT_NXP_Software_License v35 May 2022 Additional distribution license granted - Section 2.3 applies License File: EULA.txt Package Category: BSP Type of Content: source Description and comments: BSP source - SECO -Release Location: https://github.com/NXP/imx-seco-libs.git -b lf-5.10.52-2.1.0 +Release Location: https://github.com/NXP/imx-seco-libs.git -b lf-5.15.71-2.2.0 Origin: NXP (proprietary) -------------------------------------------- -Package: sof-imx-1.9.0-1 -Version: 1.9.0-1 +Package: sof-imx-2.3.0 +Version: 2.3.0 Outgoing License: BSD-3-Clause License File: LICENCE Package Category: BSP @@ -280,11 +292,35 @@ Type of Content: binary Description and comments: Sound Open Firmware Release Location: Mirror Origin: NXP (BSD-3-clause) - Intel Corporation (BSD-3-clause) - Cadence Design Systems, Inc. (MIT) - Ulf Magnusson (ISC) - FreeBSD (BSD-2-clause) - source code in: https://github.com/thesofproject/sof + sof (BSD-3-Clause) - https://github.com/thesofproject/sof + +-------------------------------------------- + +Package: sof-zephyr-2.3.0 +Version: 2.3.0 +Outgoing License: BSD-3-Clause +License File: LICENCE +Package Category: BSP +Type of Content: binary +Description and comments: Sound Open Firmware with Zephyr +Release Location: Mirror +Origin: NXP (BSD-3-clause) + sof (BSD-3-Clause) - https://github.com/thesofproject/sof + zephyr project (Apache-2.0) - https://github.com/zephyrproject-rtos/zephyr + +-------------------------------------------- + +Package: zephyr-demo-imx-3.2.0 +Version: 3.2.0 +Outgoing License: BSD-3-Clause +License File: LICENCE +Package Category: BSP +Type of Content: binary +Description and comments: Zephyr Demo for i.MX +Release Location: Mirror +Origin: NXP (BSD-3-clause) + zephyr project (Apache-2.0) - https://github.com/zephyrproject-rtos/zephyr + -------------------------------------------- @@ -295,7 +331,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Tool to convert Android sparse images to raw images -Release Location: https://source.codeaurora.org/external/imx/simg2img -b master +Release Location: https://github.com/nxp-imx/simg2img -b master Origin: NXP (Apache-2.0) The Android Open Source Project (Apache-2.0) - https://android.googlesource.com/platform/system/core/+/master/libsparse Gary S Brown (Public Domain) - http://www.opensource.apple.com/source/xnu/xnu-1456.1.26/bsd/libkern/crc32.c?txt @@ -330,26 +366,26 @@ Origin: NXP (GPL-2.0) -------------------------------------------- Package: imx-optee-client.git -Version: 3.13.0.imx +Version: 3.19.0.imx Outgoing License: BSD-2-Clause License File: LICENSE Package Category: BSP Type of Content: source Description and comments: Open Portable Trusted Execution Environment for TEE Client library -Release Location: https://source.codeaurora.org/external/imx/imx-optee-client -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/imx-optee-client -b lf-5.15.71-2.2.0 Origin: NXP (BSD-2-Clause) optee_client (BSD-2-Clause) - https://github.com/OP-TEE/optee_client -------------------------------------------- Package: imx-optee-os.git -Version: 3.13.0.imx +Version: 3.19.0.imx Outgoing License: BSD-2-Clause License File: LICENSE Package Category: BSP Type of Content: source Description and comments: Open Portable Trusted Execution Environment for Linux on ARM -Release Location: https://source.codeaurora.org/external/imx/imx-optee-os -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/imx-optee-os -b lf-5.15.71-2.2.0 Origin: NXP (BSD-2-Clause) OP-TEE Trusted OS (BSD-2-Clause) - https://github.com/OP-TEE/optee_os Mbed TLS (Apache-2.0) - https://github.com/ARMmbed/mbedtls/ @@ -357,67 +393,40 @@ Origin: NXP (BSD-2-Clause) -------------------------------------------- Package: imx-optee-test.git -Version: 3.13.0.imx +Version: 3.19.0.imx Outgoing License: BSD-2-Clause (ta/) and GPL-2.0 (host/) License File: LICENSE.md Package Category: BSP Type of Content: source Description and comments: Open Portable Trusted Execution Environment sanity tests -Release Location: https://source.codeaurora.org/external/imx/imx-optee-test -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/imx-optee-test -b lf-5.15.71-2.2.0 Origin: NXP (BSD-2-Clause) optee_test (BSD-2-Clause) - https://github.com/OP-TEE/optee_test -------------------------------------------- Package: imx-jailhouse.git -Version: 0.12 +Version: 0.2 Outgoing License: GPL-2.0 License File: COPYING Package Category: BSP Type of Content: source Description and comments: A partitioning Hypervisor based on Linux -Release Location: https://source.codeaurora.org/external/imx/imx-jailhouse -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/imx-jailhouse -b lf-5.15.71-2.2.0 Origin: NXP (GPL-2.0) Siemens AG (GPL-2.0) - https://github.com/siemens/jailhouse -------------------------------------------- -Package: imx-xen.git -Version: 4.13.0 -Outgoing License: GPL-2.0 -License File: COPYING +Package: imx-secure-enclave.git +Version: +Outgoing License: LA_OPT_NXP_Software_License v29 August 2021 Additional distribution license granted - Section 2.3 applies +License File: EULA.txt Package Category: BSP Type of Content: source -Description and comments: A Virtual Machine Monitor -Release Location: https://source.codeaurora.org/external/imx/imx-xen -b lf-5.10.52-2.1.0 -Origin: NXP (GPL-2.0) - --------------------------------------------- - -Package: imx8ulp-m33-demo-2.10.0.bin -Version: 2.10.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies -License File: COPYING -Package Category: BSP -Type of Content: binary -Description and comments: i.MX MCUXpresso SDK demo image on Cortex-M33 core -Release Location: Mirror +Description and comments: i.MX secure enclave library +Release Location: https://github.com/NXP/imx-secure-enclave.git -b lf-5.15.71-2.2.0 Origin: NXP (proprietary) - ARM LIMITED (BSD-3-Clause) - Real Time Engineers, Ltd (MIT) - https://aws.amazon.com/freertos/ - Mentor Graphics, Ltd. (BSD-3-Clause) - https://github.com/OpenAMP/open-amp/ - --------------------------------------------- - -Package: ml-security-1.0.5.bin -Version: 1.0.5 -Outgoing License: LA_OPT_NXP_Software_License v25 June 2021 - Additional distribution license granted - Section 2.3 applies -License File: COPYING -Package Category: BSP -Type of Content: binary -Description and comments: Machine Learning Security -Release Location: Mirror -Origin: NXP (NXP Proprietary) -------------------------------------------- @@ -428,7 +437,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: NXP i.MX Security Middleware Library -Release Location: https://source.codeaurora.org/external/imx/imx-smw -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/imx-smw -b lf-5.15.71-2.2.0 Origin: NXP (BSD-3-Clause) -------------------------------------------- @@ -440,14 +449,14 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: NXP i.MX keyctl tool to manage CAAM Keys -Release Location: https://source.codeaurora.org/external/imx/keyctl_caam -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/keyctl_caam -b lf-5.15.71-2.2.0 Origin: NXP (BSD-3-Clause) -------------------------------------------- -Package: ecdsa-lib-imx-3.3.2.bin -Version: 3.3.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: ecdsa-lib-imx-3.3.2.3.bin +Version: 3.3.2.3 +Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: BSP Type of Content: binary @@ -459,13 +468,13 @@ Origin: NXP (proprietary) -------------------------------------------- Package: v2xsehsm.git -Version: 0.6 +Version: Outgoing License: BSD-3-Clause License File: BSD-3-Clause.txt Package Category: BSP Type of Content: source Description and comments: V2X Secure Element library -Release Location: https://source.codeaurora.org/external/imx/v2xsehsm -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/v2xsehsm -b lf-5.15.71-2.2.0 Origin: NXP (BSD-3-Clause) -------------------------------------------- @@ -477,19 +486,19 @@ License File: BSD-3-Clause.txt Package Category: BSP Type of Content: source Description and comments: V2X Test Suite -Release Location: https://source.codeaurora.org/external/imx/vtest -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/vtest -b lf-5.15.71-2.2.0 Origin: NXP (BSD-3-Clause) -------------------------------------------- Package: dpdk.git -Version: 20.11 +Version: 21.11 Outgoing License: BSD-3-Clause License File: license/bsd-3-clause.txt Package Category: BSP Type of Content: source Description and comments: Data Plane Development Kit -Release Location: https://source.codeaurora.org/external/qoriq/qoriq-components/dpdk -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-qoriq/dpdk -b lf-5.15.71-2.2.0 Origin: NXP (BSD-3-Clause) DPDK - Intel Corporation (BSD-3-Clause) - https://github.com/DPDK/dpdk KNI Linux Device driver - Intel Corporation (GPL-2.0) Separate component of DPDK @@ -501,20 +510,20 @@ Graphics Packages -------------------------------------------- Package: isp-vvcam.git -Version: 4.2.2.15.0 +Version: 4.2.2.20.0 Outgoing License: GPL-2.0 License File: vvcam/LICENSE Package Category: Graphics Type of Content: ISP Kernel Module source Description and comments: Kernel Loadable Module for ISP -Release Location: https://source.codeaurora.org/external/imx/isp-vvcam -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/isp-vvcam -b lf-5.15.71-2.2.0 Origin: VeriSilicon Holdings Co., Ltd. (GPL-2.0) -------------------------------------------- -Package: isp-imx-4.2.2.15.0.bin -Version: 4.2.2.15.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: isp-imx-4.2.2.20.0.bin +Version: 4.2.2.20.0 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Graphics Type of Content: binary and source @@ -524,9 +533,9 @@ Origin: VeriSilicon Holdings Co., Ltd. (proprietary) -------------------------------------------- -Package: basler-camera-4.2.2.15.0.bin -Version: 4.2.2.15.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: basler-camera-4.2.2.20.0.bin +Version: 4.2.2.20.0 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Graphics Type of Content: binary @@ -538,21 +547,21 @@ Origin: Basler AG (proprietary) -------------------------------------------- Package: apitrace-imx.git -Version: 9.0.0 +Version: 10.0.0 Outgoing License: MIT License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: GPU Core IP and test application source -Release Location: https://source.codeaurora.org/external/imx/apitrace-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/apitrace-imx -b lf-5.15.71-2.2.0 Origin: NXP (MIT) apitrace (MIT) - https://github.com/apitrace/apitrace -------------------------------------------- -Package: imx-gpu-viv-6.4.3.p2.2-aarch32.bin -Version: 6.4.3.p2.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-gpu-viv-6.4.3.p4.6-aarch32.bin +Version: 6.4.3.p4.6 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Graphics Type of Content: binary and source @@ -569,9 +578,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: imx-gpu-viv-6.4.3.p2.2-aarch64.bin -Version: 6.4.3.p2.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-gpu-viv-6.4.3.p4.6-aarch64.bin +Version: 6.4.3.p4.6 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Graphics Type of Content: binary and source @@ -588,33 +597,14 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: xf86-video-imx-vivante.git -Version: 6.4.0.p0.0 -Outgoing License: MIT -License File: COPYING-MIT -Package Category: Graphics -Type of Content: source -Description and comments: Xserver Library extensions -Release Location: https://source.codeaurora.org/external/imx/xf86-video-imx-vivante -b lf-5.10.52-2.1.0 -Origin: NXP (MIT) - Vivante Corp. (MIT) - xorg-server (MIT) - http://xorg.freedesktop.org/ - XFree86 Project (XFree86-1.0) - http://sourceforge.net/projects/xfree86/ - - autohdmi utility (GPL-2.0) (source code for separate binary tool) - NXP (GPL-2.0) - X Consortium (MIT) - https://www.x.org/wiki/XConsortium/ - --------------------------------------------- - Package: gtec-demo-framework.git -Version: 5.7.1 +Version: 6.0.3 Outgoing License: BSD-3-Clause License File: License.md Package Category: Graphics Type of Content: source Description and comments: Graphics sample applications -Release Location: https://github.com/NXPmicro/gtec-demo-framework -b 5.7.1 +Release Location: https://github.com/nxp-imx/gtec-demo-framework -b 6.0.3 Origin: NXP (BSD-3-clause) Demo Framework Sascha Willems - Vulkan demo (MIT) - https://github.com/SaschaWillems/Vulkan @@ -647,71 +637,59 @@ Origin: NXP (BSD-3-clause) -------------------------------------------- -Package: imx-dpu-g2d-1.9.4.bin -Version: 1.9.4 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies -License File: COPYING -Package Category: Graphics -Type of Content: binary -Description and comments: G2D implementation using DPU -Release Location: Mirror -Origin: NXP (proprietary) - --------------------------------------------- - Package: libdrm-imx.git -Version: 2.4.107.imx +Version: 2.4.109.imx Outgoing License: MIT License File: COPYING Package Category: Graphics Type of Content: source Description and comments: i.MX DRM Direct Rendering Manager -Release Location: https://source.codeaurora.org/external/imx/libdrm-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/libdrm-imx -b lf-5.15.71-2.2.0 Origin: NXP (MIT) -------------------------------------------- Package: wayland-protocols-imx.git -Version: 1.20.imx +Version: 1.25.imx Outgoing License: MIT License File: COPYING Package Category: Graphics Type of Content: source Description and comments: Wayland protocol development -Release Location: https://source.codeaurora.org/external/imx/wayland-protocols-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/wayland-protocols-imx -b lf-5.15.71-2.2.0 Origin: NXP (MIT) Weston (MIT) - https://anongit.freedesktop.org/git/wayland/wayland-protocols.git -------------------------------------------- Package: weston-imx.git -Version: 9.0.0.imx +Version: 10.0.1.imx Outgoing License: MIT License File: COPYING Package Category: Graphics Type of Content: source Description and comments: A reference implementation of a Wayland compositor -Release Location: https://source.codeaurora.org/external/imx/weston-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/weston-imx -b lf-5.15.71-2.2.0 Origin: NXP (MIT) Weston (MIT) - http://github.com/wayland-project/weston/ -------------------------------------------- Package: imx-gputop.git -Version: 6.4.3.p2.2 +Version: 6.4.3.p4.6 Outgoing License: MIT License File: LICENSE.txt Package Category: Graphics Type of Content: source Description and comments: Sample program to monitor i.MX GPU performance data -Release Location: https://source.codeaurora.org/external/imx/imx-gputop -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/imx-gputop -b lf-5.15.71-2.2.0 Origin: NXP (MIT) -------------------------------------------- -Package: imx-gpu-g2d-6.4.3.p2.2-arm.bin -Version: 6.4.3.p2.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-gpu-g2d-6.4.3.p4.6-arm.bin +Version: 6.4.3.p4.6 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Graphics Type of Content: binary @@ -721,9 +699,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: imx-gpu-g2d-6.4.3.p2.2-aarch64.bin -Version: 6.4.3.p2.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-gpu-g2d-6.4.3.p4.6-aarch64.bin +Version: 6.4.3.p4.6 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Graphics Type of Content: binary @@ -733,21 +711,45 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: libgpuperfcnt-6.4.3.p2.2-aarch64-fb.bin -Version: 6.4.3.p2.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-dpu-g2d-2.1.4.bin +Version: 2.1.4 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Graphics Type of Content: binary -Description and comments: Library to retrieve i.MX GPU performance data +Description and comments: G2D implementation using DPU Release Location: Mirror Origin: NXP (proprietary) -------------------------------------------- -Package: libgpuperfcnt-6.4.3.p2.2-aarch64-wayland.bin -Version: 6.4.3.p2.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-g2d-pxp.git +Version: 2.1.0 +Outgoing License: LA_OPT_NXP_Software_License v35 May 2022 Additional distribution license granted - Section 2.3 applies +License File: EULA.txt +Package Category: Graphics +Type of Content: source +Description and comments: G2D implementation using PXP +Release Location: https://github.com/nxp-imx/imx-g2d-pxp -b lf-5.15.71-2.2.0 +Origin: NXP (Proprietary) + +-------------------------------------------- + +Package: g2d-samples.git +Version: 2.1 +Outgoing License: BSD-3-Clause +License File: COPYING +Package Category: Graphics +Type of Content: source +Description and comments: Graphics G2D sample applications +Release Location: https://github.com/nxp-imx/g2d-samples -b lf-5.15.71-2.2.0 +Origin: NXP (BSD-3-Clause) + +-------------------------------------------- + +Package: libgpuperfcnt-6.4.3.p4.6-aarch64-wayland.bin +Version: 6.4.3.p4.6 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Graphics Type of Content: binary @@ -757,9 +759,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: libgpuperfcnt-6.4.3.p2.2-arm-fb.bin -Version: 6.4.3.p2.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: libgpuperfcnt-6.4.3.p4.6-arm-fb.bin +Version: 6.4.3.p4.6 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Graphics Type of Content: binary @@ -769,9 +771,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: libgpuperfcnt-6.4.3.p2.2-arm-wayland.bin -Version: 6.4.3.p2.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: libgpuperfcnt-6.4.3.p4.6-arm-wayland.bin +Version: 6.4.3.p4.6 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Graphics Type of Content: binary @@ -782,13 +784,13 @@ Origin: NXP (proprietary) -------------------------------------------- Package: nn-imx.git -Version: 1.2.0 +Version: 1.3.0 Outgoing License: MIT License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: i.MX Neural Networks Accelerator Plugin -Release Location: https://source.codeaurora.org/external/imx/nn-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/nn-imx -b lf-5.15.71-2.2.0 Origin: NXP (MIT) Vivante Corporation (MIT) Boost Software (Boost) - https://www.boost.org/ @@ -800,13 +802,13 @@ Origin: NXP (MIT) -------------------------------------------- Package: opencv-imx.git -Version: 4.5.2.imx +Version: 4.6.0.imx Outgoing License: Apache-2.0 License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: i.MX OpenCV -Release Location: https://source.codeaurora.org/external/imx/opencv-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/opencv-imx -b lf-5.15.71-2.2.0 Origin: NXP (BSD-3-Cluse) OpenCV Foundation (BSD-3-Clause) - https://github.com/opencv/opencv Intel Corporation (BSD-3-Clause) @@ -818,13 +820,13 @@ Origin: NXP (BSD-3-Cluse) -------------------------------------------- Package: arm-computelibrary-imx.git -Version: 21.02 +Version: 22.05 Outgoing License: MIT License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: ARM Compute Library fork -Release Location: https://source.codeaurora.org/external/imx/arm-computelibrary-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/arm-computelibrary-imx -b lf-5.15.71-2.2.0 Origin: NXP (MIT) ARM Software (MIT) - https://github.com/ARM-software/ComputeLibrary @@ -832,9 +834,9 @@ Origin: NXP (MIT) Multimedia Packages -------------------------------------------- -Package: imx-codec-4.6.2.bin -Version: 4.6.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-codec-4.7.2.bin +Version: 4.7.2 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Multimedia Type of Content: binary @@ -849,9 +851,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: imx-parser-4.6.2.bin -Version: 4.6.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-parser-4.7.2.bin +Version: 4.7.2 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Multimedia Type of Content: binary @@ -862,13 +864,13 @@ Origin: NXP (proprietary) -------------------------------------------- Package: imx-gst1.0-plugin.git -Version: 4.6.2 +Version: git Outgoing License: LGPL-2.1 License File: COPYING-LGPL-2.1 Package Category: Multimedia Type of Content: source Description and comments: i.MX Gstreamer 1.0 plugins -Release Location: https://source.codeaurora.org/external/imx/imx-gst1.0-plugin -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/imx-gst1.0-plugin -b lf-5.15.71-2.2.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/ Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/ @@ -877,52 +879,52 @@ Origin: NXP (LGPL-2.1) -------------------------------------------- Package: gstreamer.git -Version: 1.18.0.imx -Outgoing License: LGPL-2.0 +Version: 1.20.3.imx +Outgoing License: LGPL-2.1 License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: Open Source Multimedia Farmework -Release Location: https://source.codeaurora.org/external/imx/gstreamer -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/gstreamer -b lf-5.15.71-2.2.0 Origin: NXP (LGPL-2.1) GStreamer (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gstreamer/ -------------------------------------------- Package: gst-plugins-good.git -Version: 1.18.0.imx +Version: 1.20.3.imx Outgoing License: LGPL-2.1 License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: Gstreamer plugins with good quality code and correct functionality -Release Location: https://source.codeaurora.org/external/imx/gst-plugins-good -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/gst-plugins-good -b lf-5.15.71-2.2.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/ -------------------------------------------- Package: gst-plugins-base.git -Version: 1.18.0.imx -Outgoing License: LGPL-2.0 +Version: 1.20.3.imx +Outgoing License: LGPL-2.1 License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: Collection of well-groomed and well-maintained Gstreamer plugins -Release Location: https://source.codeaurora.org/external/imx/gst-plugins-base -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/gst-plugins-base -b lf-5.15.71-2.2.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/ -------------------------------------------- Package: gst-plugins-bad.git -Version: 1.18.0.imx -Outgoing License: LGPL-2.0 -License File: COPYING.LIB +Version: 1.20.3.imx +Outgoing License: LGPL-2.1 +License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: Gstreamer plug-ins that aren't up to par compared to the rest. Close to good quality but missing something. -Release Location: https://source.codeaurora.org/external/imx/gst-plugins-bad -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/gst-plugins-bad -b lf-5.15.71-2.2.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Bad (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-bad/ @@ -930,7 +932,7 @@ Origin: NXP (LGPL-2.1) Package: imx-dspc-asrc-1.0.1.bin Version: 1.0.1 -Outgoing License: LA_OPT_NXP_Software_License v8 June 2019 - Additional distribution license granted - Section 2.3 applies +Outgoing License: LA_OPT_NXP_Software_License v8 June 2019 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Multimedia Type of Content: binary @@ -941,9 +943,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: imx-sw-pdm-1.0.1.bin -Version: 1.0.1 -Outgoing License: LA_OPT_NXP_Software_License v15 August 2020 - Additional distribution license granted - Section 2.3 applies +Package: imx-sw-pdm-1.0.2.bin +Version: 1.0.2 +Outgoing License: LA_OPT_NXP_Software_License v30 October 2021 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Multimedia Type of Content: binary @@ -954,13 +956,13 @@ Origin: NXP (proprietary) -------------------------------------------- Package: imx-vpuwrap.git -Version: 4.6.2 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Version: git +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: i.MX VPU wrapper library -Release Location: https://github.com/NXP/imx-vpuwrap.git -b lf-5.10.52-2.1.0 +Release Location: https://github.com/NXP/imx-vpuwrap.git -b lf-5.15.71-2.2.0 Origin: NXP (proprietary) sqlite (Public Domain) - http://www.hwaci.com/sw/sqlite/index.html @@ -968,7 +970,7 @@ Origin: NXP (proprietary) Package: imx-vpu-5.4.39.3.bin Version: 5.4.39.3 -Outgoing License: LA_OPT_NXP_Software_License v11 February 2020 - Additional distribution license granted - Section 2.3 applies +Outgoing License: LA_OPT_NXP_Software_License v11 February 2020 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Multimedia Type of Content: binary @@ -979,9 +981,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: imx-vpu-hantro-1.23.0.bin -Version: 1.23.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-vpu-hantro-1.27.0.bin +Version: 1.27.0 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Multimedia Type of Content: binary @@ -994,8 +996,8 @@ Origin: VeriSilicon Inc. (proprietary) -------------------------------------------- -Package: imx-vpu-hantro-daemon-1.1.0 -Version: 1.1.0 +Package: imx-vpu-hantro-daemon-1.1.5 +Version: 1.1.5 Outgoing License: MIT License License File: LICENSE.txt Package Category: Multimedia @@ -1008,9 +1010,9 @@ Origin: NXP (MIT) -------------------------------------------- -Package: imx-vpu-hantro-vc-1.5.0.bin -Version: 1.5.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx-vpu-hantro-vc-1.9.0.bin +Version: 1.9.0 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Multimedia Type of Content: binary @@ -1022,41 +1024,45 @@ Origin: VeriSilicon Inc. (proprietary) -------------------------------------------- -Package: imx-qtapplications-1.2.2-aarch32.bin -Version: 1.2.2 -Outgoing License: LA_OPT_BASE_LICENSE v26 June 2018 -License File: COPYING +Package: imx-alsa-plugins.git +Version: +Outgoing License: GPL-2.0 +License File: COPYING.GPL Package Category: Multimedia -Type of Content: binary -Description and comments: i.MX QT multimedia player application -Release Location: Mirror -Origin: NXP (proprietary) +Type of Content: source +Description and comments: Plugins for various audio libraries and sound servers +Release Location: https://github.com/nxp-imx/imx-alsa-plugins -b nxp/master +Origin: NXP (GPL-2.0) + Alsa Plugins (GPL-2.0+) - ftp://ftp.alsa-project.org/pub/plugins/ + GNU libtool (GPL-2.0+) http://www.gnu.org/software/libtool/ -------------------------------------------- -Package: imx-qtapplications-1.2.2-aarch64.bin -Version: 1.2.2 -Outgoing License: LA_OPT_BASE_LICENSE v26 June 2018 +Package: imx-dsp-2.0.2.bin +Version: 2.0.2 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: Multimedia Type of Content: binary -Description and comments: i.MX QT multimedia player application +Description and comments: Proprietary codecs and parsers Release Location: Mirror -Origin: NXP (proprietary) +Origin: NXP (proprietary) + Cadence (MIT) + Matt Redfearn (BSD-3-clause) -------------------------------------------- -Package: imx-alsa-plugins.git -Version: -Outgoing License: GPL-2.0 -License File: COPYING.GPL +Package: imx-dsp-codec-ext-2.0.2.bin +Version: 2.0.2 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies +License File: COPYING Package Category: Multimedia -Type of Content: source -Description and comments: Plugins for various audio libraries and sound servers -Release Location: https://source.codeaurora.org/external/imx/imx-alsa-plugins -b nxp/master -Origin: NXP (GPL-2.0) - Alsa Plugins (GPL-2.0+) - ftp://ftp.alsa-project.org/pub/plugins/ - GNU libtool (GPL-2.0+) http://www.gnu.org/software/libtool/ +Type of Content: binary +Description and comments: Proprietary codecs and parsers +Release Location: Mirror +Origin: NXP (proprietary) + autoconf - Free Software Foundation (FSF All Permissive License) + X Consortium (MIT) -------------------------------------------- @@ -1067,16 +1073,32 @@ License File: LICENSE Package Category: Multimedia Type of Content: source Description and comments: NXP Audio-Front-end is the software wrapper for ALSA -Release Location: https://source.codeaurora.org/external/imx/nxp-afe -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/nxp-afe -b lf-5.15.71-2.2.0 Origin: NXP (BSD-3-Clause) -------------------------------------------- + +Package: imx-voiceUI.git +Version: 2.0 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies +License File: EULA.txt +Package Category: Multimedia +Type of Content: source +Description and comments: NXP RetuneDSP Voice Seeker +Release Location: https://github.com/nxp-imx/imx-voiceUI -b lf-5.15.71-2.2.0 +Origin: NXP (Proprietary) + Ne10 (BSD-3-Clause) - https://github.com/projectNe10/Ne10 + pugixml (MIT) - https://github.com/zeux/pugixml + ARM ComputeLibrary (MIT) - https://github.com/ARM-software/ComputeLibrary + CMSIS-5 (Apache-2.0) - https://github.com/ARM-software/CMSIS_5 + +-------------------------------------------- M4 Processor Packages -------------------------------------------- -Package: imx7ulp-m4-demo-2.10.0.bin -Version: 2.10.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: imx7ulp-m4-demo-2.12.1.bin +Version: 2.12.1 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: M4_Processor Type of Content: binary @@ -1090,7 +1112,7 @@ Origin: NXP (proprietary) Package: imx8dxl-m4-demo-2.9.0.bin Version: 2.9.0 -Outgoing License: LA_OPT_NXP_Software_License v17 October 2020 - Production Use - Section 2.3 applies +Outgoing License: LA_OPT_NXP_Software_License v17 October 2020 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: M4_Processor Type of Content: binary @@ -1102,9 +1124,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: imx8mm-m4-demo-2.10.0.bin -Version: 2.10.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Production Use - Section 2.3 applies +Package: imx8mm-m4-demo-2.12.1.bin +Version: 2.12.1 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: M4_Processor Type of Content: binary @@ -1116,9 +1138,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: imx8mq-m4-demo-2.10.0.bin -Version: 2.10.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Production Use - Section 2.3 applies +Package: imx8mq-m4-demo-2.12.1.bin +Version: 2.12.1 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: M4_Processor Type of Content: binary @@ -1132,7 +1154,7 @@ Origin: NXP (proprietary) Package: imx8qm-m4-demo-2.9.0.bin Version: 2.9.0 -Outgoing License: LA_OPT_NXP_Software_License v19 February 2021 - Production Use - Section 2.3 applies +Outgoing License: LA_OPT_NXP_Software_License v19 February 2021 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: M4_Processor Type of Content: binary @@ -1146,7 +1168,7 @@ Origin: NXP (proprietary) Package: imx8qx-m4-demo-2.9.0.bin Version: 2.9.0 -Outgoing License: LA_OPT_NXP_Software_License v19 February 2021 - Production Use - Section 2.3 applies +Outgoing License: LA_OPT_NXP_Software_License v19 February 2021 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: M4_Processor Type of Content: binary @@ -1160,9 +1182,9 @@ Origin: NXP (proprietary) M7 Processor Packages -------------------------------------------- -Package: imx8mn-m7-demo-2.10.0.bin -Version: 2.10.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Production Use - Section 2.3 applies +Package: imx8mn-m7-demo-2.12.1.bin +Version: 2.12.1 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: M7_Processor Type of Content: binary @@ -1174,9 +1196,9 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: imx8mnddr3l-m7-demo-2.10.0.bin -Version: 2.10.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Production Use - Section 2.3 applies +Package: imx8mnddr3l-m7-demo-2.12.1.bin +Version: 2.12.1 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: M7_Processor Type of Content: binary @@ -1188,52 +1210,62 @@ Origin: NXP (proprietary) -------------------------------------------- -Package: imx8mp-m7-demo-2.10.0.bin -Version: 2.10.0 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Production Use - Section 2.3 applies +Package: imx8mp-m7-demo-2.12.1.bin +Version: 2.12.1 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: M7_Processor Type of Content: binary Description and comments: i.MX MCUXpresso SDK demo image on Cortex-M7 core Release Location: Mirror Origin: NXP (proprietary) - ARM LIMITED (BSD-3-Clause) + CMSIS Core Header files - ARM Limited (BSD-3-clause) - http://silver.arm.com + CMSIS DSP Library - ARM Limited (BSD-3-clause) - http://silver.arm.com Real Time Engineers, Ltd (MIT) - https://aws.amazon.com/freertos/ Mentor Graphics, Ltd. (BSD-3-Clause) - https://github.com/OpenAMP/open-amp/ -------------------------------------------- -MachineLearning Packages +M33 Processor Packages -------------------------------------------- -Package: armnn.git -Version: 21.02 -Outgoing License: MIT -License File: LICENSE -Package Category: MachineLearning -Type of Content: source -Description and comments: ARM Neural Network SDK -Release Location: https://source.codeaurora.org/external/imx/armnn-imx -b lf-5.10.52-2.1.0 -Origin: NXP (MIT) - armnn (MIT) - https://github.com/ARM-software/armnn +Package: imx8ulp-m33-demo-2.13.0.bin +Version: 2.13.0 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies +License File: COPYING +Package Category: M33_Processor +Type of Content: binary +Description and comments: i.MX MCUXpresso SDK demo image on Cortex-M33 core +Release Location: Mirror +Origin: NXP (proprietary) + CMSIS Core Header files - ARM Limited (BSD-3-clause) - http://silver.arm.com + CMSIS DSP Library - ARM Limited (BSD-3-clause) - http://silver.arm.com + Real Time Engineers, Ltd (MIT) - https://aws.amazon.com/freertos/ + Mentor Graphics, Ltd. (BSD-3-Clause) - https://github.com/OpenAMP/open-amp/ -------------------------------------------- -Package: coral-posenet-imx.git -Version: -Outgoing License: Apache-2.0 -License File: LICENSE -Package Category: MachineLearning -Type of Content: source -Description and comments: Google Coral Edge TPU Posenet Library -Release Location: https://source.codeaurora.org/external/imx/coral-posenet-imx -b lf-5.10.52-2.1.0 -Origin: NXP (LGPL-2.1) - Google LLC - Google Coral Edge Project Posenet (Apache-2.0) https://github.com/google-coral/project-posenet/ +Package: imx93-m33-demo-2.13.0.bin +Version: 2.13.0 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies +License File: COPYING +Package Category: M33_Processor +Type of Content: binary +Description and comments: i.MX MCUXpresso SDK demo image on Cortex-M33 core +Release Location: Mirror +Origin: NXP (proprietary) + CMSIS Core Header files - ARM Limited (BSD-3-clause) - http://silver.arm.com + CMSIS DSP Library - ARM Limited (BSD-3-clause) - http://silver.arm.com + Real Time Engineers, Ltd (MIT) - https://aws.amazon.com/freertos/ + Mentor Graphics, Ltd. (BSD-3-Clause) - https://github.com/OpenAMP/open-amp/ + KEYnetik, Inc (Proprietary) -------------------------------------------- +MachineLearning Packages +-------------------------------------------- -Package: deepview-rt-2.4.28-aarch64.bin -Version: 2.4.28-aarch64 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - No distribution license granted - Section 2.2 applies +Package: deepview-rt-2.4.46-aarch64.bin +Version: 2.4.46-aarch64 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 No distribution license granted - Section 2.2 applies License File: COPYING Package Category: MachineLearning Type of Content: binary @@ -1243,29 +1275,18 @@ Origin: Au-Zone Technologies (proprietary) -------------------------------------------- -Package: deepview-rt-examples-1.1.bin -Version: 1.1 -Outgoing License: LA_OPT_NXP_Software_License v27 July 2021 - Additional distribution license granted - Section 2.3 applies +Package: deepview-rt-examples-1.6.bin +Version: 1.6 +Outgoing License: LA_OPT_NXP_Software_License v39 August 2022 Additional distribution license granted - Section 2.3 applies License File: COPYING Package Category: MachineLearning Type of Content: binary Description and comments: DeepViewRT Examples Release Location: Mirror -Origin: Au-Zone Technologies (proprietary) - Viktor Kutuzov (MIT) - --------------------------------------------- - -Package: eiq-apps-imx -Version: -Outgoing License: LGPL-2.1 -License File: COPYING-LGPL2.1 -Package Category: MachineLearning -Type of Content: source -Description and comments: Gstreamer Neural Network inference Demo -Release Location: https://source.codeaurora.org/external/imx/eiq-apps-imx -b lf-5.10.52-2.1.0 -Origin: NXP (LGPL-2.1) - Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/ +Origin: Au-Zone Technologies (proprietary) + mman-win32 (Author: Viktor Kutuzov, License: MIT) - https://github.com/klauspost/mman-win32 + panda.jpg (Author: Shizhao, License: CC BY-SA 3.0) - https://commons.wikimedia.org/wiki/File:Giant_Panda_in_Beijing_Zoo_1.JPG + horse.jpg (public domain) - https://commons.wikimedia.org/wiki/File:Horsescd1l-095.jpg -------------------------------------------- @@ -1276,20 +1297,78 @@ License File: LICENSE Package Category: MachineLearning Type of Content: source Description and comments: Open Deep Learning Compiler Stack -Release Location: https://source.codeaurora.org/external/imx/eiq-tvm-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/eiq-tvm-imx -b lf-5.15.71-2.2.0 Origin: NXP (Apache-2.0) Apache TVM (Apache-2.0) - https://github.com/apache/tvm -------------------------------------------- +Package: ethos-u-vela.git +Version: 3.5.0 +Outgoing License: Apache-2.0 +License File: LICENSE.txt +Package Category: MachineLearning +Type of Content: source +Description and comments: Tool to compile a TensorFlow Lite for Microcontrollers neural network model +Release Location: https://github.com/nxp-imx/ethos-u-vela -b lf-5.15.71-2.2.0 +Origin: NXP (BSD-3-Clause) + ARM Limited ethos-u-vela v22.02 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-vela.git + FlatBuffers (Apache-2.0) + +-------------------------------------------- + +Package: ethos-u-driver-stack-imx.git +Version: 22.08 +Outgoing License: Apache-2.0 +License File: LICENSE-APACHE-2.0.txt +Package Category: MachineLearning +Type of Content: source +Description and comments: ethos-u-driver-stack is the user space driver library for ethos-u NPU on iMX93 platform +Release Location: https://github.com/nxp-imx/ethos-u-driver-stack-imx -b lf-5.15.71-2.2.0 +Origin: NXP (BSD-3-Clause) + ARM Limited ethos-u-linux-driver-stack v22.02 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-linux-driver-stack.git + FlatBuffers (Apache-2.0) + Linux Kernel Header file - ARM Limited (GPL-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-linux-driver-stack.git + +-------------------------------------------- + +Package: ethos-u-firmware.git +Version: 22.08 +Outgoing License: Apache-2.0 +License File: LICENSE-APACHE-2.0.txt +Package Category: MachineLearning +Type of Content: source +Description and comments: ethos-u-firmware is the binary NPU driver running on cortex-m33 core of NXP iMX93 platform +Release Location: https://github.com/nxp-imx/ethos-u-firmware -b lf-5.15.71-2.2.0 +Origin: NXP (BSD-3-Clause) + ARM Limited ethos-u-linux-driver-stack v22.02 (Apache-2.0) - https://git.mlplatform.org/ml/ethos-u/ethos-u-core-software.git + Amazon.com, Inc. FreeRTOS (MIT) - https://git.mlplatform.org/ml/ethos-u/ethos-u-core-software.git/tree/rtos/freertos_config/FreeRTOSConfig.h.in + +-------------------------------------------- + +Package: nnshark.git +Version: 2021.10.imx +Outgoing License: LGPL-2.1 +License File: COPYING.LESSER +Package Category: MachineLearning +Type of Content: source +Description and comments: A GStreamer NNstreamer pipelines real-time profiling plugin +Release Location: https://github.com/nxp-imx/nnshark -b lf-5.15.71-2.2.0 +Origin: NXP (LGPL-2.1) + GstShark (LGPL-2.1) - https://github.com/RidgeRun/gst-shark + + Separate Component: Eclipse Tools (EPL-1.0) - These run separately on windows. + +-------------------------------------------- + Package: onnxruntime-imx.git -Version: 1.8.1 +Version: 1.10.0 Outgoing License: MIT License File: LICENSE Package Category: MachineLearning Type of Content: source Description and comments: Onnxruntime cross-platform scoring engine -Release Location: https://source.codeaurora.org/external/imx/onnxruntime-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/onnxruntime-imx -b lf-5.15.71-2.2.0 Origin: NXP (MIT) Microsoft/onnxruntime (MIT) - https://github.com/Microsoft/onnxruntime Google's Protocol Buffer (BSD-3-clause) - https://tracker.debian.org/pkg/protobuf @@ -1304,46 +1383,46 @@ License File: LICENSE Package Category: MachineLearning Type of Content: source Description and comments: Tensors and Dynamic neural networks in Python with strong GPU acceleration -Release Location: https://github.com/NXPmicro/pytorch-release -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/pytorch-release -b lf-5.15.71-2.2.0 Origin: NXP (BSD-3-Clause) pytorch (BSD-3-clause) - https://github.com/pytorch/pytorch -------------------------------------------- -Package: torchvision.git -Version: -Outgoing License: BSD-3-Clause +Package: tensorflow-imx.git +Version: 2.9.1 +Outgoing License: Apache-2.0 License File: LICENSE Package Category: MachineLearning Type of Content: source -Description and comments: The torchvision package consists of popular datasets model architectures and common image transformations for computer vision -Release Location: -Origin: NXP (BSD-3-Clause) - pytorch (BSD-3-clause) - https://github.com/pytorch/pytorch +Description and comments: TensorFlow Lite C++ Library +Release Location: https://github.com/nxp-imx/tensorflow-imx -b lf-5.15.71-2.2.0 +Origin: NXP (Apache-2.0) + TensorFlow (Apache-2.0) - https://github.com/tensorflow/tensorflow/ -------------------------------------------- -Package: tensorflow-imx.git -Version: 2.5.0 -Outgoing License: Apache-2.0 +Package: tflite-vx-delegate-imx.git +Version: 2.9.1 +Outgoing License: MIT License File: LICENSE Package Category: MachineLearning Type of Content: source -Description and comments: TensorFlow Lite C++ Library -Release Location: https://source.codeaurora.org/external/imx/tensorflow-imx -b lf-5.10.52-2.1.0 -Origin: NXP (Apache-2.0) - TensorFlow (Apache-2.0) - https://github.com/tensorflow/tensorflow/ +Description and comments: TensorFlow Lite VX Delegate +Release Location: https://github.com/nxp-imx/tflite-vx-delegate-imx -b lf-5.15.71-2.2.0 +Origin: VeriSilicon Inc. (Apache-2.0) - https://github.com/VeriSilicon/tflite-vx-delegate.git + The TensorFlow Authors (Apache-2.0) - https://cs.opensource.google/tensorflow/tensorflow/+/master:tensorflow/lite/examples/minimal/ -------------------------------------------- Package: tim-vx-imx.git -Version: 1.1.32 +Version: 1.1.42 Outgoing License: MIT License File: LICENSE Package Category: MachineLearning Type of Content: source Description and comments: Tensor Interface Module for OpenVX -Release Location: https://github.com/nxp/tim-vx-imx -b lf-5.10.52-2.1.0 +Release Location: https://github.com/nxp-imx/tim-vx-imx -b lf-5.15.71-2.2.0 Origin: Vivante Corporation (MIT) The Khronos Group Inc. (Apache-2.0) - https://www.khronos.org/ The Android Open Source Project (Apache 2.0) - https://developer.android.com/index.html @@ -1352,8 +1431,8 @@ Origin: Vivante Corporation (MIT) Tools Packages -------------------------------------------- -Package: VeriSiliconTool-6.4.3.p2.2.tgz -Version: 6.4.3.p2.2 +Package: VivanteIDE-6.4.3.p4.2.tgz +Version: 6.4.3.p4.2 Outgoing License: VeriSilicon License License File: Package Category: Tools @@ -1371,7 +1450,7 @@ License File: LICENSE Package Category: Tools Type of Content: source Description and comments: NXP I.MX Chip image deploy tools. Use uuu. -Release Location: ssh://git@bitbucket.sw.nxp.com/imx/mfgtools-rel.git -b master +Release Location: https://github.com/NXPmicro/mfgtools -b master Origin: NXP (BSD-3-clause) zlib (zlib) - https://github.com/madler/zlib libusb (LGPL-2.1) [libusb-1.0.dll] [dynamic link] - https://github.com/libusb/libusb @@ -1381,13 +1460,13 @@ Origin: NXP (BSD-3-clause) -------------------------------------------- Package: bcu.git -Version: 1.1.35 +Version: 1.1.52 Outgoing License: BSD-3-Clause License File: LICENSE Package Category: Tools Type of Content: source Description and comments: NXP I.MX Chip image deploy tools. Use bcu. -Release Location: https://github.com/NXPmicro/bcu -b master +Release Location: https://github.com/NXPmicro/bcu.git -b master Origin: NXP (BSD-3-Clause) -------------------------------------------- diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass index 9fcf37be..6cb0c0a9 100644 --- a/classes/fsl-dynamic-packagearch.bbclass +++ b/classes/fsl-dynamic-packagearch.bbclass @@ -54,6 +54,17 @@ python __anonymous () { if not machine_socarch in cur_package_archs: d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % machine_socarch) + multilib_variants = (d.getVar("MULTILIB_VARIANTS") or "").split() + for variant in multilib_variants: + defaulttune = d.getVar("DEFAULTTUNE:virtclass-multilib-" + variant) + if defaulttune: + package_extra_archs_tune_archs = (d.getVar("PACKAGE_EXTRA_ARCHS:tune-" + defaulttune) or "").split() + arch_suffix = d.getVar("MACHINE_SOCARCH_SUFFIX") + for arch in package_extra_archs_tune_archs: + socarch = arch + arch_suffix + if not socarch in cur_package_archs: + d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % socarch ) + if d.getVar("TUNE_ARCH") == "arm": # For ARM we have two possible machine_socarch values, one for the arm and one for the thumb instruction set # add the other value to extra archs also, so that a image recipe searches both for packages. diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index 5e66a1fc..f7457f24 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass @@ -39,6 +39,18 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V24 = "417b82f17fc02b88125331ed FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V24.1 = "b3b0bab6ff55420d043cf1652c52d788" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V25 = "f35df765ff17e69043ea21f350e3229c" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V27 = "e565271ec9a80ce47abbddc4bffe56fa" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V29 = "28241cb895217d7946e40e7227136d02" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V30 = "03bcadc8dc0a788f66ca9e2b89f56c6f" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V31 = "dedee5689786754f61ea3a76035c8a81" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V32 = "17d2319de7baa686e8a755ba58a9ebf5" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V33 = "e4098ac4459cb81b07d3f0c22b3e8370" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V34 = "be5ff43682ed6c57dfcbeb97651c2829" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V35 = "d3c315c6eaa43e07d8c130dc3a04a011" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V36 = "b54da624b8d2ffe8a3b47757da48e60f" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V37 = "37cb2d8c2bcf8bf2fbe0366d5d928c29" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V38 = "65c483bb431ccd9a1820e6872c604771" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V39 = "5a0bf11f745e68024f37b4724a5364fe" + FSL_EULA_FILE_MD5SUMS = " \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10} \ @@ -73,11 +85,22 @@ FSL_EULA_FILE_MD5SUMS = " \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V24.1} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V25} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V27} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V29} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V30} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V31} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V32} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V33} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V34} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V35} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V36} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V37} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V38} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V39} \ " # The checksum for the EULA in the layer FSL_EULA_FILE_MD5SUM ?= \ - "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V27}" + "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V39}" LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}" LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE" @@ -90,13 +113,34 @@ do_fetch:prepend() { bb.fatal("The recipe LICENSE should include Proprietary but is " + d.getVar("LICENSE") + ".") } +do_unpack[vardepsexclude] += "FSL_EULA_FILE" +python do_unpack() { + eula = d.getVar('ACCEPT_FSL_EULA') + eula_file = d.getVar('FSL_EULA_FILE') + pkg = d.getVar('PN') + if eula == None: + bb.fatal("To use '%s' you need to accept the Freescale EULA at '%s'. " + "Please read it and in case you accept it, write: " + "ACCEPT_FSL_EULA = \"1\" in your local.conf." % (pkg, eula_file)) + elif eula == '0': + bb.fatal("To use '%s' you need to accept the Freescale EULA." % pkg) + else: + bb.note("Freescale EULA has been accepted for '%s'" % pkg) + + try: + bb.build.exec_func('base_do_unpack', d) + except: + raise + + bb.build.exec_func('fsl_bin_do_unpack', d) +} + python fsl_bin_do_unpack() { src_uri = (d.getVar('SRC_URI') or "").split() if len(src_uri) == 0: return localdata = bb.data.createCopy(d) - bb.data.update_data(localdata) rootdir = localdata.getVar('WORKDIR', True) fetcher = bb.fetch2.Fetch(src_uri, localdata) @@ -114,16 +158,28 @@ python fsl_bin_do_unpack() { bb.note("Handling file '%s' as a Freescale EULA-licensed archive." % url.basename) cmd = "sh %s --auto-accept --force" % (url.localpath) bb.fetch2.runfetchcmd(cmd, d, quiet=True, workdir=rootdir) + if not found: + bb.fatal("The recipe inherits 'fsl-eula-unpack.bbclass' but does not mark any URL in SRC_URI with the option 'fsl-eula=true'") # Check for two EULAs, one from the layer and one from the package bb.note("Checking LIC_FILES_CHKSUM for Freescale EULA consistency...") if found > 1: bb.warn("The package contains multiple Freescale EULA-licensed archives. The consistency logic may not be able to detect a EULA problem.") + (layer_license, licenses, md5sums, found_layer_licenses, found_package_licenses) = find_nxp_eula_licenses(d) + if not found_layer_licenses: + bb.fatal("The Freescale layer EULA '%s' is not listed in LIC_FILES_CHKSUM '%s'." + % (layer_license, licenses)) + if not found_package_licenses: + bb.fatal("A valid package EULA with md5sum in %s was not found in LIC_FILES_CHKSUM '%s'." + % (md5sums.split(), licenses)) +} + +def find_nxp_eula_licenses(d): layer_license = d.getVar('LIC_FILES_CHKSUM_LAYER') licenses = d.getVar('LIC_FILES_CHKSUM') or "" md5sums = d.getVar('FSL_EULA_FILE_MD5SUMS') or "" - found_layer_license = False - found_package_license = False + found_layer_licenses = "" + found_package_licenses = "" for license in licenses.split(): try: (method, host, path, user, pswd, parm) = bb.fetch.decodeurl(license) @@ -133,38 +189,8 @@ python fsl_bin_do_unpack() { bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), license)) if license == layer_license: bb.note("Found Freescale EULA for the layer %s." % license) - found_layer_license = True + found_layer_licenses += license elif parm.get('md5') in md5sums: bb.note("Found Freescale EULA for the package %s." % license) - found_package_license = True - if not found_layer_license: - bb.fatal("The Freescale layer EULA '%s' is not listed in LIC_FILES_CHKSUM '%s'." - % (layer_license, licenses)) - if not found_package_license: - bb.fatal("A valid package EULA with md5sum in %s was not found in LIC_FILES_CHKSUM '%s'." - % (md5sums.split(), licenses)) -} - -python do_unpack() { - eula = d.getVar('ACCEPT_FSL_EULA') - eula_file = d.getVar('FSL_EULA_FILE') - pkg = d.getVar('PN') - if eula == None: - bb.fatal("To use '%s' you need to accept the Freescale EULA at '%s'. " - "Please read it and in case you accept it, write: " - "ACCEPT_FSL_EULA = \"1\" in your local.conf." % (pkg, eula_file)) - elif eula == '0': - bb.fatal("To use '%s' you need to accept the Freescale EULA." % pkg) - else: - bb.note("Freescale EULA has been accepted for '%s'" % pkg) - - # The binary unpack needs to be done first so 'S' is valid - bb.build.exec_func('fsl_bin_do_unpack', d) - - try: - bb.build.exec_func('base_do_unpack', d) - except: - raise -} - -do_unpack[vardepsexclude] += "FSL_EULA_FILE" + found_package_licenses += license + return (layer_license, licenses, md5sums, found_layer_licenses, found_package_licenses) diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass index c782a3d3..d4322e25 100644 --- a/classes/fsl-kernel-localversion.bbclass +++ b/classes/fsl-kernel-localversion.bbclass @@ -12,34 +12,25 @@ SCMVERSION ??= "y" LOCALVERSION ??= "+fslc" -kernel_conf_variable() { - CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" - if test "$2" = "n" - then - echo "# CONFIG_$1 is not set" >> ${B}/.config - else - echo "CONFIG_$1=$2" >> ${B}/.config - fi -} +# LINUX_VERSION_EXTENSION is used as CONFIG_LOCALVERSION by kernel-yocto class +LINUX_VERSION_EXTENSION ?= "${LOCALVERSION}" do_kernel_localversion[dirs] += "${S} ${B}" do_kernel_localversion() { - mkdir -p ${B} - echo "" > ${B}/.config - CONF_SED_SCRIPT="" - kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\"" - if [ "${SCMVERSION}" = "y" ]; then - kernel_conf_variable LOCALVERSION_AUTO y + # Fallback for recipes not able to use LINUX_VERSION_EXTENSION + if [ "${@bb.data.inherits_class('kernel-yocto', d)}" = "False" ]; then + echo "CONFIG_LOCALVERSION=${LOCALVERSION}" >> ${B}/.config fi - sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config' - if [ "${SCMVERSION}" = "y" ]; then # Add GIT revision to the local version head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` printf "%s%s" +g $head > ${S}/.scmversion + + sed -i -e "/CONFIG_LOCALVERSION_AUTO[ =]/d" ${B}/.config + echo "CONFIG_LOCALVERSION_AUTO=y" >> ${B}/.config fi } -addtask kernel_localversion before do_configure after do_patch do_kernel_metadata +addtask kernel_localversion before do_configure after do_patch do_kernel_configme diff --git a/classes/fsl-vivante-kernel-driver-handler.bbclass b/classes/fsl-vivante-kernel-driver-handler.bbclass index 54954aab..c226b0ab 100644 --- a/classes/fsl-vivante-kernel-driver-handler.bbclass +++ b/classes/fsl-vivante-kernel-driver-handler.bbclass @@ -41,9 +41,9 @@ python fsl_vivante_kernel_driver_handler () { return if use_vivante_kernel_driver_module != "1": - e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') - e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') - e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') + e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv') + e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv') + e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv') } addhandler fsl_vivante_kernel_driver_handler diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index cdd16a66..cdfbb97e 100644 --- a/classes/image_types_fsl.bbclass +++ b/classes/image_types_fsl.bbclass @@ -37,7 +37,7 @@ do_image_wic[depends] += " \ " # We need to apply a fixup inside of the partition table -IMAGE_CMD:wic:append:mxs() { +IMAGE_CMD:wic:append:mxs-generic-bsp() { # Change partition type for mxs processor family bbnote "Setting partition type to 0x53 as required for mxs' SoC family." echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass index 3ffa7cbd..aa897045 100644 --- a/classes/imx-boot-container.bbclass +++ b/classes/imx-boot-container.bbclass @@ -20,41 +20,47 @@ # by variable UBOOT_PROVIDES_BOOT_CONTAINER, which is defined in the # base machine include file (imx-base.inc), and is set to "1" when the # 'imx-boot-container' is present in MACHINEOVERRIDES. +# +# NOTE: A backwards-compatible symlink is added for 'flash.bin', named +# 'imx-boot', during the deployment task. # Define ATF binary file to be deployed to the U-Boot build folder ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin" ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" +IMX_BOOT_CONTAINER_FIRMWARE_SOC = "" +IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx8mq-generic-bsp = " \ + signed_dp_imx8m.bin \ + signed_hdmi_imx8m.bin \ +" +IMX_BOOT_CONTAINER_FIRMWARE ?= " \ + ${IMX_BOOT_CONTAINER_FIRMWARE_SOC} \ + ${DDR_FIRMWARE_NAME} \ +" + # This package aggregates output deployed by other packages, so set the # appropriate dependencies for populate binaries task do_resolve_and_populate_binaries[depends] += " \ ${@' '.join('%s:do_deploy' % r for r in '${IMX_EXTRA_FIRMWARE}'.split() )} \ - imx-atf:do_deploy \ + ${IMX_DEFAULT_ATF_PROVIDER}:do_deploy \ ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os:do_deploy', '', d)} \ " -# Append make flags to include ATF load address -EXTRA_OEMAKE += "ATF_LOAD_ADDR=${ATF_LOAD_ADDR}" - # Define an additional task that collects binary output from dependent packages # and deploys them into the U-Boot build folder do_resolve_and_populate_binaries() { - if [ ! -n "${ATF_LOAD_ADDR}" ]; then - bberror "ATF_LOAD_ADDR is undefined, result binary would be unusable!" - fi - 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 - for ddr_firmware in ${DDR_FIRMWARE_NAME}; do - bbnote "Copy ddr_firmware: ${ddr_firmware} from ${DEPLOY_DIR_IMAGE} -> ${B}/${config}/${ddr_firmware_name}" - cp ${DEPLOY_DIR_IMAGE}/${ddr_firmware} ${B}/${config}/ + for firmware in ${IMX_BOOT_CONTAINER_FIRMWARE}; do + bbnote "Copy firmware: ${firmware} from ${DEPLOY_DIR_IMAGE} -> ${B}/${config}/" + cp ${DEPLOY_DIR_IMAGE}/${firmware} ${B}/${config}/ done if [ -n "${ATF_MACHINE_NAME}" ]; then - cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${B}/${config}/bl31.bin + cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${B}/${config}/bl31.bin else bberror "ATF binary is undefined, result binary would be unusable!" fi @@ -85,7 +91,6 @@ do_deploy:append() { j=$(expr $j + 1); if [ $j -eq $i ] then - install -m 0644 ${B}/${config}/u-boot.itb ${DEPLOYDIR}/u-boot.itb-${MACHINE}-${type} install -m 0644 ${B}/${config}/flash.bin ${DEPLOYDIR}/flash.bin-${MACHINE}-${type} # When there's more than one word in UBOOT_CONFIG, # this will overwrite the links created in @@ -94,8 +99,8 @@ do_deploy:append() { # word in UBOOT_CONFIG. This is also how all other # artifacts handled by oe-core's u-boot.inc are # treated. - ln -sf u-boot.itb-${MACHINE}-${type} u-boot.itb ln -sf flash.bin-${MACHINE}-${type} flash.bin + ln -sf flash.bin-${MACHINE}-${type} imx-boot fi done unset j diff --git a/classes/kernel-itbimage.bbclass b/classes/kernel-itbimage.bbclass deleted file mode 100644 index 51a87319..00000000 --- a/classes/kernel-itbimage.bbclass +++ /dev/null @@ -1,493 +0,0 @@ -inherit kernel-uboot uboot-sign - -python __anonymous () { - kerneltypes = d.getVar('KERNEL_IMAGETYPES') or "" - if 'itbImage' in kerneltypes.split(): - depends = d.getVar("DEPENDS") - depends = "%s u-boot-mkimage-native dtc-native" % depends - d.setVar("DEPENDS", depends) - - if d.getVar("UBOOT_ARCH") == "x86": - replacementtype = "bzImage" - else: - replacementtype = "vmlinux" - - # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal - # to kernel.bbclass . We have to override it, since we pack zImage - # (at least for now) into the fitImage . - typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or "" - if 'itbImage' in typeformake.split(): - d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('itbImage', replacementtype)) - - image = d.getVar('INITRAMFS_IMAGE') - if image: - d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') - def extraimage_getdepends(task): - deps = "" - for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): - deps += " %s:%s" % (dep, task) - return deps - - d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_populate_lic')) - d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends('do_populate_sysroot')) - - # Verified boot will sign the fitImage and append the public key to - # U-Boot dtb. We ensure the U-Boot dtb is deployed before assembling - # the fitImage: - if d.getVar('UBOOT_SIGN_ENABLE') == "1": - uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot' - d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' % uboot_pn) -} - -# Options for the device tree compiler passed to mkimage '-D' feature: -UBOOT_MKIMAGE_DTCOPTS ??= "" - -# -# Emit the fitImage ITS header -# -# $1 ... .its filename -fitimage_emit_fit_header() { - cat << EOF >> ${1} -/dts-v1/; - -/ { - description = "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}"; - #address-cells = <1>; -EOF -} - -# -# Emit the fitImage section bits -# -# $1 ... .its filename -# $2 ... Section bit type: imagestart - image section start -# confstart - configuration section start -# sectend - section end -# fitend - fitimage end -# -fitimage_emit_section_maint() { - case $2 in - imagestart) - cat << EOF >> ${1} - - images { -EOF - ;; - confstart) - cat << EOF >> ${1} - - configurations { -EOF - ;; - sectend) - cat << EOF >> ${1} - }; -EOF - ;; - fitend) - cat << EOF >> ${1} -}; -EOF - ;; - esac -} - -# -# Emit the fitImage ITS kernel section -# -# $1 ... .its filename -# $2 ... Image counter -# $3 ... Path to kernel image -# $4 ... Compression type -fitimage_emit_section_kernel() { - - kernel_csum="sha1" - - ENTRYPOINT=${UBOOT_ENTRYPOINT} - if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then - ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ - awk '$4=="${UBOOT_ENTRYSYMBOL}" {print $2}'` - fi - - cat << EOF >> ${1} - kernel@${2} { - description = "Linux kernel"; - data = /incbin/("${3}"); - type = "kernel"; - arch = "${UBOOT_ARCH}"; - os = "linux"; - compression = "${4}"; - load = <${UBOOT_LOADADDRESS}>; - entry = <${ENTRYPOINT}>; - hash@1 { - algo = "${kernel_csum}"; - }; - }; -EOF -} - -# -# Emit the fitImage ITS DTB section -# -# $1 ... .its filename -# $2 ... Image counter -# $3 ... Path to DTB image -fitimage_emit_section_dtb() { - - dtb_csum="sha1" - - if [ -n "${DTB_LOAD}" ]; then - dtb_loadline="load = <${DTB_LOAD}>;" - fi - - cat << EOF >> ${1} - fdt@${2} { - description = "Flattened Device Tree blob"; - data = /incbin/("${3}"); - type = "flat_dt"; - arch = "${UBOOT_ARCH}"; - compression = "none"; - ${dtb_loadline} - hash@1 { - algo = "${dtb_csum}"; - }; - }; -EOF -} - -# -# Emit the fitImage ITS setup section -# -# $1 ... .its filename -# $2 ... Image counter -# $3 ... Path to setup image -fitimage_emit_section_setup() { - - setup_csum="sha1" - - cat << EOF >> ${1} - setup@${2} { - description = "Linux setup.bin"; - data = /incbin/("${3}"); - type = "x86_setup"; - arch = "${UBOOT_ARCH}"; - os = "linux"; - compression = "none"; - load = <0x00090000>; - entry = <0x00090000>; - hash@1 { - algo = "${setup_csum}"; - }; - }; -EOF -} - -# -# Emit the fitImage ITS ramdisk section -# -# $1 ... .its filename -# $2 ... Image counter -# $3 ... Path to ramdisk image -fitimage_emit_section_ramdisk() { - - ramdisk_csum="sha1" - ramdisk_ctype="none" - ramdisk_loadline="" - ramdisk_entryline="" - - if [ -n "${UBOOT_RD_LOADADDRESS}" ]; then - ramdisk_loadline="load = <${UBOOT_RD_LOADADDRESS}>;" - fi - if [ -n "${UBOOT_RD_ENTRYPOINT}" ]; then - ramdisk_entryline="entry = <${UBOOT_RD_ENTRYPOINT}>;" - fi - - case $3 in - *.gz) - ramdisk_ctype="gzip" - ;; - *.bz2) - ramdisk_ctype="bzip2" - ;; - *.lzma) - ramdisk_ctype="lzma" - ;; - *.lzo) - ramdisk_ctype="lzo" - ;; - *.lz4) - ramdisk_ctype="lz4" - ;; - esac - - cat << EOF >> ${1} - ramdisk@${2} { - description = "${INITRAMFS_IMAGE}"; - data = /incbin/("${3}"); - type = "ramdisk"; - arch = "${UBOOT_ARCH}"; - os = "linux"; - compression = "${ramdisk_ctype}"; - ${ramdisk_loadline} - ${ramdisk_entryline} - hash@1 { - algo = "${ramdisk_csum}"; - }; - }; -EOF -} - -# -# Emit the fitImage ITS configuration section -# -# $1 ... .its filename -# $2 ... Linux kernel ID -# $3 ... DTB image name -# $4 ... ramdisk ID -# $5 ... config ID -# $6 ... default flag -fitimage_emit_section_config() { - - conf_csum="sha1" - if [ -n "${UBOOT_SIGN_ENABLE}" ] ; then - conf_sign_keyname="${UBOOT_SIGN_KEYNAME}" - fi - - # Test if we have any DTBs at all - conf_desc="Linux kernel" - kernel_line="kernel = \"kernel@${2}\";" - fdt_line="" - ramdisk_line="" - setup_line="" - default_line="" - - if [ -n "${3}" ]; then - conf_desc="${conf_desc}, FDT blob" - fdt_line="fdt = \"fdt@${3}\";" - fi - - if [ -n "${4}" ]; then - conf_desc="${conf_desc}, ramdisk" - ramdisk_line="ramdisk = \"ramdisk@${4}\";" - fi - - if [ -n "${5}" ]; then - conf_desc="${conf_desc}, setup" - setup_line="setup = \"setup@${5}\";" - fi - - if [ "${6}" = "1" ]; then - default_line="default = \"conf@${3}\";" - fi - - cat << EOF >> ${1} - ${default_line} - conf@${3} { - description = "${6} ${conf_desc}"; - ${kernel_line} - ${fdt_line} - ${ramdisk_line} - ${setup_line} - hash@1 { - algo = "${conf_csum}"; - }; -EOF - - if [ ! -z "${conf_sign_keyname}" ] ; then - - sign_line="sign-images = \"kernel\"" - - if [ -n "${3}" ]; then - sign_line="${sign_line}, \"fdt\"" - fi - - if [ -n "${4}" ]; then - sign_line="${sign_line}, \"ramdisk\"" - fi - - if [ -n "${5}" ]; then - sign_line="${sign_line}, \"setup\"" - fi - - sign_line="${sign_line};" - - cat << EOF >> ${1} - signature@1 { - algo = "${conf_csum},rsa2048"; - key-name-hint = "${conf_sign_keyname}"; - ${sign_line} - }; -EOF - fi - - cat << EOF >> ${1} - }; -EOF -} - -# -# Assemble fitImage -# -# $1 ... .its filename -# $2 ... fitImage name -# $3 ... include ramdisk -fitimage_assemble() { - kernelcount=1 - dtbcount="" - DTBS="" - ramdiskcount=${3} - setupcount="" - rm -f ${1} arch/${ARCH}/boot/${2} - - fitimage_emit_fit_header ${1} - - # - # Step 1: Prepare a kernel image section. - # - fitimage_emit_section_maint ${1} imagestart - - uboot_prep_kimage - fitimage_emit_section_kernel ${1} "${kernelcount}" linux.bin "${linux_comp}" - - # - # Step 2: Prepare a DTB image section - # - if [ -n "${KERNEL_DEVICETREE}" ]; then - dtbcount=1 - for DTB in ${KERNEL_DEVICETREE}; do - if echo ${DTB} | grep -q '/dts/'; then - bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." - DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` - fi - DTB_PATH="arch/${ARCH}/boot/dts/${DTB}" - DTB=`basename ${DTB}` - if [ ! -e "${DTB_PATH}" ]; then - DTB_PATH="arch/${ARCH}/boot/${DTB}" - fi - - DTBS="${DTBS} ${DTB}" - fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH} - done - fi - - # - # Step 3: Prepare a setup section. (For x86) - # - if [ -e arch/${ARCH}/boot/setup.bin ]; then - setupcount=1 - fitimage_emit_section_setup ${1} "${setupcount}" arch/${ARCH}/boot/setup.bin - fi - - # - # Step 4: Prepare a ramdisk section. - # - if [ "x${ramdiskcount}" = "x1" ] ; then - # Find and use the first initramfs image archive type we find - for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz ext2.gz cpio; do - initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.${img}" - echo "Using $initramfs_path" - if [ -e "${initramfs_path}" ]; then - fitimage_emit_section_ramdisk ${1} "${ramdiskcount}" "${initramfs_path}" - break - fi - done - fi - - fitimage_emit_section_maint ${1} sectend - - # Force the first Kernel and DTB in the default config - kernelcount=1 - if [ -n "${dtbcount}" ]; then - dtbcount=1 - fi - - # - # Step 5: Prepare a configurations section - # - fitimage_emit_section_maint ${1} confstart - - if [ -n "${DTBS}" ]; then - i=1 - for DTB in ${DTBS}; do - fitimage_emit_section_config ${1} "${kernelcount}" "${DTB}" "${ramdiskcount}" "${setupcount}" "`expr ${i} = ${dtbcount}`" - i=`expr ${i} + 1` - done - fi - - fitimage_emit_section_maint ${1} sectend - - fitimage_emit_section_maint ${1} fitend - - # - # Step 6: Assemble the image - # - uboot-mkimage \ - ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ - -f ${1} \ - arch/${ARCH}/boot/${2} - - # - # Step 7: Sign the image and add public key to U-Boot dtb - # - if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then - uboot-mkimage \ - ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ - -F -k "${UBOOT_SIGN_KEYDIR}" \ - -K "${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}" \ - -r arch/${ARCH}/boot/${2} - fi -} - -do_assemble_fitimage() { - if echo ${KERNEL_IMAGETYPES} | grep -wq "itbImage"; then - cd ${B} - fitimage_assemble itb-image.its itbImage - fi -} - -addtask assemble_fitimage before do_install after do_compile - -do_assemble_fitimage_initramfs() { - if echo ${KERNEL_IMAGETYPES} | grep -wq "itbImage" && \ - test -n "${INITRAMFS_IMAGE}" ; then - cd ${B} - fitimage_assemble itb-image-${INITRAMFS_IMAGE}.its itbImage-${INITRAMFS_IMAGE} 1 - fi -} - -addtask assemble_fitimage_initramfs before do_deploy after do_install - - -kernel_do_deploy[vardepsexclude] = "DATETIME" -kernel_do_deploy:append() { - # Update deploy directory - if echo ${KERNEL_IMAGETYPES} | grep -wq "itbImage"; then - cd ${B} - echo "Copying fit-image.its source file..." - its_base_name="itbImage-its-${PV}-${PR}-${MACHINE}-${DATETIME}" - its_symlink_name=itbImage-its-${MACHINE} - install -m 0644 itb-image.its ${DEPLOYDIR}/${its_base_name}.its - linux_bin_base_name="itbImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}" - linux_bin_symlink_name=itbImage-linux.bin-${MACHINE} - install -m 0644 linux.bin ${DEPLOYDIR}/${linux_bin_base_name}.bin - - if [ -n "${INITRAMFS_IMAGE}" ]; then - echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." - its_initramfs_base_name="itbImage-its-${INITRAMFS_IMAGE_NAME}-${PV}-${PR}-${DATETIME}" - its_initramfs_symlink_name=itbImage-its-${INITRAMFS_IMAGE_NAME} - install -m 0644 itb-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/${its_initramfs_base_name}.its - fit_initramfs_base_name="itbImage-${INITRAMFS_IMAGE_NAME}-${PV}-${PR}-${DATETIME}" - fit_initramfs_symlink_name=itbImage-${INITRAMFS_IMAGE_NAME} - install -m 0644 arch/${ARCH}/boot/itbImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/${fit_initramfs_base_name}.bin - fi - - cd ${DEPLOYDIR} - ln -sf ${its_base_name}.its ${its_symlink_name}.its - ln -sf ${linux_bin_base_name}.bin ${linux_bin_symlink_name}.bin - - if [ -n "${INITRAMFS_IMAGE}" ]; then - ln -sf ${its_initramfs_base_name}.its ${its_initramfs_symlink_name}.its - ln -sf ${fit_initramfs_base_name}.bin ${fit_initramfs_symlink_name}.bin - fi - fi -} diff --git a/classes/machine-overrides-extender.bbclass b/classes/machine-overrides-extender.bbclass index 876ddd10..58cb45b1 100644 --- a/classes/machine-overrides-extender.bbclass +++ b/classes/machine-overrides-extender.bbclass @@ -12,19 +12,17 @@ # # MACHINEOVERRIDES_EXTENDER_FILTER_OUT:override = "group1 group2" # -# Copyright 2016-2018 (C) O.S. Systems Software LTDA. +# Copyright 2016-2018, 2022 (C) O.S. Systems Software LTDA. def machine_overrides_extender(d): machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES') or '').split(':') # Gather the list of overrides to filter out - machine_overrides_filter_out = [] + machine_overrides_filter_out = (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT') or '').split() for override in machine_overrides: machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT:%s' % override) or '').split() - # Drop any overrides of filter_out prior extending - machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out] - + # Extend the overrides for override in machine_overrides: extender = d.getVar('MACHINEOVERRIDES_EXTENDER:%s' % override) @@ -40,6 +38,9 @@ def machine_overrides_extender(d): for e in extender: machine_overrides.insert(index, e) + # Drop any overrides of filter_out after extending + machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out] + return ':'.join(machine_overrides) python machine_overrides_extender_handler() { @@ -54,3 +55,22 @@ python machine_overrides_extender_handler() { machine_overrides_extender_handler[eventmask] = "bb.event.ConfigParsed" addhandler machine_overrides_extender_handler + +python machineoverrides_filtered_out_qa_handler() { + filtered_out = (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT') or "").split() + qa_error = d.getVar('MACHINEOVERRIDES_FILTERED_OUT_QA_ERROR') + + for var in d.overridedata: + # We need to allow the overrides being used in the extender + # so avoid processing it. + if 'MACHINEOVERRIDES_EXTENDER' in var: + continue + + for (r, o) in d.overridedata[var]: + common = list(set(o.split(":")).intersection(filtered_out)) + if len(common) > 0: + raise bb.parse.SkipRecipe(qa_error % common) +} + +machineoverrides_filtered_out_qa_handler[eventmask] = "bb.event.RecipeParsed" +addhandler machineoverrides_filtered_out_qa_handler diff --git a/classes/mfgtool-initramfs-image.bbclass b/classes/mfgtool-initramfs-image.bbclass index 1d4c5513..c8c9e22b 100644 --- a/classes/mfgtool-initramfs-image.bbclass +++ b/classes/mfgtool-initramfs-image.bbclass @@ -12,8 +12,9 @@ FEATURE_PACKAGES_mtd = "packagegroup-fsl-mfgtool-mtd" FEATURE_PACKAGES_extfs = "packagegroup-fsl-mfgtool-extfs" FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs" -IMAGE_FSTYPES = "cpio.gz.u-boot" -IMAGE_FSTYPES:mxs = "cpio.gz.u-boot" +ZSTD_COMPRESSION_LEVEL ?= "-10" +SOC_DEFAULT_IMAGE_FSTYPES = "cpio.zst.u-boot" +SOC_DEFAULT_IMAGE_FSTYPES:mxs-generic-bsp = "cpio.gz.u-boot" IMAGE_ROOTFS_SIZE ?= "8192" # Filesystems enabled by default diff --git a/classes/use-imx-headers.bbclass b/classes/use-imx-headers.bbclass index c6c7f043..4baf4574 100644 --- a/classes/use-imx-headers.bbclass +++ b/classes/use-imx-headers.bbclass @@ -13,14 +13,14 @@ # # Copyright 2018 (C) O.S. Systems Software LTDA. -DEPENDS:append:imx = " linux-imx-headers" +DEPENDS:append:imx-nxp-bsp = " linux-imx-headers" # Set runtime dependency of -dev for package inheriting this class to # linux-imx-headers-dev package. This is required in order to propagate # headers into the SDK RDEPENDS:${PN}-dev += "linux-imx-headers-dev" -PACKAGE_ARCH:imx ?= "${MACHINE_SOCARCH}" +PACKAGE_ARCH:imx-nxp-bsp ?= "${MACHINE_SOCARCH}" STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx" diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass index 9650059b..9ae58fbc 100644 --- a/classes/use-imx-security-controller-firmware.bbclass +++ b/classes/use-imx-security-controller-firmware.bbclass @@ -16,16 +16,18 @@ # This behavior ensures that derivatives which requires SECO Firmware to be # present in the image file have it properly defined. -SECO_FIRMWARE_NAME ?= "" - -SECO_FIRMWARE_NAME:mx8qm = "mx8qmb0-ahab-container.img" -SECO_FIRMWARE_NAME:mx8qxp = \ +SECO_FIRMWARE_NAME ?= "" +SECO_FIRMWARE_NAME:mx8qm-nxp-bsp ?= "mx8qmb0-ahab-container.img" +SECO_FIRMWARE_NAME:mx8qxp-nxp-bsp ?= \ "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \ 'mx8qxc0-ahab-container.img', d)}" -SECO_FIRMWARE_NAME:mx8dxl = "mx8dxla1-ahab-container.img" +SECO_FIRMWARE_NAME:mx8dx-nxp-bsp ?= "mx8qxc0-ahab-container.img" +SECO_FIRMWARE_NAME:mx8dxl-nxp-bsp ?= "mx8dxla1-ahab-container.img" +SECO_FIRMWARE_NAME:mx8ulp-nxp-bsp ?= "mx8ulpa1-ahab-container.img" +SECO_FIRMWARE_NAME:mx93-nxp-bsp ?= "mx93a0-ahab-container.img" python () { - if "mx8m" in d.getVar('MACHINEOVERRIDES').split(":"): + if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"): return # We need to allow the recipes to be parsed for this case seco_firmware = d.getVar('SECO_FIRMWARE_NAME') diff --git a/classes/uuu_bootloader_tag.bbclass b/classes/uuu_bootloader_tag.bbclass new file mode 100644 index 00000000..fb6acd72 --- /dev/null +++ b/classes/uuu_bootloader_tag.bbclass @@ -0,0 +1,11 @@ +# Append a tag to the bootloader image used in the SD card image. The tag +# contains the size of the bootloader image so UUU can easily find the end of +# the bootloader in the SD card image. +do_deploy:append() { + if [ "${UUU_BOOTLOADER}" != "" ]; then + cp ${DEPLOYDIR}/${UUU_BOOTLOADER} ${DEPLOYDIR}/${UUU_BOOTLOADER_TAGGED} + ln -sf ${UUU_BOOTLOADER_TAGGED} ${DEPLOYDIR}/${UUU_BOOTLOADER} + stat -L -cUUUBURNXXOEUZX7+A-XY5601QQWWZ%sEND ${DEPLOYDIR}/${UUU_BOOTLOADER} \ + >> ${DEPLOYDIR}/${UUU_BOOTLOADER} + fi +} diff --git a/conf/layer.conf b/conf/layer.conf index 77e704ed..74f65c3d 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "freescale-layer" BBFILE_PATTERN_freescale-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_freescale-layer = "5" -LAYERSERIES_COMPAT_freescale-layer = "honister" +LAYERSERIES_COMPAT_freescale-layer = "langdale mickledore" # Add the Freescale-specific licenses into the metadata LICENSE_PATH += "${LAYERDIR}/custom-licenses" @@ -23,6 +23,9 @@ FSL_MIRROR ?= "${IMX_MIRROR}" MIRRORS += " \ ${IMX_MIRROR} http://download.ossystems.com.br/bsp/freescale/source/ \n \ " +# Needs gbm_bo_create_with_modifiers2() API which is not +# implemented in imx GL driver implementation +COMPATIBLE_HOST:pn-xdg-desktop-portal-wlr:imxgpu = "(null)" BBFILES_DYNAMIC += " \ aglprofilegraphical:${LAYERDIR}/dynamic-layers/aglprofilegraphical/*/*/*.bb \ @@ -40,6 +43,11 @@ BBFILES_DYNAMIC += " \ ivi:${LAYERDIR}/dynamic-layers/ivi/*/*/*.bb \ ivi:${LAYERDIR}/dynamic-layers/ivi/*/*/*.bbappend \ \ + meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/*/*/*.bbappend \ + \ + multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bb \ + multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \ + \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ \ @@ -49,6 +57,9 @@ BBFILES_DYNAMIC += " \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \ \ + qt6-layer:${LAYERDIR}/dynamic-layers/qt6-layer/*/*/*.bb \ + qt6-layer:${LAYERDIR}/dynamic-layers/qt6-layer/*/*/*.bbappend \ + \ virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/*/*/*.bb \ virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/*/*/*.bbappend \ " diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf index 0d6a7b22..c9b98d22 100644 --- a/conf/machine/imx53qsb.conf +++ b/conf/machine/imx53qsb.conf @@ -2,7 +2,7 @@ #@NAME: NXP i.MX53 Quick Start Board #@SOC: i.MX53 #@DESCRIPTION: Machine configuration for NXP i.MX53 Quick Start Board -#@MAINTAINER: Trevor Woerner <trevor.woerner@linaro.org> +#@MAINTAINER: Trevor Woerner <twoerner@gmail.com> MACHINEOVERRIDES =. "mx5:mx53:" diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 171b9f00..3c6fd151 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -11,7 +11,7 @@ # * imx6solosabreauto # and is able to work for all the machines. -MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" +MACHINEOVERRIDES =. "mx6q:mx6dl:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc @@ -34,28 +34,33 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \ ### u-boot-fslc settings ### SPL_BINARY:pn-u-boot-fslc = "SPL" -UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc" +UBOOT_CONFIG:pn-u-boot-fslc ??= "sd" UBOOT_SUFFIX:pn-u-boot-fslc = "img" ### u-boot-imx settings ### SPL_BINARY:pn-u-boot-imx = "" UBOOT_CONFIG:pn-u-boot-imx ??= " \ - sd-imx \ - ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ " UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" UBOOT_SUFFIX:pn-u-boot-imx = "imx" +UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx" +UBOOT_SUFFIX:pn-u-boot-imx-mfgtool = "imx" + +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard" +UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard" +UBOOT_CONFIG[eimnor] = "${UBOOT_CONFIG_MACHINE_NAME}_eimnor_defconfig" +UBOOT_CONFIG[nand] = "${UBOOT_CONFIG_MACHINE_NAME}_nand_defconfig,ubifs" +UBOOT_CONFIG[spinor] = "${UBOOT_CONFIG_MACHINE_NAME}_spinor_defconfig" +UBOOT_CONFIG[sata] = "${UBOOT_CONFIG_MACHINE_NAME}_sata_defconfig" +UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig" # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC # variants. Change the defconfig to the targeted SoC variant. -UBOOT_CONFIG[sd-fslc] = "mx6sabreauto_defconfig,sdcard" -UBOOT_CONFIG[sd-imx] = "mx6qpsabreauto_defconfig,sdcard" -UBOOT_CONFIG[sd-optee-imx] = "mx6qpsabreauto_optee_defconfig,sdcard" -UBOOT_CONFIG[eimnor-imx] = "mx6qpsabreauto_eimnor_defconfig" -UBOOT_CONFIG[nand-imx] = "mx6qpsabreauto_nand_defconfig,ubifs" -UBOOT_CONFIG[spinor-imx] = "mx6qpsabreauto_spinor_defconfig" -UBOOT_CONFIG[sata-imx] = "mx6qpsabreauto_sata_defconfig" -UBOOT_CONFIG[mfgtool-imx] = "mx6qpsabreauto_defconfig" +UBOOT_CONFIG_MACHINE_NAME = "mx6sabreauto" +UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx = "mx6qpsabreauto" +UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx-mfgtool = "mx6qpsabreauto" WKS_FILE = " \ ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ @@ -68,4 +73,4 @@ SERIAL_CONSOLES = "115200;ttymxc3" MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio" diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index a5133625..046a7c7f 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -11,7 +11,7 @@ # * imx6solosabresd # and is able to work for all the machines. -MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" +MACHINEOVERRIDES =. "mx6q:mx6dl:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc @@ -43,25 +43,30 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \ ### u-boot-fslc settings ### SPL_BINARY:pn-u-boot-fslc = "SPL" -UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc" +UBOOT_CONFIG:pn-u-boot-fslc ??= "sd" UBOOT_SUFFIX:pn-u-boot-fslc = "img" ### u-boot-imx settings ### SPL_BINARY:pn-u-boot-imx = "" UBOOT_CONFIG:pn-u-boot-imx ??= " \ - sd-imx \ - ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ " UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" UBOOT_SUFFIX:pn-u-boot-imx = "imx" +UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx" +UBOOT_SUFFIX:pn-u-boot-imx-mfgtool = "imx" + +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard" +UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard" +UBOOT_CONFIG[sata] = "${UBOOT_CONFIG_MACHINE_NAME}_sata_defconfig" +UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig" # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC # variants. Change the defconfig to the targeted SoC variant. -UBOOT_CONFIG[sd-fslc] = "mx6sabresd_defconfig,sdcard" -UBOOT_CONFIG[sd-imx] = "mx6qsabresd_defconfig,sdcard" -UBOOT_CONFIG[sd-optee-imx] = "mx6qsabresd_optee_defconfig,sdcard" -UBOOT_CONFIG[sata-imx] = "mx6qsabresd_sata_defconfig" -UBOOT_CONFIG[mfgtool-imx] = "mx6qsabresd_defconfig" +UBOOT_CONFIG_MACHINE_NAME = "mx6sabresd" +UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx = "mx6qsabresd" +UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx-mfgtool = "mx6qsabresd" WKS_FILE = " \ ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ @@ -74,4 +79,4 @@ SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio" diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index b25182ba..976e6a3a 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6SL Evaluation Kit #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br> -MACHINEOVERRIDES =. "mx6:mx6sl:" +MACHINEOVERRIDES =. "mx6sl:" include conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc @@ -34,6 +34,6 @@ OPTEE_BIN_EXT = "6slevk" SERIAL_CONSOLES = "115200;ttymxc0" -MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc" diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index ea525845..43564aea 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf @@ -4,12 +4,15 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6SLL EVK #@MAINTAINER: Alexandru Palalau ioan-alexandru.palalau@nxp.com -MACHINEOVERRIDES =. "mx6:mx6sll:" +MACHINEOVERRIDES =. "mx6sll:" include conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc KERNEL_DEVICETREE = "imx6sll-evk.dtb" +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ + imx6sll-evk-btwifi.dtb \ + imx6sll-evk-reva.dtb" UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_SUFFIX = "imx" @@ -27,7 +30,7 @@ OPTEE_BIN_EXT:imx6sllevk = "6sllevk" SERIAL_CONSOLES = "115200;ttymxc0" -MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" # MESA DRI library XSERVER += "mesa-driver-swrast" diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index 9e83c458..69bc901b 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre Automotive #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> -MACHINEOVERRIDES =. "mx6:mx6sx:" +MACHINEOVERRIDES =. "mx6sx:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc @@ -31,4 +31,4 @@ SERIAL_CONSOLES = "115200;ttymxc3" MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio" diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index d0a89596..45d6e265 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre SD #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> -MACHINEOVERRIDES =. "mx6:mx6sx:" +MACHINEOVERRIDES =. "mx6sx:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc @@ -45,4 +45,4 @@ SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" -MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 09d64b4e..4232ce89 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -4,22 +4,22 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6UL EVK #@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> -MACHINEOVERRIDES =. "mx6:mx6ul:" +MACHINEOVERRIDES =. "mx6ul:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" KERNEL_DEVICETREE = " \ - imx6ul-14x14-evk-btwifi.dtb \ - imx6ul-14x14-evk-btwifi-oob.dtb \ - imx6ul-14x14-evk-csi.dtb \ - imx6ul-14x14-evk.dtb \ - imx6ul-14x14-evk-ecspi.dtb \ - imx6ul-14x14-evk-ecspi-slave.dtb \ - imx6ul-14x14-evk-emmc.dtb \ - imx6ul-14x14-evk-gpmi-weim.dtb \ + imx6ul-14x14-evk-btwifi.dtb \ + imx6ul-14x14-evk-btwifi-sdio3_0.dtb \ + imx6ul-14x14-evk-csi.dtb \ + imx6ul-14x14-evk.dtb \ + imx6ul-14x14-evk-ecspi.dtb \ + imx6ul-14x14-evk-ecspi-slave.dtb \ + imx6ul-14x14-evk-emmc.dtb \ + imx6ul-14x14-evk-gpmi-weim.dtb \ " KERNEL_DEVICETREE:use-mainline-bsp = "imx6ul-14x14-evk.dtb" @@ -33,7 +33,9 @@ UBOOT_SUFFIX:pn-u-boot-fslc = "img" # The u-boot-imx does not provide SPL support SPL_BINARY:pn-u-boot-imx = "" UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" +UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx" UBOOT_SUFFIX:pn-u-boot-imx = "imx" +UBOOT_SUFFIX:pn-u-boot-imx-mfgtool = "imx" WKS_FILE = " \ ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index e71e34e4..d2b4843a 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf @@ -4,22 +4,22 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6ULL EVK #@MAINTAINER: Lauren Post <lauren.post@nxp.com> -MACHINEOVERRIDES =. "mx6:mx6ull:" +MACHINEOVERRIDES =. "mx6ull:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8801-sdio nxp8987-sdio" KERNEL_DEVICETREE = " \ - imx6ull-14x14-evk.dtb \ + imx6ull-14x14-evk.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx6ull-14x14-evk-btwifi.dtb \ - imx6ull-14x14-evk-btwifi-oob.dtb \ - imx6ull-14x14-evk-emmc.dtb \ - imx6ull-14x14-evk-gpmi-weim.dtb \ + imx6ull-14x14-evk-btwifi.dtb \ + imx6ull-14x14-evk-btwifi-sdio3_0.dtb \ + imx6ull-14x14-evk-emmc.dtb \ + imx6ull-14x14-evk-gpmi-weim.dtb \ " UBOOT_MAKE_TARGET = "u-boot.imx" diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf index a47c08f8..994ad850 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf @@ -4,18 +4,19 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6ULZ 14x14 EVK #@MAINTAINER: Jun Zhu <junzhu@nxp.com> -MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:" +MACHINEOVERRIDES =. "mx6ulz:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" KERNEL_DEVICETREE = " \ imx6ulz-14x14-evk.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ imx6ulz-14x14-evk-btwifi.dtb \ + imx6ull-14x14-evk-btwifi-sdio3_0.dtb \ imx6ulz-14x14-evk-emmc.dtb \ imx6ulz-14x14-evk-gpmi-weim.dtb \ " diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf index 7183d6f9..f85505ae 100644 --- a/conf/machine/imx7dsabresd.conf +++ b/conf/machine/imx7dsabresd.conf @@ -9,19 +9,20 @@ MACHINEOVERRIDES =. "mx7:mx7d:" require conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" KERNEL_DEVICETREE = "imx7d-sdb.dtb" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx7d-sdb-epdc.dtb \ - imx7d-sdb-gpmi-weim.dtb \ - imx7d-sdb-m4.dtb \ - imx7d-sdb-mipi-dsi.dtb \ - imx7d-sdb-pcie-ep.dtb \ - imx7d-sdb-qspi.dtb \ - imx7d-sdb-reva.dtb \ - imx7d-sdb-sht11.dtb \ - imx7d-sdb-usd-wifi.dtb \ + imx7d-sdb-epdc.dtb \ + imx7d-sdb-gpmi-weim.dtb \ + imx7d-sdb-m4.dtb \ + imx7d-sdb-mipi-dsi.dtb \ + imx7d-sdb-mqs.dtb \ + imx7d-sdb-pcie-ep.dtb \ + imx7d-sdb-qspi.dtb \ + imx7d-sdb-reva.dtb \ + imx7d-sdb-sht11.dtb \ + imx7d-sdb-usd-wifi.dtb \ " UBOOT_MAKE_TARGET = "u-boot.imx" diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index e0961240..9e677cf7 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf @@ -9,14 +9,11 @@ MACHINEOVERRIDES =. "mx7:mx7ulp:" require conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -MACHINE_FEATURES += "pci wifi bluetooth bcm43430" +MACHINE_FEATURES += "pci wifi bluetooth bcm43430 nxp8987-sdio" KERNEL_DEVICETREE = " \ imx7ulp-evk.dtb \ " -KERNEL_DEVICETREE:append:use-mainline-bsp = " \ - imx7ulp-com.dtb \ -" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ imx7ulp-evk-ft5416.dtb \ imx7ulp-evk-mipi.dtb \ diff --git a/conf/machine/imx8dx-mek.conf b/conf/machine/imx8dx-mek.conf index d1aaa8ee..f7abd89a 100644 --- a/conf/machine/imx8dx-mek.conf +++ b/conf/machine/imx8dx-mek.conf @@ -1,9 +1,10 @@ #@TYPE: Machine -#@NAME: i.MX 8DXP MEK -#@DESCRIPTION: i.MX 8DualXPlus Multisensory Enablement Kit board +#@NAME: i.MX 8DX MEK +#@SOC: i.MX8DX +#@DESCRIPTION: i.MX 8DualX Multisensory Enablement Kit board #@MAINTAINER: Lauren Post <lauren.post@nxp.com> -MACHINEOVERRIDES =. "mx8qxp:mx8dx:" +MACHINEOVERRIDES =. "mx8dx:" require include/imx8x-mek.inc diff --git a/conf/machine/imx8dxl-ddr3l-evk.conf b/conf/machine/imx8dxl-ddr3l-evk.conf index e74bc259..7d46e2b4 100644 --- a/conf/machine/imx8dxl-ddr3l-evk.conf +++ b/conf/machine/imx8dxl-ddr3l-evk.conf @@ -1,11 +1,12 @@ #@TYPE: Machine #@NAME: i.MX 8DXL EVK with DDR3 +#@SOC: i.MX8DXL #@DESCRIPTION: NXP i.MX 8DXLite Evaluation Kit with DDR3 #@MAINTAINER: Lauren Post <lauren.post@nxp.com> require conf/machine/include/imx8dxl-evk.inc -KERNEL_DEVICETREE_BASENAME = "imx8dxl-ddr3-evk" -UBOOT_CONFIG_BASENAME = "imx8dxl_ddr3_evk" +KERNEL_DEVICETREE_BASENAME = "imx8dxl-ddr3l-evk" +UBOOT_CONFIG_BASENAME = "imx8dxl_ddr3l_evk" UBOOT_CONFIG[nand] = "${UBOOT_CONFIG_BASENAME}_nand_defconfig" BOARD_TYPE = "ddr3-evk" diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/imx8dxl-lpddr4-evk.conf index d44a4732..915c3fa9 100644 --- a/conf/machine/imx8dxl-lpddr4-evk.conf +++ b/conf/machine/imx8dxl-lpddr4-evk.conf @@ -1,5 +1,6 @@ #@TYPE: Machine #@NAME: i.MX 8DXL EVK with LPDDR4 +#@SOC: i.MX8DXL #@DESCRIPTION: i.MX 8DXLite Evaluation Kit with LPDDR4 #@MAINTAINER: Lauren Post <lauren.post@nxp.com> @@ -8,11 +9,12 @@ KERNEL_DEVICETREE_BASENAME = "imx8dxl-evk" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-enet0.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-enet0-tja1100.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ " UBOOT_CONFIG_BASENAME = "imx8dxl_evk" -UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" + +UBOOT_CONFIG[lcd] = "${UBOOT_CONFIG_BASENAME}_lcd_defconfig" + +BOARD_TYPE = "evk" diff --git a/conf/machine/imx8mm-ddr4-evk.conf b/conf/machine/imx8mm-ddr4-evk.conf index f21cc381..467ca863 100644 --- a/conf/machine/imx8mm-ddr4-evk.conf +++ b/conf/machine/imx8mm-ddr4-evk.conf @@ -8,8 +8,11 @@ require include/imx8mm-evk.inc KERNEL_DEVICETREE_BASENAME = "${MACHINE}" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191-cmd-ram.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67199.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67199-cmd-ram.dtb \ " UBOOT_CONFIG_BASENAME = "imx8mm_ddr4_evk" @@ -23,3 +26,6 @@ DDR_FIRMWARE_NAME = " \ " IMXBOOT_TARGETS_BASENAME = "flash_ddr4_evk" + +# Mainline U-Boot doesn't support DDR4 so it must be set to u-boot-imx. +IMX_DEFAULT_BOOTLOADER = "u-boot-imx" diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf index 0a85ed20..1387e594 100644 --- a/conf/machine/imx8mm-lpddr4-evk.conf +++ b/conf/machine/imx8mm-lpddr4-evk.conf @@ -9,17 +9,22 @@ require include/imx8mm-evk.inc # The device tree name is implicit for LPDDR4, so can't use MACHINE here KERNEL_DEVICETREE_BASENAME = "imx8mm-evk" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-ak4497.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-audio-tdm.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-qca-wifi.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-revb-qca-wifi.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ak4497.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-audio-tdm.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dpdk.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ecspi-slave.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lk.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-qca-wifi.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-qca-wifi.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-wm8524.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-wm8524-lpv.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \ " @@ -27,10 +32,10 @@ UBOOT_CONFIG_BASENAME = "imx8mm_evk" UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" DDR_FIRMWARE_NAME = " \ - lpddr4_pmu_train_1d_imem.bin \ - lpddr4_pmu_train_1d_dmem.bin \ - lpddr4_pmu_train_2d_imem.bin \ - lpddr4_pmu_train_2d_dmem.bin \ + lpddr4_pmu_train_1d_imem.bin \ + lpddr4_pmu_train_1d_dmem.bin \ + lpddr4_pmu_train_2d_imem.bin \ + lpddr4_pmu_train_2d_dmem.bin \ " IMXBOOT_TARGETS_BASENAME = "flash_evk" diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf index d004d2ae..7a796d38 100644 --- a/conf/machine/imx8mn-ddr4-evk.conf +++ b/conf/machine/imx8mn-ddr4-evk.conf @@ -12,6 +12,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ " UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk" +UBOOT_CONFIG[nom] = "${UBOOT_CONFIG_BASENAME}_nom_defconfig" + DDR_FIRMWARE_VERSION = "201810" DDR_FIRMWARE_NAME = " \ ddr4_imem_1d_${DDR_FIRMWARE_VERSION}.bin \ @@ -20,3 +22,8 @@ DDR_FIRMWARE_NAME = " \ ddr4_dmem_2d_${DDR_FIRMWARE_VERSION}.bin \ " IMXBOOT_TARGETS_BASENAME = "flash_ddr4_evk" + +# Mainline BSP doesn't support DDR4 so it must be set to nxp. +# Also this machine isn't supported by u-boot-fslc but imx8mn-evk.inc already +# set the bootloader to u-boot-imx instead when NXP BSP is used. +IMX_DEFAULT_BSP = "nxp" diff --git a/conf/machine/imx8mn-lpddr4-evk.conf b/conf/machine/imx8mn-lpddr4-evk.conf index 2e5e6be9..25103706 100644 --- a/conf/machine/imx8mn-lpddr4-evk.conf +++ b/conf/machine/imx8mn-lpddr4-evk.conf @@ -9,7 +9,11 @@ require include/imx8mn-evk.inc # The device tree name is implicit for LPDDR4, so can't use MACHINE here KERNEL_DEVICETREE_BASENAME = "imx8mn-evk" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ " UBOOT_CONFIG_BASENAME = "imx8mn_evk" DDR_FIRMWARE_NAME = " \ @@ -19,3 +23,8 @@ DDR_FIRMWARE_NAME = " \ lpddr4_pmu_train_2d_dmem.bin \ " IMXBOOT_TARGETS_BASENAME = "flash_evk" + +# Mainline BSP doesn't support LPDDR4 so it must be set to nxp. +# Also this machine isn't supported by u-boot-fslc but imx8mn-evk.inc already +# set the bootloader to u-boot-imx instead when NXP BSP is used. +IMX_DEFAULT_BSP = "nxp" diff --git a/conf/machine/imx8mnul-ddr3l-evk.conf b/conf/machine/imx8mnul-ddr3l-evk.conf new file mode 100644 index 00000000..9d7bafd6 --- /dev/null +++ b/conf/machine/imx8mnul-ddr3l-evk.conf @@ -0,0 +1,69 @@ +#@TYPE: Machine +#@NAME: NXP i.MX 8MNUL EVK with DDR3L +#@SOC: i.MX8MN +#@DESCRIPTION: Machine configuration for NXP i.MX 8M Nano UltraLite Evaluation Kit with DDR3L +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> + +MACHINEOVERRIDES =. "imx-boot-container:mx8mnul:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc + +MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" + +# NXP BSP can consume proprietary jailhouse and Broadcom drivers +# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have +# a full support for it yet. +MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" + +KERNEL_DEVICETREE_BASENAME = "imx8mn-ddr3l-evk" +KERNEL_DEVICETREE = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ +" +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ +" + +UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" + +IMX_DEFAULT_BOOTLOADER = "u-boot-imx" +IMX_DEFAULT_KERNEL = "linux-imx" + +UBOOT_SUFFIX = "bin" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG_BASENAME = "imx8mn_ddr3l_evk" +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_config,sdcard" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" + +SPL_BINARY = "spl/u-boot-spl.bin" + +ATF_PLATFORM = "imx8mn" + +# Set DDR FIRMWARE +DDR_FIRMWARE_VERSION = "201810" +DDR_FIRMWARE_NAME = " \ + ddr3_dmem_1d_${DDR_FIRMWARE_VERSION}.bin \ + ddr3_imem_1d_${DDR_FIRMWARE_VERSION}.bin \ +" + +# Set imx-mkimage boot target +IMXBOOT_TARGETS_BASENAME = "flash_ddr3l_evk" +IMXBOOT_TARGETS = " \ + ${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', \ + '${IMXBOOT_TARGETS_BASENAME}', d)}" + +IMX_BOOT_SOC_TARGET = "iMX8MN" + +SERIAL_CONSOLES = "115200;ttymxc1" + +IMAGE_BOOTLOADER = "imx-boot" + +BOOT_SPACE = "65536" +LOADADDR = "" +UBOOT_MAKE_TARGET = "all" +UBOOT_MAKE_TARGET:pn-u-boot-imx = "" +IMX_BOOT_SEEK = "32" + +OPTEE_BIN_EXT = "8mnul" diff --git a/conf/machine/imx8mp-ddr4-evk.conf b/conf/machine/imx8mp-ddr4-evk.conf index 78e0c160..c63c8d68 100644 --- a/conf/machine/imx8mp-ddr4-evk.conf +++ b/conf/machine/imx8mp-ddr4-evk.conf @@ -25,3 +25,8 @@ DDR_FIRMWARE_NAME = " \ " IMXBOOT_TARGETS_BASENAME = "flash_ddr4_evk" + +# Mainline BSP doesn't support DDR4 so it must be set to nxp. +# Also this machine isn't supported by u-boot-fslc but imx8mp-evk.inc already +# set the bootloader to u-boot-imx instead when NXP BSP is used. +IMX_DEFAULT_BSP = "nxp" diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf index 0b7c6801..39108716 100644 --- a/conf/machine/imx8mp-lpddr4-evk.conf +++ b/conf/machine/imx8mp-lpddr4-evk.conf @@ -12,43 +12,57 @@ KERNEL_DEVICETREE_BASENAME = "imx8mp-evk" # NXP kernel has additional DTB files for various board configuration and # derivates. Include them here for NXP BSP only KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - freescale/imx8mp-ab2.dtb \ - freescale/imx8mp-evk-basler.dtb \ - freescale/imx8mp-evk-basler-ov2775.dtb \ - freescale/imx8mp-evk-basler-ov5640.dtb \ - freescale/imx8mp-evk-dual-basler.dtb \ - freescale/imx8mp-evk-dual-ov2775.dtb \ - freescale/imx8mp-evk-ecspi-slave.dtb \ - freescale/imx8mp-evk-flexcan2.dtb \ - freescale/imx8mp-evk-hifiberry-dacplus.dtb \ - freescale/imx8mp-evk-inmate.dtb \ - freescale/imx8mp-evk-iqaudio-dacplus.dtb \ - freescale/imx8mp-evk-iqaudio-dacpro.dtb \ - freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \ - freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \ - freescale/imx8mp-evk-ndm.dtb \ - freescale/imx8mp-evk-ov2775.dtb \ - freescale/imx8mp-evk-ov2775-ov5640.dtb \ - freescale/imx8mp-evk-pcie-ep.dtb \ - freescale/imx8mp-evk-rm67191.dtb \ - freescale/imx8mp-evk-rm67199.dtb \ - freescale/imx8mp-evk-root.dtb \ - freescale/imx8mp-evk-rpmsg.dtb \ - freescale/imx8mp-evk-sof-wm8960.dtb \ - freescale/imx8mp-evk-spdif-lb.dtb \ - freescale/imx8mp-evk-usdhc1-m2.dtb \ + freescale/imx8mp-ab2.dtb \ + freescale/imx8mp-evk-basler.dtb \ + freescale/imx8mp-evk-basler-ov2775.dtb \ + freescale/imx8mp-evk-basler-ov5640.dtb \ + freescale/imx8mp-evk-dpdk.dtb \ + freescale/imx8mp-evk-dsp.dtb \ + freescale/imx8mp-evk-dual-basler.dtb \ + freescale/imx8mp-evk-dual-os08a20.dtb \ + freescale/imx8mp-evk-dual-ov2775.dtb \ + freescale/imx8mp-evk-ecspi-slave.dtb \ + freescale/imx8mp-evk-flexcan2.dtb \ + freescale/imx8mp-evk-hifiberry-dacplus.dtb \ + freescale/imx8mp-evk-inmate.dtb \ + freescale/imx8mp-evk-iqaudio-dacplus.dtb \ + freescale/imx8mp-evk-iqaudio-dacpro.dtb \ + freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \ + freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \ + freescale/imx8mp-evk-ndm.dtb \ + freescale/imx8mp-evk-os08a20.dtb \ + freescale/imx8mp-evk-os08a20-ov5640.dtb \ + freescale/imx8mp-evk-ov2775.dtb \ + freescale/imx8mp-evk-ov2775-ov5640.dtb \ + freescale/imx8mp-evk-pcie-ep.dtb \ + freescale/imx8mp-evk-revA3-8mic-revE.dtb \ + freescale/imx8mp-evk-rm67191.dtb \ + freescale/imx8mp-evk-rm67199.dtb \ + freescale/imx8mp-evk-root.dtb \ + freescale/imx8mp-evk-rpmsg.dtb \ + freescale/imx8mp-evk-rpmsg-lpv.dtb \ + freescale/imx8mp-evk-sof-wm8960.dtb \ + freescale/imx8mp-evk-spdif-lb.dtb \ + freescale/imx8mp-evk-usdhc1-m2.dtb \ + freescale/imx8mp-evk-8mic-swpdm.dtb \ " UBOOT_CONFIG_BASENAME = "imx8mp_evk" UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" +UBOOT_CONFIG[ndm] = "${UBOOT_CONFIG_BASENAME}_ndm_defconfig" # Set DDR FIRMWARE DDR_FIRMWARE_VERSION = "202006" DDR_FIRMWARE_NAME = " \ - lpddr4_pmu_train_1d_dmem_${DDR_FIRMWARE_VERSION}.bin \ - lpddr4_pmu_train_1d_imem_${DDR_FIRMWARE_VERSION}.bin \ - lpddr4_pmu_train_2d_dmem_${DDR_FIRMWARE_VERSION}.bin \ - lpddr4_pmu_train_2d_imem_${DDR_FIRMWARE_VERSION}.bin \ + lpddr4_pmu_train_1d_dmem_${DDR_FIRMWARE_VERSION}.bin \ + lpddr4_pmu_train_1d_imem_${DDR_FIRMWARE_VERSION}.bin \ + lpddr4_pmu_train_2d_dmem_${DDR_FIRMWARE_VERSION}.bin \ + lpddr4_pmu_train_2d_imem_${DDR_FIRMWARE_VERSION}.bin \ " IMXBOOT_TARGETS_BASENAME = "flash_evk" + +# Mainline BSP doesn't support LPDDR4 so it must be set to nxp. +# Also this machine isn't supported by u-boot-fslc but imx8mn-evk.inc already +# set the bootloader to u-boot-imx instead when NXP BSP is used. +IMX_DEFAULT_BSP = "nxp" diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf index cea44ed1..779ac478 100644 --- a/conf/machine/imx8mq-evk.conf +++ b/conf/machine/imx8mq-evk.conf @@ -4,15 +4,22 @@ #@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit #@MAINTAINER: Jun Zhu <junzhu@nxp.com> -MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" +MACHINEOVERRIDES =. "mx8mq:" + +# FIXME: u-boot-imx should be converted to `binman` and then we can +# avoid this specific overrides and handle it in a generic way. +MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc -IMX_DEFAULT_BSP = "nxp" +# Mainline BSP defaults to "generic" cortexa53 configuration, +# adjust it here to include crypto extension which enables +# inline NEON and FPU code generation +DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" -MACHINE_FEATURES += "pci wifi bluetooth optee bcm43455 bcm4356" -MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" +MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio" +MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359" MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" @@ -69,8 +76,26 @@ ATF_PLATFORM = "imx8mq" IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" IMX_BOOT_SOC_TARGET = "iMX8M" +# Add support for Syslinux to mainline BSP. +# U-Boot has the Distro Boot mode enabled by default, which +# require that either Syslinux to be enabled, or a boot script +# to be used to define the boot process. +# We opt-in for Syslinux, since it is designated as a preferred +# distro boot mode according to the U-Boot documentation. +UBOOT_EXTLINUX:use-mainline-bsp = "1" +UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default" +UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Quad EVK" + +UBOOT_EXTLINUX_MENU_DESCRIPTION:default:use-mainline-bsp = "i.MX8M Quad EVK" +UBOOT_EXTLINUX_FDT:default:use-mainline-bsp = "../imx8mq-evk.dtb" +UBOOT_EXTLINUX_CONSOLE:default:use-mainline-bsp = "console=${console}" +UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp ??= "root=/dev/mmcblk1p2" + +# Add extlinux.conf to the lis of files, which are deployed onto the +# boot partition +IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" + LOADADDR = "" -UBOOT_SUFFIX = "bin" UBOOT_MAKE_TARGET = "" IMX_BOOT_SEEK = "33" diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf index 72c8b6a0..d35a2831 100644 --- a/conf/machine/imx8qm-mek.conf +++ b/conf/machine/imx8qm-mek.conf @@ -1,5 +1,6 @@ #@TYPE: Machine #@NAME: i.MX 8QM MEK +#@SOC: i.MX8QM #@DESCRIPTION: i.MX 8QuadMax Multisensory Enablement Kit board, rev B0 #@MAINTAINER: Lauren Post <lauren.post@nxp.com> @@ -10,11 +11,11 @@ require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc IMX_DEFAULT_BSP = "nxp" -MACHINE_FEATURES += "pci optee bcm43455 bcm4356" +MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" @@ -26,26 +27,25 @@ SERIAL_CONSOLES = "115200;ttyAMA0" USE_VT = "0" KERNEL_DEVICETREE = " \ - freescale/imx8qm-mek.dtb \ - freescale/imx8qm-mek-ca53.dtb \ - freescale/imx8qm-mek-ca72.dtb \ - freescale/imx8qm-mek-dom0.dtb \ - freescale/imx8qm-mek-domu.dtb \ - freescale/imx8qm-mek-dsi-rm67191.dtb \ - freescale/imx8qm-mek-enet2-tja1100.dtb \ - freescale/imx8qm-mek-esai.dtb \ - freescale/imx8qm-mek-hdmi.dtb \ - freescale/imx8qm-mek-inmate.dtb \ - freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ - freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ - freescale/imx8qm-mek-ov5640.dtb \ - freescale/imx8qm-mek-pcie-ep.dtb \ - freescale/imx8qm-mek-root.dtb \ - freescale/imx8qm-mek-rpmsg.dtb \ - freescale/imx8qm-mek-sof-cs42888.dtb \ - freescale/imx8qm-mek-sof-wm8960.dtb \ - freescale/imx8qm-mek-usd-wifi.dtb \ - freescale/imx8qm-mek-usdhc3-m2.dtb \ + freescale/imx8qm-mek.dtb \ + freescale/imx8qm-mek-ca53.dtb \ + freescale/imx8qm-mek-ca72.dtb \ + freescale/imx8qm-mek-dsi-rm67191.dtb \ + freescale/imx8qm-mek-enet2-tja1100.dtb \ + freescale/imx8qm-mek-esai.dtb \ + freescale/imx8qm-mek-hdmi.dtb \ + freescale/imx8qm-mek-hdmi-rx.dtb \ + freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \ + freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ + freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ + freescale/imx8qm-mek-ov5640.dtb \ + freescale/imx8qm-mek-pcie-ep.dtb \ + freescale/imx8qm-mek-rpmsg.dtb \ + freescale/imx8qm-mek-sof.dtb \ + freescale/imx8qm-mek-sof-cs42888.dtb \ + freescale/imx8qm-mek-sof-wm8960.dtb \ + freescale/imx8qm-mek-usd-wifi.dtb \ + freescale/imx8qm-mek-usdhc3-m2.dtb \ " UBOOT_MAKE_TARGET = \ diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf index 29412cc3..5c8df513 100644 --- a/conf/machine/imx8qxp-mek.conf +++ b/conf/machine/imx8qxp-mek.conf @@ -1,5 +1,6 @@ #@TYPE: Machine #@NAME: i.MX 8QXP MEK +#@SOC: i.MX8QXP #@DESCRIPTION: i.MX 8QuadXPlus Multisensory Enablement Kit board #@MAINTAINER: Lauren Post <lauren.post@nxp.com> @@ -9,18 +10,16 @@ require include/imx8x-mek.inc KERNEL_DEVICETREE_BASENAME = "${MACHINE}" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}-a0.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-dom0.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif-rpmsg.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-a0.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-sof.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \ " UBOOT_CONFIG_BASENAME = "imx8qxp_mek" diff --git a/conf/machine/imx8ulp-lpddr4-evk.conf b/conf/machine/imx8ulp-lpddr4-evk.conf new file mode 100644 index 00000000..273e1569 --- /dev/null +++ b/conf/machine/imx8ulp-lpddr4-evk.conf @@ -0,0 +1,27 @@ +#@TYPE: Machine +#@NAME: i.MX 8ULP EVK +#@SOC: i.MX8ULP +#@DESCRIPTION: Machine configuration for NXP i.MX 8ULP Evaluation Kit with LPDDR4 +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> + +require include/imx8ulp-evk.inc + +KERNEL_DEVICETREE_BASENAME = "imx8ulp-evk" + +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-epdc.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-flexio-i2c.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lpa.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-nd.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4m.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4mv2.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-sof-btsco.dtb \ +" + +UBOOT_CONFIG_BASENAME = "imx8ulp_evk" + +MACHINE_FEATURES += "soc-reva1" +UPOWER_FIRMWARE_NAME = "upower_a1.bin" +IMX_DEFAULT_BSP = "nxp" diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf new file mode 100644 index 00000000..a56b18ec --- /dev/null +++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf @@ -0,0 +1,36 @@ +#@TYPE: Machine +#@NAME: NXP i.MX 93 11x11 Evaluation Kit with LPDDR4X +#@SOC: i.MX93 +#@DESCRIPTION: Machine configuration for NXP i.MX 93 11x11 EVK with LPDDR4X +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> + +MACHINEOVERRIDES =. "mx93:" + +require include/imx93-evk.inc + +KERNEL_DEVICETREE_BASENAME = "imx93-11x11-evk" + +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-aud-hat.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-boe-wxga-lvds-panel.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-flexio-i2c.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ + " + +UBOOT_CONFIG_BASENAME = "imx93_11x11_evk" + +DDR_FIRMWARE_NAME = " \ + lpddr4_dmem_1d_v202201.bin \ + lpddr4_dmem_2d_v202201.bin \ + lpddr4_imem_1d_v202201.bin \ + lpddr4_imem_2d_v202201.bin \ +" diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf new file mode 100644 index 00000000..01843aca --- /dev/null +++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf @@ -0,0 +1,30 @@ +#@TYPE: Machine +#@NAME: NXP i.MX93 9x9 Quick Start Board with LPDDR4 +#@SOC: i.MX93 +#@DESCRIPTION: Machine configuration for NXP i.MX93 9x9 QSB with LPDDR4 +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> + +MACHINEOVERRIDES =. "mx93:" + +require include/imx93-evk.inc + +KERNEL_DEVICETREE_BASENAME = "imx93-9x9-qsb" + +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-can1.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \ +" + +UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb" + +DDR_FIRMWARE_NAME = " \ + lpddr4_dmem_1d_v202201.bin \ + lpddr4_dmem_2d_v202201.bin \ + lpddr4_imem_1d_v202201.bin \ + lpddr4_imem_2d_v202201.bin \ +" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 51c62034..277ce450 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -60,6 +60,14 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" # | # | UBOOT_MACHINE = "mx53loco_config" # `---- +# +# Please note that UBOOT_SUFFIX must be set in the machine config even +# if the value is the same for the U-Boot flavors. If the value is not +# set, then the assignment here is the one used, the value resolves to +# empty, and the build fails: +# | cp: cannot stat '/.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/build/imx8qm_mek_defconfig/u-boot.': No such file or directory +#| WARNING: /.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/temp/run.do_compile.21223:186 exit 1 from 'cp /.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/build/${config}/${binary} /.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/build/${config}/u-boot-${type}.${UBOOT_SUFFIX:pn-u-boot-imx}' +# IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}" @@ -75,20 +83,20 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" -UBOOT_ENTRYPOINT:mxs = "0x40008000" -UBOOT_ENTRYPOINT:mx51 = "0x90008000" -UBOOT_ENTRYPOINT:mx53 = "0x70008000" -UBOOT_ENTRYPOINT:mx6 = "0x10008000" -UBOOT_ENTRYPOINT:mx6sl = "0x80008000" -UBOOT_ENTRYPOINT:mx6sll = "0x80008000" -UBOOT_ENTRYPOINT:mx6sx = "0x80008000" -UBOOT_ENTRYPOINT:mx6ul = "0x80008000" -UBOOT_ENTRYPOINT:mx6ull = "0x80008000" -UBOOT_ENTRYPOINT:mx6ulz = "0x80008000" -UBOOT_ENTRYPOINT:mx7 = "0x80008000" -UBOOT_ENTRYPOINT:mx7ulp = "0x60008000" -UBOOT_ENTRYPOINT:mx8m = "0x40480000" -UBOOT_ENTRYPOINT:vf = "0x80008000" +UBOOT_ENTRYPOINT:mxs-generic-bsp ?= "0x40008000" +UBOOT_ENTRYPOINT:mx51-generic-bsp ?= "0x90008000" +UBOOT_ENTRYPOINT:mx53-generic-bsp ?= "0x70008000" +UBOOT_ENTRYPOINT:mx6-generic-bsp ?= "0x10008000" +UBOOT_ENTRYPOINT:mx6sl-generic-bsp ?= "0x80008000" +UBOOT_ENTRYPOINT:mx6sll-generic-bsp ?= "0x80008000" +UBOOT_ENTRYPOINT:mx6sx-generic-bsp ?= "0x80008000" +UBOOT_ENTRYPOINT:mx6ul-generic-bsp ?= "0x80008000" +UBOOT_ENTRYPOINT:mx6ull-generic-bsp ?= "0x80008000" +UBOOT_ENTRYPOINT:mx6ulz-generic-bsp ?= "0x80008000" +UBOOT_ENTRYPOINT:mx7-generic-bsp ?= "0x80008000" +UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000" +UBOOT_ENTRYPOINT:mx8m-generic-bsp ?= "0x40480000" +UBOOT_ENTRYPOINT:vf-generic-bsp ?= "0x80008000" # Some derivates can utilize the boot container provided by U-Boot, # below variable sets that those machines which have a imx-boot-container @@ -96,12 +104,37 @@ UBOOT_ENTRYPOINT:vf = "0x80008000" UBOOT_PROVIDES_BOOT_CONTAINER = "0" UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1" -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -XSERVER_DRIVER = "xf86-video-fbdev" -XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" -XSERVER_DRIVER:vf = "xf86-video-modesetting" -XSERVER_DRIVER:append:mx8 = " xf86-video-modesetting" -XSERVER_DRIVER:use-mainline-bsp = " \ +# Trusted Firmware for Cortex-A (TF-A) can have different providers, either +# from upstream or from NXP downstream fork. Below variable defines which TF-A +# shall be taken into the build, and will be integrated into runtime image. +# +# Upstream TF-A recipe resides in the meta-arm layer and in maintained by OE +# community. Therefore, in order to add upstream TF-A - additional layer has +# to be included in the bblayers.con file. Compatible machines are added to +# this layer via dynamic-layers mechanism. +# +# NOTE: Current upstream TF-A version (v2.7) does not support HAB feature of +# i.MX8M family. If the upstream TF-A version is chosen, then HAB will not be +# available for all SoCs that are opting-in. This might change with future TF-A +# release, so this statement shall be kept here until support is added. +# +# Default TF-A provider to NXP downstream fork +IMX_DEFAULT_ATF_PROVIDER ??= "imx-atf" + +# Allow setting the UART used during the boot by ATF. + +# FIXME: We should return INVALID here but currently only i.MX8M has support to override the UART +# base address in source code. +SOC_ATF_BOOT_UART_BASE = "" + +SOC_ATF_BOOT_UART_BASE:mx8m-generic-bsp = "0x30890000" +ATF_BOOT_UART_BASE ?= "${SOC_ATF_BOOT_UART_BASE}" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER_DRIVER = "xf86-video-fbdev" +XSERVER_DRIVER:vf-generic-bsp = "xf86-video-modesetting" +XSERVER_DRIVER:append:mx8-generic-bsp = " xf86-video-modesetting" +XSERVER_DRIVER:imx-mainline-bsp = " \ xf86-video-fbdev \ xf86-video-modesetting \ xserver-xorg-extension-glx \ @@ -118,42 +151,106 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" # ARM_INSTRUCTION_SET = "thumb" # # handled by software -# DEFAULTTUNE:mx6 ?= "cortexa9t-neon" +# DEFAULTTUNE:mx6-generic-bsp ?= "cortexa9t-neon" # handled by hardware -DEFAULTTUNE:mx6 ?= "cortexa9thf-neon" -DEFAULTTUNE:mx6ul ?= "cortexa7thf-neon" -DEFAULTTUNE:mx6ull ?= "cortexa7thf-neon" -DEFAULTTUNE:mx6ulz ?= "cortexa7thf-neon" -DEFAULTTUNE:mx7 ?= "cortexa7thf-neon" -DEFAULTTUNE:vf ?= "cortexa5thf-neon" - -DEFAULTTUNE:mx8m ?= "cortexa53-crypto" -DEFAULTTUNE:mx8qm ?= "cortexa72-cortexa53-crypto" -DEFAULTTUNE:mx8qxp ?= "cortexa35-crypto" +DEFAULTTUNE:mx6-generic-bsp ?= "cortexa9thf-neon" +DEFAULTTUNE:mx6ul-generic-bsp ?= "cortexa7thf-neon" +DEFAULTTUNE:mx6ull-generic-bsp ?= "cortexa7thf-neon" +DEFAULTTUNE:mx6ulz-generic-bsp ?= "cortexa7thf-neon" +DEFAULTTUNE:mx7-generic-bsp ?= "cortexa7thf-neon" +DEFAULTTUNE:vf-generic-bsp ?= "cortexa5thf-neon" + +DEFAULTTUNE:mx8m-generic-bsp ?= "cortexa53-crypto" +DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto" +DEFAULTTUNE:mx8x-generic-bsp ?= "cortexa35-crypto" +DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto" +DEFAULTTUNE:mx93-generic-bsp ?= "cortexa55" INHERIT += "machine-overrides-extender" -MACHINEOVERRIDES_EXTENDER:mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx6sll = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx6ul = "imxfbdev:imxpxp" -MACHINEOVERRIDES_EXTENDER:mx6ull = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx6ulz = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx7d = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8mn = "imxdrm:imxgpu:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8mp = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8dxl = "imxfbdev" - -MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \ - imx \ - \ +####### +### NXP BSP specific overrides +####### + +MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx6sll:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:mx6sll-generic-bsp:mx6sll-nxp-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6ul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx6ull:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx6ulz:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:mx6ulz-generic-bsp:mx6ulz-nxp-bsp" + +MACHINEOVERRIDES_EXTENDER:mx7d:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx7-generic-bsp:mx7-nxp-bsp:mx7d-generic-bsp:mx7d-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp" + +MACHINEOVERRIDES_EXTENDER:vf:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:vf-generic-bsp:vf-nxp-bsp" + +MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp" + +MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mnul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mnul-generic-bsp:mx8mnul-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp" + +MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8dxl-generic-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dxl-nxp-bsp" + +MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp" + +MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp" + +####### +### Mainline BSP specific overrides +####### + +MACHINEOVERRIDES_EXTENDER:mx23:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mxs-generic-bsp:mxs-mainline-bsp:mx23-generic-bsp:mx23-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx28:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mxs-generic-bsp:mxs-mainline-bsp:mx28-generic-bsp:mx28-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx27:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx27-generic-bsp:mx27-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx51:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx51-generic-bsp:mx51-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx53:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx53-generic-bsp:mx53-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6q:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6q-generic-bsp:mx6q-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx6dl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6dl-generic-bsp:mx6dl-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6sx:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sx-generic-bsp:mx6sx-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6sl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sl-generic-bsp:mx6sl-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx6sll:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sll-generic-bsp:mx6sll-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6ul:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx6ull:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp:mx6ull-generic-bsp:mx6ull-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx6ulz:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp:mx6ull-generic-bsp:mx6ull-mainline-bsp:mx6ulz-generic-bsp:mx6ulz-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx7d:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx7-generic-bsp:mx7-mainline-bsp:mx7d-generic-bsp:mx7d-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx7ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx7-generic-bsp:mx7-mainline-bsp:mx7ulp-generic-bsp:mx7ulp-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:vf:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:vf-generic-bsp:vf-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx8qm:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8qm-generic-bsp:mx8qm-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx8mm:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mm-generic-bsp:mx8mm-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mn:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mn-generic-bsp:mx8mn-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mnul:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mnul-generic-bsp:mx8mnul-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mp-generic-bsp:mx8mp-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mq:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mq-generic-bsp:mx8mq-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx8qxp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8x-generic-bsp:mx8x-mainline-bsp:mx8qxp-generic-bsp:mx8qxp-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx8dx:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8x-generic-bsp:mx8x-mainline-bsp:mx8dx-generic-bsp:mx8dx-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx8dxl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8x-generic-bsp:mx8x-mainline-bsp:mx8dxl-generic-bsp:mx8dxl-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx8ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8ulp-generic-bsp:mx8ulp-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ mx6 \ mx6q \ mx6dl \ @@ -168,42 +265,55 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \ mx7d \ mx7ulp \ \ + vf \ + \ mx8 \ mx8m \ mx8qm \ mx8mm \ mx8mn \ + mx8mnul \ mx8mp \ mx8mq \ mx8qxp \ + mx8dx \ mx8dxl \ + mx8ulp \ + mx93 \ " +MACHINEOVERRIDES_FILTERED_OUT_QA_ERROR = "%s overrides cannot be used and need conversion to use the new BSP-specific overrides. Check 'meta-freescale/scripts/convert-bsp-specific-overrides'." + # Sub-architecture support MACHINE_SOCARCH_SUFFIX ?= "" -MACHINE_SOCARCH_SUFFIX:mx6q = "-mx6qdl" -MACHINE_SOCARCH_SUFFIX:mx6dl = "-mx6qdl" -MACHINE_SOCARCH_SUFFIX:mx6sx = "-mx6sx" -MACHINE_SOCARCH_SUFFIX:mx6sl = "-mx6sl" -MACHINE_SOCARCH_SUFFIX:mx6sll= "-mx6sll" -MACHINE_SOCARCH_SUFFIX:mx7d = "-mx7d" -MACHINE_SOCARCH_SUFFIX:mx7ulp = "-mx7ulp" -MACHINE_SOCARCH_SUFFIX:vf60 = "-vf60" -MACHINE_SOCARCH_SUFFIX:vf50 = "-vf50" -MACHINE_SOCARCH_SUFFIX:mx6ul = "-mx6ul" -MACHINE_SOCARCH_SUFFIX:mx6ull = "-mx6ul" -MACHINE_SOCARCH_SUFFIX:mx6ulz = "-mx6ul" -MACHINE_SOCARCH_SUFFIX:mx8qm = "-mx8" -MACHINE_SOCARCH_SUFFIX:mx8mm = "-mx8mm" -MACHINE_SOCARCH_SUFFIX:mx8mn = "-mx8mn" -MACHINE_SOCARCH_SUFFIX:mx8mp = "-mx8mp" -MACHINE_SOCARCH_SUFFIX:mx8mq = "-mx8m" -MACHINE_SOCARCH_SUFFIX:mx8qxp = "-mx8" -MACHINE_SOCARCH_SUFFIX:mx8dxl = "-mx8dxl" -MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx" +MACHINE_SOCARCH_SUFFIX:mx6q-nxp-bsp = "-mx6qdl" +MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl" +MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx" +MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl" +MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp= "-mx6sll" +MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d" +MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp" +MACHINE_SOCARCH_SUFFIX:vf-nxp-bsp = "-vf" +MACHINE_SOCARCH_SUFFIX:mx6ul-nxp-bsp = "-mx6ul" +MACHINE_SOCARCH_SUFFIX:mx6ull-nxp-bsp = "-mx6ul" +MACHINE_SOCARCH_SUFFIX:mx6ulz-nxp-bsp = "-mx6ul" +MACHINE_SOCARCH_SUFFIX:mx8qm-nxp-bsp = "-mx8" +MACHINE_SOCARCH_SUFFIX:mx8mm-nxp-bsp = "-mx8mm" +MACHINE_SOCARCH_SUFFIX:mx8mn-nxp-bsp = "-mx8mn" +MACHINE_SOCARCH_SUFFIX:mx8mnul-nxp-bsp = "-mx8mnl" +MACHINE_SOCARCH_SUFFIX:mx8mp-nxp-bsp = "-mx8mp" +MACHINE_SOCARCH_SUFFIX:mx8mq-nxp-bsp = "-mx8m" +MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8" +MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp = "-mx8" +MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8xl" +MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp = "-mx8ulp" +MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp = "-mx93" + +# For Mainline we use a single SoC suffix as we don't have different build options +MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER:append:imx = " \ +MACHINE_SOCARCH_FILTER:append:imx-nxp-bsp = " \ alsa-lib \ gstreamer1.0 \ weston \ @@ -214,13 +324,22 @@ MACHINE_SOCARCH_FILTER:append:imxvpu = " \ libimxvpuapi \ virtual/imxvpu \ " +MACHINE_SOCARCH_FILTER:append:imxvulkan = " \ + vulkan-headers \ + vulkan-loader \ + vulkan-tools \ +" MACHINE_SOCARCH_FILTER:append:imxgpu = " \ virtual/egl \ - virtual/mesa \ virtual/libopenvg \ + virtual/mesa \ + virtual/opencl-icd \ libdrm \ cairo \ libgal-imx \ + opencl-icd-loader \ + opencl-clhpp \ + opencl-headers \ opencv \ pango \ " @@ -232,7 +351,7 @@ MACHINE_SOCARCH_FILTER:append:imxgpu3d = " \ virtual/libgles1 \ virtual/libgles2 \ " -MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \ +MACHINE_SOCARCH_FILTER:append:imx-mainline-bsp = " \ virtual/egl \ virtual/libopenvg \ virtual/libg2d \ @@ -244,17 +363,7 @@ MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \ pango \ qtbase \ " -MACHINE_SOCARCH_FILTER:append:mx6q = " \ - opencl-icd-loader \ - opencl-clhpp \ - opencl-headers \ -" -MACHINE_SOCARCH_FILTER:append:mx8 = " \ - opencl-icd-loader \ - opencl-clhpp \ - opencl-headers \ -" -MACHINE_SOCARCH_FILTER:append:mx8qm = " \ +MACHINE_SOCARCH_FILTER:append:mx8qm-nxp-bsp = " \ virtual/libopenvx \ " @@ -268,41 +377,70 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \ imx-test->virtual/imxvpu \ " +# Firmware used for boot. +IMX_EXTRA_FIRMWARE ?= "" +IMX_EXTRA_FIRMWARE:mx8-generic-bsp = "firmware-imx-8 imx-sc-firmware imx-seco" +IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "firmware-imx-8m" +IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" +IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-sentinel" +IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "firmware-imx-8 firmware-sentinel" + # Firmware MACHINE_FIRMWARE ?= "" -MACHINE_FIRMWARE:append:mx27 = " firmware-imx-vpu-imx27" -MACHINE_FIRMWARE:append:mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" -MACHINE_FIRMWARE:append:mx6 = " linux-firmware-imx-sdma-imx6q" -MACHINE_FIRMWARE:append:mx6q = " firmware-imx-vpu-imx6q" -MACHINE_FIRMWARE:append:mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" -MACHINE_FIRMWARE:append:mx6sl = " firmware-imx-epdc" -MACHINE_FIRMWARE:append:mx6sll = " firmware-imx-epdc" -MACHINE_FIRMWARE:append:mx6ull = " firmware-imx-epdc" -MACHINE_FIRMWARE:append:mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" -MACHINE_FIRMWARE:append:mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" -MACHINE_FIRMWARE:append:mx8mm = " linux-firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE:append:mx8mn = " linux-firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE:append:mx8mp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" -MACHINE_FIRMWARE:append:mx8mq = " linux-firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE:append:mx8qm = " firmware-imx-vpu-imx8" -MACHINE_FIRMWARE:append:mx8qxp = " firmware-imx-vpu-imx8" -MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" +MACHINE_FIRMWARE:append:mx27-generic-bsp = " firmware-imx-vpu-imx27" +MACHINE_FIRMWARE:append:mx51-generic-bsp = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" +MACHINE_FIRMWARE:append:mx53-generic-bsp = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" +MACHINE_FIRMWARE:append:mx6-generic-bsp = " linux-firmware-imx-sdma-imx6q" +MACHINE_FIRMWARE:append:mx6q-generic-bsp = " firmware-imx-vpu-imx6q" +MACHINE_FIRMWARE:append:mx6dl-generic-bsp = " firmware-imx-vpu-imx6d firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6sl-generic-bsp = " firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6sll-generic-bsp = " firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6ull-generic-bsp = " firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx7d-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx8qm-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx8" +MACHINE_FIRMWARE:append:mx8mm-generic-bsp = " linux-firmware-imx-sdma-imx7d" +MACHINE_FIRMWARE:append:mx8mn-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn" +MACHINE_FIRMWARE:append:mx8mnul-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn" +MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" +MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" +MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx8" +MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx8" +MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" # Extra audio support IMX_ALSA_EXTRA = "" -IMX_ALSA_EXTRA:use-nxp-bsp = "imx-alsa-plugins" -MACHINE_EXTRA_RRECOMMENDS:append:mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" -MACHINE_EXTRA_RRECOMMENDS:append:mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" -MACHINE_EXTRA_RRECOMMENDS:append:mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +IMX_ALSA_EXTRA:imx-nxp-bsp = "imx-alsa-plugins" +MACHINE_EXTRA_RRECOMMENDS:append:mx6-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append:mx7-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append:mx8-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" # Extra Cypress Wi-Fi and BTW firmware (Murata) MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}" MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}" MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" -MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}" +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'firmware-nxp-wifi-bcm4359-pcie', '', d)}" + +# Extra NXP Wi-Fi and Bluetooth driver firmware and driver +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'firmware-nxp-wifi-nxp8801-sdio', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'kernel-module-nxp89xx', '', d)}" + +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'firmware-nxp-wifi-nxp8987-sdio', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'kernel-module-nxp89xx', '', d)}" + +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'firmware-nxp-wifi-nxp8997-pcie', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'kernel-module-nxp89xx', '', d)}" + +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'firmware-nxp-wifi-nxp8997-sdio', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'kernel-module-nxp89xx', '', d)}" + +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'firmware-nxp-wifi-nxp9098-pcie', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'kernel-module-nxp89xx', '', d)}" + +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-sdio', 'firmware-nxp-wifi-nxp9098-sdio', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-sdio', 'kernel-module-nxp89xx', '', d)}" # Extra QCA Wi-Fi & BTE driver and firmware MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" @@ -317,28 +455,35 @@ MACHINE_EXTRA_RRECOMMENDS += " \ " # GStreamer 1.0 plugins -MACHINE_GSTREAMER_1_0_PLUGIN ?= "" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6q ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx7d ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp ?= "imx-gst1.0-plugin" - -PREFERRED_VERSION_gstreamer1.0:mx8 ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8 ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8 ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8 ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8 ?= "1.18.0" -PREFERRED_VERSION_gstreamer1.0-libav:mx8 ?= "1.18.0" -PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8 ?= "1.18.0" +MACHINE_GSTREAMER_1_0_PLUGIN ?= "" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6q-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx7d-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin" + +PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_gstreamer1.0-omx:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.20.3.imx" +PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" # Determines if the SoC has support for Vivante kernel driver SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" @@ -359,49 +504,53 @@ PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgl:imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv" 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_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" -PREFERRED_VERSION_weston:imx ?= "9.0.0.imx" -PREFERRED_VERSION_weston:use-mainline-bsp = "" +PREFERRED_VERSION_weston:imx-nxp-bsp ??= "10.0.1.imx" +PREFERRED_VERSION_weston:imx-mainline-bsp = "" -PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.20.imx" -PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.20.imx" -PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.20.imx" +PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.25.imx" +PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ??= "1.25.imx" +PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.25.imx" +PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.25.imx" # Use i.MX libdrm Version -PREFERRED_VERSION_libdrm:mx6 ?= "2.4.102.imx" -PREFERRED_VERSION_libdrm:mx7 ?= "2.4.102.imx" -PREFERRED_VERSION_libdrm:mx8 ?= "2.4.102.imx" +PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.109.imx" +PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.109.imx" +PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.109.imx" +PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.109.imx" + +PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.2.182.0" +PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.2.182.0" +PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.2.182.0" # Use i.MX optee Version -PREFERRED_VERSION_optee-os:mx8 ?= "3.10.0.imx" -PREFERRED_VERSION_optee-client:mx8 ?= "3.10.0.imx" -PREFERRED_VERSION_optee-test:mx8 ?= "3.10.0.imx" +PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "3.19.0.imx" +PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "3.19.0.imx" +PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.19.0.imx" +PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.19.0.imx" +PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.19.0.imx" +PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.19.0.imx" -#Use i.MX opencv Version for mx8 -PREFERRED_VERSION_opencv:mx8 ?= "4.5.2.imx" +# Use i.MX opencv Version +PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" +PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx" # Handle default kernel -IMX_DEFAULT_KERNEL = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mxs = "linux-fslc" -IMX_DEFAULT_KERNEL:mx5 = "linux-fslc" -IMX_DEFAULT_KERNEL:mx6 = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx7 = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx8 = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx7ulp = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx6sll = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx6ul = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx6ull = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc" +IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" +IMX_DEFAULT_KERNEL:imx-nxp-bsp = "linux-fslc-imx" PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz" -SOC_DEFAULT_IMAGE_FSTYPES:mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz" +SOC_DEFAULT_IMAGE_FSTYPES:mxs-generic-bsp = "uboot-mxsboot-sdcard wic.bmap wic.gz" # Do not update fstab file when using wic images WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" @@ -430,52 +579,37 @@ WKS_FILE_DEPENDS ?= " \ ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ " -WKS_FILE_DEPENDS:append:mx8 = " imx-boot" -WKS_FILE_DEPENDS:append:mx8m = " imx-boot" - # We need to restrict the append so we don't add this for other i.MX SoC's. # Derivatives that are not yet adopted the usage of boot container provided # by U-Boot build are still targeted to use 'imx-boot' package provided by -# NXP. Moving those derivatives to mainline BSP would require to define an +# NXP. +# +# Moving those derivatives to mainline BSP would require to define an # 'imx-boot-container' override, and test if the U-Boot built 'flash.bin' # binary is used a replacement. -# Note, that the results binary name of the boot container is set to 'imx-boot' +# +# NOTE: the results binary name of the boot container is set to 'imx-boot' # for both NXP and Mainline BSP. -# For Mainline BSP: the 'flash.bin' boot container is renamed during the -# deployment task extesion execution defined in imx-boot-container class. -# For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile -# task. -WKS_FILE_DEPENDS:append:use-mainline-bsp:aarch64 = " \ +WKS_FILE_DEPENDS:append:imx-generic-bsp:aarch64 = " \ ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ " SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" -SOC_DEFAULT_WKS_FILE:mx8m ?= "imx-imx-boot-bootpart.wks.in" - -SOC_DEFAULT_WKS_FILE:mx8 ?= "imx-imx-boot-bootpart.wks.in" -SOC_DEFAULT_WKS_FILE:mxs ?= "imx-uboot-mxs-bootpart.wks.in" - -# Boot container built as a part of mainline U-Boot uses different WKS -# file as the entire mx8m series, as U-Boot versions later than 2021.04 are -# providing two separate binaries, namely flash.bin and u-boot.itb. Those -# files are packed into the boot partition. -# Binaries produced by U-Boot build itself are serving as a direct -# replacement of imx-boot from NXP. -# Creation of those binary files is controlled by UBOOT_PROVIDES_BOOT_CONTAINER -# variable defined above. -SOC_DEFAULT_WKS_FILE:imx-boot-container ?= "imx-boot-container-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:mx9-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" SERIAL_CONSOLES = "115200;ttymxc0" -SERIAL_CONSOLES:mxs = "115200;ttyAMA0" +SERIAL_CONSOLES:mxs-generic-bsp = "115200;ttyAMA0" KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPE:aarch64 = "Image" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" -# Add the ability to specify imx machines -MACHINEOVERRIDES =. "imx:" +HOSTTOOLS_NONFATAL:append:mx8-nxp-bsp = " sha384sum" -HOSTTOOLS_NONFATAL:append:mx8 = " sha384sum" +# Allow meta-imx to add NIP devices information until upstreamed. +include conf/machine/include/imx-base-extend.inc diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc index a0006399..0f9aa1f0 100644 --- a/conf/machine/include/imx8dxl-evk.inc +++ b/conf/machine/include/imx8dxl-evk.inc @@ -1,15 +1,15 @@ -MACHINEOVERRIDES =. "mx8:mx8x:mx8dxl:" +MACHINEOVERRIDES =. "mx8dxl:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa35.inc IMX_DEFAULT_BSP = "nxp" -MACHINE_FEATURES += "pci bcm43455 bcm4356" +MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" @@ -40,6 +40,7 @@ UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" IMX_BOOT_SEEK = "32" @@ -57,6 +58,3 @@ IMXBOOT_TARGETS = \ bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_FSPI}', \ bb.utils.contains('UBOOT_CONFIG', 'nand', '${IMXBOOT_TARGETS_NAND}', \ 'INVALID', d), d), d)}" - - -BOARD_TYPE = "evk" diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index 85419a45..507da6aa 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc @@ -1,4 +1,8 @@ -MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mm:" +MACHINEOVERRIDES =. "mx8mm:" + +# FIXME: u-boot-imx should be converted to `binman` and then we can +# avoid this specific overrides and handle it in a generic way. +MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc @@ -8,7 +12,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc # inline NEON and FPU code generation DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" -MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" +MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8987-sdio" # NXP BSP can consume proprietary jailhouse and BCM4359 firmware # Since the firmware is not available publicly, and rather distributed @@ -22,14 +26,14 @@ KERNEL_DEVICETREE = " \ freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191-cmd-ram.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199-cmd-ram.dtb \ " UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" -IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx" -IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc" - UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" @@ -39,10 +43,6 @@ UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig" SPL_BINARY = "spl/u-boot-spl.bin" ATF_PLATFORM = "imx8mm" -ATF_LOAD_ADDR = "0x920000" - -# Extra firmware package name, that is required to build boot container for fslc bsp -IMX_EXTRA_FIRMWARE = "firmware-imx-8m" IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" @@ -70,7 +70,6 @@ UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp = "root=/dev/mmcblk1p2" IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" LOADADDR = "" -UBOOT_SUFFIX = "bin" UBOOT_MAKE_TARGET = "all" IMX_BOOT_SEEK = "33" diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 4f897349..f44b7a9d 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -1,4 +1,8 @@ -MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:" +MACHINEOVERRIDES =. "mx8mn:" + +# FIXME: u-boot-imx should be converted to `binman` and then we can +# avoid this specific overrides and handle it in a generic way. +MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc @@ -8,7 +12,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc # inline NEON and FPU code generation DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" -MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" +MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356 nxp8987-sdio" # NXP BSP can consume proprietary jailhouse and Broadcom drivers # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have @@ -16,14 +20,16 @@ MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" KERNEL_DEVICETREE = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lk.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191-cmd-ram.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199-cmd-ram.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ " UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" @@ -35,15 +41,12 @@ UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" +UBOOT_CONFIG[ld] = "${UBOOT_CONFIG_BASENAME}_ld_defconfig" UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig" SPL_BINARY = "spl/u-boot-spl.bin" ATF_PLATFORM = "imx8mn" -ATF_LOAD_ADDR = "0x960000" - -# Extra firmware package name, that is required to build boot container for fslc bsp -IMX_EXTRA_FIRMWARE = "firmware-imx-8m" IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" @@ -72,7 +75,6 @@ IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.con BOOT_SPACE = "65536" LOADADDR = "" -UBOOT_SUFFIX = "bin" UBOOT_MAKE_TARGET = "all" # Image boot offset as defined in section 6.1.6.1 "Primary image offset and IVT offset" of diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index 7635d08c..8866331c 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc @@ -1,4 +1,8 @@ -MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:" +MACHINEOVERRIDES =. "mx8mp:" + +# FIXME: u-boot-imx should be converted to `binman` and then we can +# avoid this specific overrides and handle it in a generic way. +MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc @@ -8,7 +12,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc # inline NEON and FPU code generation DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" -MACHINE_FEATURES += "pci wifi bluetooth" +MACHINE_FEATURES += "pci wifi bluetooth nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio" # NXP BSP can consume proprietary jailhouse and Marvell drivers # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have @@ -36,10 +40,6 @@ UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig" SPL_BINARY = "spl/u-boot-spl.bin" ATF_PLATFORM = "imx8mp" -ATF_LOAD_ADDR = "0x970000" - -# Extra firmware package name, that is required to build boot container for fslc bsp -IMX_EXTRA_FIRMWARE = "firmware-imx-8m" IMXBOOT_TARGETS = \ "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', \ @@ -69,7 +69,6 @@ UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp = "root=/dev/mmcblk1p2" IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" LOADADDR = "" -UBOOT_SUFFIX = "bin" UBOOT_MAKE_TARGET = "all" IMX_BOOT_SEEK = "32" diff --git a/conf/machine/include/imx8ulp-evk.inc b/conf/machine/include/imx8ulp-evk.inc new file mode 100644 index 00000000..23269530 --- /dev/null +++ b/conf/machine/include/imx8ulp-evk.inc @@ -0,0 +1,44 @@ +MACHINEOVERRIDES =. "mx8:mx8ulp:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/arm/armv8a/tune-cortexa35.inc + +MACHINE_FEATURES += "pci wifi bluetooth optee jailhouse" + +KERNEL_DEVICETREE = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ +" + +IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc" + +LOADADDR = "" +UBOOT_SUFFIX = "bin" +UBOOT_MAKE_TARGET = "" + +SPL_BINARY = "spl/u-boot-spl.bin" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" +UBOOT_CONFIG[nd] = "${UBOOT_CONFIG_BASENAME}_nd_defconfig" + +# Set ATF platform name +ATF_PLATFORM = "imx8ulp" + +IMXBOOT_TARGETS_SD = "flash_singleboot flash_dualboot" +IMXBOOT_TARGETS_FSPI = "flash_dualboot_flexspi" +IMXBOOT_TARGETS_ND = "" + +IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \ + bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_FSPI}', \ + '${IMXBOOT_TARGETS_ND}', d), d)}" + +IMX_BOOT_SOC_TARGET = "iMX8ULP" +IMX_BOOT_SEEK = "32" + +# We have to disable SERIAL_CONSOLE due to auto-serial-console +SERIAL_CONSOLES = "115200;ttyLP1" + +# Add additional firmware +MACHINE_FIRMWARE:append = " firmware-imx-epdc" diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc index b4964c30..9eaa77c5 100644 --- a/conf/machine/include/imx8x-mek.inc +++ b/conf/machine/include/imx8x-mek.inc @@ -1,15 +1,13 @@ -MACHINEOVERRIDES =. "mx8:mx8x:" - require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa35.inc IMX_DEFAULT_BSP = "nxp" -MACHINE_FEATURES += "pci optee bcm43455 bcm4356" +MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc new file mode 100644 index 00000000..fca79e78 --- /dev/null +++ b/conf/machine/include/imx93-evk.inc @@ -0,0 +1,37 @@ +require conf/machine/include/imx-base.inc +require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc + +MACHINE_FEATURES += "pci wifi bluetooth" +MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse iw612" + +KERNEL_DEVICETREE = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ +" +UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" + +IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc" + +LOADADDR = "" +UBOOT_SUFFIX = "bin" +UBOOT_MAKE_TARGET = "" + +SPL_BINARY = "spl/u-boot-spl.bin" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" +UBOOT_CONFIG[ecc] = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig" +UBOOT_CONFIG[ld] = "${UBOOT_CONFIG_BASENAME}_ld_defconfig" + +# Set ATF platform name +ATF_PLATFORM = "imx93" + +IMXBOOT_TARGETS = "flash_singleboot" + +IMX_BOOT_SOC_TARGET = "iMX9" +IMX_BOOT_SEEK = "32" + +# We have to disable SERIAL_CONSOLE due to auto-serial-console +SERIAL_CONSOLES = "115200;ttyLP0" + +IMX_DEFAULT_BSP = "nxp" diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc index eb03af43..89e9c4c0 100644 --- a/conf/machine/include/qoriq-arm.inc +++ b/conf/machine/include/qoriq-arm.inc @@ -1,5 +1,7 @@ # Provides the common settings for QorIQ ARM +# default assignment to override defaults from kernel.bbclass +# should be assigned by machine if other type needed KERNEL_IMAGETYPE ?= "uImage" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index 0d8978e3..4340c942 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc @@ -1,7 +1,7 @@ # common providers of QorIQ targets -PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" -PREFERRED_PROVIDER_virtual/bootloader ?= "${PREFERRED_PROVIDER_u-boot}" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" +PREFERRED_PROVIDER_u-boot ??= "u-boot-qoriq" +PREFERRED_PROVIDER_virtual/bootloader ??= "${PREFERRED_PROVIDER_u-boot}" +PREFERRED_PROVIDER_virtual/kernel ??= "linux-qoriq" PREFERRED_PROVIDER_u-boot-tools-native ??= "u-boot-tools-native" PREFERRED_PROVIDER_u-boot-mkimage-native ??= "u-boot-tools-native" PREFERRED_PROVIDER_u-boot-mkimage ??= "u-boot-tools" @@ -39,7 +39,7 @@ WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" MACHINE_FEATURES ?= "pci ext2 ext3 serial" MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules" -EXTRA_IMAGEDEPENDS += "u-boot cst-native" +EXTRA_IMAGEDEPENDS += "u-boot qoriq-cst-native" MACHINEOVERRIDES =. "qoriq:" diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf index d70a5a61..268a60c3 100644 --- a/conf/machine/ls1028ardb.conf +++ b/conf/machine/ls1028ardb.conf @@ -4,13 +4,13 @@ #@DESCRIPTION: Machine configuration for running LS1028ARDB in 64-bit mode #@MAINTAINER: Chunrong.Guo <chunrong.guo@nxp.com> +MACHINEOVERRIDES =. "fsl-lsch3:ls1028a:" + require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc MACHINE_FEATURES += "optee" -MACHINEOVERRIDES =. "fsl-lsch3:ls1028a:" - KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf index 8e815295..2b82c98f 100644 --- a/conf/machine/ls1046ardb.conf +++ b/conf/machine/ls1046ardb.conf @@ -29,6 +29,7 @@ KERNEL_DEVICETREE ?= "\ KERNEL_DEVICETREE:prepend:use-nxp-bsp = "\ freescale/fsl-ls1046a-rdb-sdk.dtb \ freescale/fsl-ls1046a-rdb-usdpaa.dtb \ + freescale/fsl-ls1046a-rdb-usdpaa-shared.dtb \ freescale/fsl-ls1046a-qds-sdk.dtb \ " KERNEL_DEFCONFIG ?= "defconfig" diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf index ecfe70ae..f9d05b69 100644 --- a/conf/machine/ls1088ardb-pb.conf +++ b/conf/machine/ls1088ardb-pb.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for running LS1088ARDB in 64-bit mode #@MAINTAINER: Chunrong Guo <Chunrong.Guo@nxp.com> +MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" + require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc -MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" - MACHINE_FEATURES += "optee" KERNEL_CLASSES = " kernel-fitimage " diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf index e433b7fc..1b7a4f3c 100644 --- a/conf/machine/ls1088ardb.conf +++ b/conf/machine/ls1088ardb.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for running LS1088ARDB in 64-bit mode #@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com> +MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" + require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc -MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" - MACHINE_FEATURES += "optee" KERNEL_CLASSES = " kernel-fitimage " diff --git a/conf/machine/ls2080ardb.conf b/conf/machine/ls2080ardb.conf index 5bd4dae8..6dcc7dae 100644 --- a/conf/machine/ls2080ardb.conf +++ b/conf/machine/ls2080ardb.conf @@ -8,7 +8,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:ls2080a:" require conf/machine/include/qoriq-arm64.inc -require conf/machine/include/arm/arch-arm64.inc +require conf/machine/include/arm/arch-armv8a.inc UBOOT_CONFIG ??= "nor" UBOOT_CONFIG[nor] = "ls2080ardb_defconfig" diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf index 7f83e89d..8c8e586a 100644 --- a/conf/machine/ls2088ardb.conf +++ b/conf/machine/ls2088ardb.conf @@ -5,7 +5,7 @@ #@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com> require conf/machine/include/qoriq-arm64.inc -require conf/machine/include/arm/arch-arm64.inc +require conf/machine/include/arm/arch-armv8a.inc MACHINEOVERRIDES =. "fsl-lsch3:ls2088a:" diff --git a/conf/machine/mpc8548cds.conf b/conf/machine/mpc8548cds.conf index c7c49ddc..bd4b6500 100644 --- a/conf/machine/mpc8548cds.conf +++ b/conf/machine/mpc8548cds.conf @@ -1,5 +1,6 @@ #@TYPE: Machine #@Name: NXP MPC8548CDS +#@SOC: MPC8548CDS #@DESCRIPTION: Machine configuration for the NXP MPC8548CDS #@MAINTAINER: Chunrong Guo <chunrong.guo@nxp.com> diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc index c719c8ae..b77fbc83 100644 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc @@ -41,4 +41,4 @@ python add_chromium_imx_patches() { d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1)) } -COMPATIBLE_MACHINE = "(mx6)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp)" diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini index 707a4078..b1392871 100644 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini @@ -4,7 +4,6 @@ modules=hmi-controller.so #gbm-format=argb8888 idle-time=0 #use-g2d=1 -#xwayland=true #repaint-window=16 #enable-overlay-view=1 diff --git a/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend new file mode 100644 index 00000000..400e850e --- /dev/null +++ b/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -0,0 +1,16 @@ +# Common Build targets +TFA_BUILD_TARGET = "all" +TFA_INSTALL_TARGET = "bl31" + +# List of supported machines from this layer +COMPATIBLE_MACHINE:imx8mm-lpddr4-evk = "imx8mm-lpddr4-evk" +TFA_PLATFORM:imx8mm-lpddr4-evk = "imx8mm" + +COMPATIBLE_MACHINE:imx8mn-ddr4-evk = "imx8mn-ddr4-evk" +TFA_PLATFORM:imx8mn-ddr4-evk = "imx8mn" + +COMPATIBLE_MACHINE:imx8mp-lpddr4-evk = "imx8mp-lpddr4-evk" +TFA_PLATFORM:imx8mp-lpddr4-evk = "imx8mp" + +COMPATIBLE_MACHINE:imx8mq-evk = "imx8mq-evk" +TFA_PLATFORM:imx8mq-evk = "imx8mq" diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/vlc/vlc_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/vlc/vlc_%.bbappend new file mode 100644 index 00000000..b85752b7 --- /dev/null +++ b/dynamic-layers/multimedia-layer/recipes-multimedia/vlc/vlc_%.bbappend @@ -0,0 +1,2 @@ +# vivante drivers does not provide glx +PACKAGECONFIG:remove:imxgpu = "x11" diff --git a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend index 998d11f7..4cfa51ea 100644 --- a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend +++ b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend @@ -1,4 +1,4 @@ # Only _mx8 machine do provide virtual/libgbm required for any drm* flavour DRM-REMOVE:imxgpu = "drm-gl drm-gles2" -DRM-REMOVE:imxgpu:mx8 = "" +DRM-REMOVE:imxgpu:mx8-nxp-bsp = "" PACKAGECONFIG:remove = "${DRM-REMOVE}" diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch b/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch new file mode 100644 index 00000000..a3f5c828 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch @@ -0,0 +1,56 @@ +NXP uses weaken to solve conflict in linking. +On Ubuntu 22.04(LTS) this fails to link cst with libcrypto. + +The patch fixes the conflict in the code itself. +It restricts the scope of err_msg to the module. + +Upstream-Status: Inappropriate [i.MX specific] +Signed-off-by: Walter Schweizer <walter.schweizer@siemens.com> +---- +diff --git a/code/cst/code/build/make/rules.mk b/code/cst/code/build/make/rules.mk +index 1c0842b..9c46cc4 100644 +--- a/code/cst/code/build/make/rules.mk ++++ b/code/cst/code/build/make/rules.mk +@@ -25,11 +25,11 @@ LFLAGS := -t + %.a: + @echo "Create archive $@" + $(AR) $(ARFLAGS) $@ $^ +-ifneq ($(OSTYPE),mingw32) +-ifneq ($(OSTYPE),osx) +- $(OBJCOPY) --weaken $@ +-endif +-endif ++#ifneq ($(OSTYPE),mingw32) ++#ifneq ($(OSTYPE),osx) ++# $(OBJCOPY) --weaken $@ ++#endif ++#endif + + %.exe: + @echo "Link $@" +diff --git a/code/cst/code/front_end/src/acst.c b/code/cst/code/front_end/src/acst.c +index fb1e8aa..1e993ee 100644 +--- a/code/cst/code/front_end/src/acst.c ++++ b/code/cst/code/front_end/src/acst.c +@@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + /*=========================================================================== + LOCAL VARIABLES + =============================================================================*/ +-char err_msg[MAX_ERR_MSG_BYTES]; ++static char err_msg[MAX_ERR_MSG_BYTES]; + + /*=========================================================================== + LOCAL FUNCTION PROTOTYPES +diff --git a/code/cst/code/front_end/src/misc_helper.c b/code/cst/code/front_end/src/misc_helper.c +index 678dc17..9014b2a 100644 +--- a/code/cst/code/front_end/src/misc_helper.c ++++ b/code/cst/code/front_end/src/misc_helper.c +@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + /*=========================================================================== + LOCAL VARIABLES + =============================================================================*/ +-char err_msg[MAX_ERR_MSG_BYTES]; ++static char err_msg[MAX_ERR_MSG_BYTES]; + + /*=========================================================================== + LOCAL FUNCTION PROTOTYPES diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb index 81d98098..5f808a97 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb +++ b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb @@ -1,7 +1,7 @@ SUMMARY = "i.MX code signing tool" DESCRIPTION = "Provides software code signing support designed that integrate the HABv4 and AHAB library" SECTION = "cst" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.bsd3;md5=1fbcd66ae51447aa94da10cbf6271530" @@ -9,7 +9,10 @@ DEPENDS = "byacc-native flex-native openssl" # tag=debian/3.3.1+dfsg-2 SRCREV = "e2c687a856e6670e753147aacef42d0a3c07891a" -SRC_URI = "git://gitlab.apertis.org/pkg/imx-code-signing-tool.git;protocol=https;branch=apertis/v2022pre" +SRC_URI = " \ + file://0001-fix-err-msg-linking.patch \ + git://gitlab.apertis.org/pkg/imx-code-signing-tool.git;protocol=https;branch=apertis/v2022pre \ +" S = "${WORKDIR}/git" diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb index 70e5a1a3..0b5031d5 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb @@ -6,7 +6,7 @@ PR = "r2" DEPENDS = "libxml2 fmlib tclap" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/fmc;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" SRCREV = "c2ed7c269e86ac6a0aac361f5876c96e700443f4" S = "${WORKDIR}/git" diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch index 283a081b..283a081b 100644 --- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch +++ b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc index 8950c151..1f63cd7a 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc @@ -8,10 +8,12 @@ python __anonymous () { d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir') } -SRC_URI:append:imxgpu2d += " \ +SRC_URI:append:imxgpu2d = " \ file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ file://0003-i.MX6-force-egl-visual-ID-33.patch \ + file://0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch \ + file://0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch \ " DEPENDS:append:imxgpu2d = " virtual/kernel virtual/libgles2" @@ -22,7 +24,7 @@ QT_CONFIG_FLAGS:append:imxgpu2d = " -I${STAGING_KERNEL_DIR}/include/uapi \ -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1" # The QT_CONFIG_FLAGS can pollute *.la files with -Dxxx -do_compile:append:mx6 () { +do_compile:append:mx6-nxp-bsp () { find lib -name "*.la" | xargs -n1 sed -i 's/-D.*=1//g' } diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch new file mode 100644 index 00000000..7eee7cf2 --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch @@ -0,0 +1,25 @@ +From 234580de9d63fd79a8b444358cdaeac111a17061 Mon Sep 17 00:00:00 2001 +From: Mauro Salvini <m.salvini@koansoftware.com> +Date: Thu, 29 Sep 2022 16:06:04 +0200 +Subject: [PATCH 1/2] config.tests: add DEFINES to compile egl test with + imxgpu2d (Vivante) + +Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com> +--- + config.tests/unix/egl/egl.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.tests/unix/egl/egl.pro b/config.tests/unix/egl/egl.pro +index f04d0535..bc35b908 100644 +--- a/config.tests/unix/egl/egl.pro ++++ b/config.tests/unix/egl/egl.pro +@@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { + + !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL ++DEFINES += LINUX=1 EGL_API_FB=1 + + CONFIG -= qt +-- +2.17.1 + diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch new file mode 100644 index 00000000..993df85e --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch @@ -0,0 +1,25 @@ +From adb19c68d3c92eb1a88e49e447ce827f14943486 Mon Sep 17 00:00:00 2001 +From: Mauro Salvini <m.salvini@koansoftware.com> +Date: Thu, 29 Sep 2022 16:12:11 +0200 +Subject: [PATCH 2/2] config.tests: add DEFINES to compile egl4gles1 test with + imxgpu2d (Vivante) + +Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com> +--- + config.tests/unix/egl4gles1/egl4gles1.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.tests/unix/egl4gles1/egl4gles1.pro b/config.tests/unix/egl4gles1/egl4gles1.pro +index 667ea8e3..14cb4a76 100644 +--- a/config.tests/unix/egl4gles1/egl4gles1.pro ++++ b/config.tests/unix/egl4gles1/egl4gles1.pro +@@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { + + !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL ++DEFINES += LINUX=1 EGL_API_FB=1 + + CONFIG -= qt +-- +2.17.1 + diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/g++.conf b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/g++.conf index 915ecba0..915ecba0 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/g++.conf +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/g++.conf diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/linux.conf b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/linux.conf index c644d8ba..c644d8ba 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/linux.conf +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/linux.conf diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 0d5897ad..7401a566 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -11,7 +11,7 @@ SRC_URI:append:imxgpu = " \ " PACKAGECONFIG_GL_IMX_GPU = "" -PACKAGECONFIG_GL_IMX_GPU:mx8 = "gbm kms" +PACKAGECONFIG_GL_IMX_GPU:mx8-nxp-bsp = "gbm kms" PACKAGECONFIG_GL:imxpxp = "gles2" PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ @@ -30,8 +30,8 @@ PACKAGECONFIG_PLATFORM:use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}" PACKAGECONFIG_VULKAN_IMX_GPU = "" -PACKAGECONFIG_VULKAN_IMX_GPU:mx8 = "vulkan" -PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm = "" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "" PACKAGECONFIG_VULKAN = "" PACKAGECONFIG_VULKAN:imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}" PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend new file mode 100644 index 00000000..f019c72d --- /dev/null +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend @@ -0,0 +1,9 @@ +# Fixes QT5 application builds searching for libimx6vivantevideonode.so +# via cmake cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake +do_install:append:imxgpu() { + install -d ${D}${libdir}/plugins/videoimx6vivantevideonode + ln -sf ../video/videonode/libeglvideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libeglvideonode.so + ln -sf ../video/videonode/libimx6vivantevideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libimx6vivantevideonode.so +} + +INSANE_SKIP:${PN}-plugins:imxgpu = "dev-so" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend index c1594e05..a97b765f 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend @@ -1,8 +1,8 @@ # etnaviv mesa does not have glx PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx" -PACKAGECONFIG:remove:mx6 = "xcomposite-egl xcomposite-glx" -PACKAGECONFIG:remove:mx7 = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx" # i.MX8 does never provide native x11, so required dependencies are not met -PACKAGECONFIG:remove:mx8 = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx" diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend new file mode 100644 index 00000000..fe2cd9e3 --- /dev/null +++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend @@ -0,0 +1,50 @@ +# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique +# Copyright (C) 2016 Freescale Semiconductor +# Copyright (C) 2016, 2017 O.S. Systems Software LTDA. +# Copyright (C) 2017-2018 NXP + +PACKAGECONFIG_GRAPHICS:imxpxp = " \ + gles2" +PACKAGECONFIG_GRAPHICS:imxgpu2d = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ + ${PACKAGECONFIG_GRAPHICS_IMX_GPU}" +PACKAGECONFIG_GRAPHICS:imxgpu3d = " \ + gles2 \ + ${PACKAGECONFIG_GRAPHICS_IMX_GPU}" +PACKAGECONFIG_GRAPHICS_IMX_GPU = "" +PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = " \ + gbm kms" + +PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= " \ + gles2 gbm kms" + +PACKAGECONFIG += " \ + ${PACKAGECONFIG_PLATFORM}" + +PACKAGECONFIG_PLATFORM = "" +PACKAGECONFIG_PLATFORM:imxgpu2d = " \ + no-opengl \ + linuxfb \ + ${PACKAGECONFIG_PLATFORM_EGLFS}" +PACKAGECONFIG_PLATFORM:imxgpu3d = " \ + ${PACKAGECONFIG_PLATFORM_EGLFS}" + +PACKAGECONFIG_PLATFORM_EGLFS = "" +PACKAGECONFIG_PLATFORM_EGLFS:imxgpu3d = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ + bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ + 'eglfs', d), d)}" +PACKAGECONFIG_PLATFORM_EGLFS:mx8-nxp-bsp = " \ + eglfs" + +PACKAGECONFIG_PLATFORM:use-mainline-bsp = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}" + +PACKAGECONFIG += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" +PACKAGECONFIG_VULKAN = "" +PACKAGECONFIG_VULKAN:imxgpu = " \ + ${PACKAGECONFIG_VULKAN_IMX_GPU}" +PACKAGECONFIG_VULKAN_IMX_GPU = "" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "" diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend new file mode 100644 index 00000000..ca011758 --- /dev/null +++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend @@ -0,0 +1,6 @@ +# etnaviv mesa does not have glx +PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx" + +PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx" diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend index 94331307..1b05b7bd 100644 --- a/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,10 +1,4 @@ -# Append path for freescale layer to include alsa-state asound.conf -FILESEXTRAPATHS:prepend:mx6 := "${THISDIR}/${PN}/imx:" -FILESEXTRAPATHS:prepend:mx7 := "${THISDIR}/${PN}/imx:" -FILESEXTRAPATHS:prepend:mx8 := "${THISDIR}/${PN}/imx:" -FILESEXTRAPATHS:prepend:use-mainline-bsp := "${THISDIR}/${PN}/imx:" +# Prepend path to override files from upstream recipe +FILESEXTRAPATHS:prepend:imx-generic-bsp := "${THISDIR}/${PN}/imx-generic-bsp:" -PACKAGE_ARCH:mx6 = "${MACHINE_ARCH}" -PACKAGE_ARCH:mx7 = "${MACHINE_ARCH}" -PACKAGE_ARCH:mx8 = "${MACHINE_ARCH}" -PACKAGE_ARCH:use-mainline-bsp = "${MACHINE_ARCH}" +PACKAGE_ARCH:imx-generic-bsp = "${MACHINE_ARCH}" diff --git a/recipes-bsp/alsa-state/alsa-state/imx/asound.state b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state index ace734df..ace734df 100755 --- a/recipes-bsp/alsa-state/alsa-state/imx/asound.state +++ b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state diff --git a/recipes-bsp/alsa-state/alsa-state/imx/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf index c511018e..c511018e 100644 --- a/recipes-bsp/alsa-state/alsa-state/imx/asound.conf +++ b/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf diff --git a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf new file mode 100644 index 00000000..0084f4a0 --- /dev/null +++ b/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf @@ -0,0 +1,271 @@ +defaults.pcm.rate_converter "linear" + +pcm.dmix_48000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 48000 +} +} + +pcm.dmix_44100{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 44100 +} +} + +pcm.dmix_32000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 32000 +} +} + +pcm.dmix_24000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 24000 +} +} + +pcm.dmix_22050{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 22050 +} +} + +pcm.dmix_16000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 16000 +} +} + +pcm.dmix_12000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 12000 +} +} + +pcm.dmix_11025{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 11025 +} +} + +pcm.dmix_8000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 8000 +} +} + +pcm.!dsnoop_48000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 48000 +} +} + +pcm.!dsnoop_44100{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 44100 +} +} + +pcm.!dsnoop_32000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 32000 +} +} + +pcm.!dsnoop_24000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 24000 +} +} + +pcm.!dsnoop_22050{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 22050 +} +} + +pcm.!dsnoop_16000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 16000 +} +} + +pcm.!dsnoop_12000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 12000 +} +} + +pcm.!dsnoop_11025{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 11025 +} +} + +pcm.!dsnoop_8000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 8000 +} +} + +pcm.asymed{ +type asym +playback.pcm "dmix_44100" +capture.pcm "dsnoop_44100" +} + +pcm.dsp0{ +type plug +slave.pcm "asymed" +} + +pcm.!default{ +type plug +route_policy "average" +slave.pcm "asymed" +} + +ctl.!default{ +type hw +card 0 +} + +ctl.mixer0{ +type hw +card 0 +} + +pcm_slave.esai{ + pcm "hw:0,0" + channels 8 + rate 48000 + period_time 40000 +} + +pcm.esaich1to6{ + type dshare + ipc_key 5778293 + slave esai + bindings.0 0 + bindings.1 4 + bindings.2 1 + bindings.3 5 + bindings.4 2 + bindings.5 6 +} + +pcm.esaich78{ + type dshare + ipc_key 5778293 + slave esai + bindings.0 3 + bindings.1 7 +} diff --git a/recipes-bsp/atf/qoriq-atf-2.4.inc b/recipes-bsp/atf/qoriq-atf-2.4.inc index 28045c7c..506c9538 100644 --- a/recipes-bsp/atf/qoriq-atf-2.4.inc +++ b/recipes-bsp/atf/qoriq-atf-2.4.inc @@ -1,9 +1,9 @@ DESCRIPTION = "ARM Trusted Firmware" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf.git;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/atf.git;protocol=https;nobranch=1" SRCREV = "bb4957067d4b96a6ee197a333425948e409e990d" S = "${WORKDIR}/git" diff --git a/recipes-bsp/atf/qoriq-atf_2.4.bb b/recipes-bsp/atf/qoriq-atf_2.4.bb index 7a767791..ec953297 100644 --- a/recipes-bsp/atf/qoriq-atf_2.4.bb +++ b/recipes-bsp/atf/qoriq-atf_2.4.bb @@ -2,7 +2,7 @@ require recipes-bsp/atf/qoriq-atf-2.4.inc inherit deploy -DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native mbedtls rcw cst-native bc-native" +DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native rcw qoriq-cst-native bc-native" DEPENDS:append:lx2160a = " ddr-phy" DEPENDS:append:lx2162a = " ddr-phy" do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" diff --git a/recipes-bsp/boot-format/boot-format_git.bb b/recipes-bsp/boot-format/boot-format_git.bb index 584c5c68..0916b45b 100644 --- a/recipes-bsp/boot-format/boot-format_git.bb +++ b/recipes-bsp/boot-format/boot-format_git.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Boot format utility for booting from eSDHC/eSPI" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" PR = "r6" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/boot-format;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/boot-format;protocol=https;nobranch=1 \ file://flags.patch" SRCREV = "4eb81a6797ef4e58bf7d9b2d58afb37a21c1f550" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.13.inc b/recipes-bsp/firmware-imx/firmware-imx-8.18.inc index ff739c4c..24829370 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8.13.inc +++ b/recipes-bsp/firmware-imx/firmware-imx-8.18.inc @@ -3,14 +3,14 @@ # Copyright (C) 2018 O.S. Systems Software LTDA. SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" SRC_URI = " \ ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ " -SRC_URI[md5sum] = "97eb12ba899bc29a5375993889708bfb" -SRC_URI[sha256sum] = "8b7aa9b41a0389e5f40bdf91cb1224f79ea4c2e7fc36292f27ad4bef7044d7f0" +SRC_URI[md5sum] = "436501f8e67c10eed6bba88457e701a2" +SRC_URI[sha256sum] = "f050f60351a54fd75954fdeb133ddd014a5576040c72616e216b63db0e242dd4" S = "${WORKDIR}/firmware-imx-${PV}" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb index 6ea16d5b..72a3fb99 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.13.bb +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb @@ -4,20 +4,36 @@ DESCRIPTION = "Freescale i.MX firmware for 8 family" require firmware-imx-${PV}.inc -inherit deploy +inherit deploy nopackages do_install[noexec] = "1" -do_deploy() { +SOC_FAMILY = "INVALID" +SOC_FAMILY:mx8-generic-bsp = "mx8" +SOC_FAMILY:mx9-generic-bsp = "mx9" + +deploy_mx8() { # Cadence HDMI install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${DEPLOYDIR} install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${DEPLOYDIR} install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${DEPLOYDIR} } + +deploy_mx9() { + # Synopsys DDR + for ddr_firmware in ${DDR_FIRMWARE_NAME}; do + install -m 0644 ${S}/firmware/ddr/synopsys/${ddr_firmware} ${DEPLOYDIR} + done +} + +do_deploy() { + deploy_${SOC_FAMILY} +} + addtask deploy after do_install before do_build PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8)" -COMPATIBLE_MACHINE:mx8m = "(^$)" -COMPATIBLE_MACHINE:mx8x = "(^$)" +COMPATIBLE_MACHINE = "(mx8-nxp-bsp|mx9-nxp-bsp)" +COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)" +COMPATIBLE_MACHINE:mx8x-nxp-bsp = "(^$)" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.18.bb index a48356ed..152ef0b5 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.13.bb +++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.18.bb @@ -21,4 +21,4 @@ addtask deploy after do_install before do_build PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8m|imx-boot-container)" +COMPATIBLE_MACHINE = "(mx8m-generic-bsp)" diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.13.bb b/recipes-bsp/firmware-imx/firmware-imx_8.18.bb index 68539a61..f84ea1fa 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.13.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.18.bb @@ -1,5 +1,5 @@ # Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright (C) 2017-2020 NXP +# Copyright (C) 2017-2021 NXP # Copyright (C) 2018 O.S. Systems Software LTDA. SUMMARY = "Freescale i.MX firmware" DESCRIPTION = "Freescale i.MX firmware such as for the VPU" @@ -43,10 +43,9 @@ do_install() { # NOTE: # Only install pre-defined list of firmware files, since the source archive contains # also HDMI binary files for imx8m derivatives, which are taken care of by another recipe - install -d ${D}${nonarch_base_libdir}/firmware/imx/hdmi - install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi - install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi - install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi + install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${nonarch_base_libdir}/firmware + install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${nonarch_base_libdir}/firmware + install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}${nonarch_base_libdir}/firmware # VPU Firmware section # NOTE: @@ -66,6 +65,29 @@ do_install() { # which contains only files that matches the pattern. # python populate_packages:prepend() { + # CODA driver tries to locate VPU firmwares directly in ${nonarch_base_libdir}/firmware, to + # avoid fallback loading which is usually 40-60 seconds later after system boots up, let's + # create symbolic links in ${nonarch_base_libdir}/firmware for VPU firmwares. + def coda_vpu_links(file, pkg, pattern, format, basename): + # Only CODA VPU firmwares need this procedure + if 'imx8' in basename: + return + + dir = os.path.dirname(file) + dir = os.path.abspath(os.path.join(dir, os.pardir)) + cwd = os.getcwd() + + os.chdir(dir) + + name = os.path.basename(file) + os.symlink(os.path.join("vpu", name), name) + + oldfiles = d.getVar('FILES:' + pkg) + newfile = os.path.join(d.getVar('nonarch_base_libdir'), "firmware", name) + d.setVar('FILES:' + pkg, oldfiles + " " + newfile) + + os.chdir(cwd) + easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d) do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin', output_pattern='firmware-imx-easrc-%s', @@ -77,6 +99,7 @@ python populate_packages:prepend() { do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin', output_pattern='firmware-imx-vpu-%s', description='Freescale IMX VPU Firmware [%s]', + hook=coda_vpu_links, extra_depends='', prepend=True) @@ -124,6 +147,10 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi" FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" -FILES:${PN}-hdmi = "${nonarch_base_libdir}/firmware/imx/hdmi/" +FILES:${PN}-hdmi = " \ + ${nonarch_base_libdir}/firmware/hdmitxfw.bin \ + ${nonarch_base_libdir}/firmware/hdmirxfw.bin \ + ${nonarch_base_libdir}/firmware/dpfw.bin \ +" -COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" +COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb index 5a7e6a1d..0a7f2462 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb @@ -8,10 +8,11 @@ recipe in favor of upstream." SECTION = "kernel" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://cyw-wifi-bt/EULA.txt;md5=80c0478f4339af024519b3723023fe28" +LIC_FILES_CHKSUM = "file://EULA.txt;md5=be5ff43682ed6c57dfcbeb97651c2829" -SRC_URI = "git://github.com/NXP/imx-firmware.git;protocol=https;branch=master" -SRCREV = "484d38224fa2c26b8859a7bf20b7c4d49100f5bc" +SRC_URI = "git://github.com/NXP/imx-firmware.git;protocol=https;branch=${SRCBRANCH}" +SRCBRANCH = "lf-5.15.71_2.2.0" +SRCREV = "982bb10dfabfb9e7b9dc106c59a4fbb2c45bfb44" S = "${WORKDIR}/git" @@ -26,16 +27,55 @@ do_compile() { do_install() { install -d ${D}${sysconfdir}/firmware - install -d ${D}${nonarch_base_libdir}/firmware/brcm # Install various flavors of Broadcom firmware provided by Murata: # - bcm4359-pcie + install -d ${D}${nonarch_base_libdir}/firmware/brcm install -m 0644 cyw-wifi-bt/*_CYW*/brcmfmac4359-pcie* ${D}${nonarch_base_libdir}/firmware/brcm install -m 0644 cyw-wifi-bt/*_CYW*/BCM4349B1*.hcd ${D}${sysconfdir}/firmware + + # Install NXP Connectivity common + install -d ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp + + # Install NXP Connectivity SD8801 firmware + install -m 0644 nxp/FwImage_8801_SD/ed_mac_ctrl_V1_8801.conf ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_8801_SD/sd8801_uapsta.bin ${D}${nonarch_base_libdir}/firmware/nxp + + # Install NXP Connectivity SDIO8987 firmware + install -m 0644 nxp/FwImage_8987/ed_mac_ctrl_V3_8987.conf ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_8987/sdiouart8987_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_8987/txpwrlimit_cfg_8987.conf ${D}${nonarch_base_libdir}/firmware/nxp + + # Install NXP Connectivity PCIE8997 firmware + install -m 0644 nxp/FwImage_8997/ed_mac_ctrl_V3_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_8997/pcieuart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_8997/txpwrlimit_cfg_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp + + # Install NXP Connectivity SDIO8997 firmware + install -m 0644 nxp/FwImage_8997_SD/ed_mac_ctrl_V3_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_8997_SD/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_8997_SD/txpwrlimit_cfg_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp + + # Install NXP Connectivity PCIE9098 firmware + install -m 0644 nxp/FwImage_9098_PCIE/ed_mac_ctrl_V3_909x.conf ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_9098_PCIE/pcieuart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_9098_PCIE/txpwrlimit_cfg_9098.conf ${D}${nonarch_base_libdir}/firmware/nxp + + # Install NXP Connectivity SDIO9098 firmware + install -m 0644 nxp/FwImage_9098_SD/sdiouart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp } PACKAGES =+ " \ ${PN}-bcm4359-pcie \ + ${PN}-nxp-common \ + ${PN}-nxp8801-sdio \ + ${PN}-nxp8987-sdio \ + ${PN}-nxp8997-common \ + ${PN}-nxp8997-pcie \ + ${PN}-nxp8997-sdio \ + ${PN}-nxp9098-pcie \ + ${PN}-nxp9098-sdio \ " FILES:${PN}-bcm4359-pcie = " \ @@ -43,4 +83,44 @@ FILES:${PN}-bcm4359-pcie = " \ ${sysconfdir}/firmware/BCM4349B1_*.hcd \ " -RPROVIDES:${PN}-bcm4359-pcie = "linux-firmware-bcm4359-pcie" +FILES:${PN}-nxp-common = " \ + ${nonarch_base_libdir}/firmware/nxp/wifi_mod_para.conf \ +" + +FILES:${PN}-nxp8801-sdio = " \ + ${nonarch_base_libdir}/firmware/nxp/*8801* \ +" +RDEPENDS:${PN}-nxp8801-sdio += "${PN}-nxp-common" + +FILES:${PN}-nxp8987-sdio = " \ + ${nonarch_base_libdir}/firmware/nxp/*8987* \ +" +RDEPENDS:${PN}-nxp8987-sdio += "${PN}-nxp-common" + +FILES:${PN}-nxp8997-common = " \ + ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_8997.conf \ + ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_8997.conf \ +" +RDEPENDS:${PN}-nxp8997-common += "${PN}-nxp-common" + +FILES:${PN}-nxp8997-pcie = " \ + ${nonarch_base_libdir}/firmware/nxp/pcieuart8997* \ +" +RDEPENDS:${PN}-nxp8997-pcie += "${PN}-nxp8997-common" + +FILES:${PN}-nxp8997-sdio = " \ + ${nonarch_base_libdir}/firmware/nxp/sdiouart8997* \ +" +RDEPENDS:${PN}-nxp8997-sdio += "${PN}-nxp8997-common" + +FILES:${PN}-nxp9098-pcie = " \ + ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \ + ${nonarch_base_libdir}/firmware/nxp/pcieuart9098* \ + ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_9098.conf \ +" +RDEPENDS:${PN}-nxp9098-pcie += "${PN}-nxp-common" + +FILES:${PN}-nxp9098-sdio = " \ + ${nonarch_base_libdir}/firmware/nxp/sdiouart9098* \ +" +RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp-common" diff --git a/recipes-bsp/firmware-imx/firmware-sof-imx_1.9.0-1.bb b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb index d0a497b8..9778bd1c 100644 --- a/recipes-bsp/firmware-imx/firmware-sof-imx_1.9.0-1.bb +++ b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2020 Mihai Lindner <mihai.lindner@nxp.com> +# Copyright (C) 2020-2022 NXP # Released under the MIT license (see COPYING.MIT for the terms) DESCRIPTION = "Sound Open Firmware" @@ -8,8 +8,8 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=0f00d99239d922ffd13cabef83b33444" SRC_URI = "${FSL_MIRROR}/sof-imx-${PV}.tar.gz" -SRC_URI[md5sum] = "7560d41c3be0a97c744874b531649326" -SRC_URI[sha256sum] = "106cfb3da27867520d86649cde98256217829c97f41984e10161c1e2707e2c4e" +SRC_URI[md5sum] = "f7d277717b3f0dd17e8d341c1091d6b6" +SRC_URI[sha256sum] = "eb86c90aec92b3b376e7afca6aa5db4767b5d8868553595907ba37665329f16b" S = "${WORKDIR}/sof-imx-${PV}" diff --git a/recipes-bsp/firmware-sentinel/firmware-sentinel_0.8.bb b/recipes-bsp/firmware-sentinel/firmware-sentinel_0.8.bb new file mode 100644 index 00000000..50787fd6 --- /dev/null +++ b/recipes-bsp/firmware-sentinel/firmware-sentinel_0.8.bb @@ -0,0 +1,23 @@ +# Copyright 2021-2022 NXP +SUMMARY = "NXP i.MX Sentinel firmware" +DESCRIPTION = "Firmware for i.MX Sentinel Security Controller" +SECTION = "base" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" + +inherit fsl-eula-unpack use-imx-security-controller-firmware deploy nopackages + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" +SRC_URI[md5sum] = "be47a5e59c1192ee36246af97d5d1532" +SRC_URI[sha256sum] = "1003d4c6773c153ea341911a74e25c249423644f70f3d8f8d085599e00770b3f" + +do_compile[noexec] = "1" +do_install[noexec] = "1" + +do_deploy () { + # Deploy the related firmware to be package by imx-boot + install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} +} +addtask deploy after do_install before do_build + +COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)" diff --git a/recipes-bsp/firmware-upower/firmware-upower_1.1.0.bb b/recipes-bsp/firmware-upower/firmware-upower_1.1.0.bb new file mode 100644 index 00000000..f21de75a --- /dev/null +++ b/recipes-bsp/firmware-upower/firmware-upower_1.1.0.bb @@ -0,0 +1,31 @@ +# Copyright 2021-2022 NXP +DESCRIPTION = "NXP i.MX uPower firmware" +LICENSE = "Proprietary" +SECTION = "BSP" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" + +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit fsl-eula-unpack pkgconfig deploy + +SRC_URI[md5sum] = "d2cbe8d2f8fa170e5d48c599c4caac5e" +SRC_URI[sha256sum] = "c02595917744769abe810107a08506e4055b8077b5fc4ed17c353b833756c8b0" + +do_configure[noexec] = "1" + +do_compile[noexec] = "1" + +do_install[noexec] = "1" + +BOOT_TOOLS = "imx-boot-tools" + +do_deploy () { + # Deploy the related firmware to be package by imx-boot + install -d ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0644 ${S}/${UPOWER_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/upower.bin +} +addtask deploy after do_install before do_build + +COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp)" diff --git a/recipes-bsp/formfactor/formfactor/mx6/machconfig b/recipes-bsp/formfactor/formfactor/mx6-nxp-bsp/machconfig index ded33a07..ded33a07 100644 --- a/recipes-bsp/formfactor/formfactor/mx6/machconfig +++ b/recipes-bsp/formfactor/formfactor/mx6-nxp-bsp/machconfig diff --git a/recipes-bsp/formfactor/formfactor/mx6sll/machconfig b/recipes-bsp/formfactor/formfactor/mx6sll-nxp-bsp/machconfig index e3b99b7c..e3b99b7c 100644 --- a/recipes-bsp/formfactor/formfactor/mx6sll/machconfig +++ b/recipes-bsp/formfactor/formfactor/mx6sll-nxp-bsp/machconfig diff --git a/recipes-bsp/formfactor/formfactor/mx6ul/machconfig b/recipes-bsp/formfactor/formfactor/mx6ul-nxp-bsp/machconfig index e3b99b7c..e3b99b7c 100644 --- a/recipes-bsp/formfactor/formfactor/mx6ul/machconfig +++ b/recipes-bsp/formfactor/formfactor/mx6ul-nxp-bsp/machconfig diff --git a/recipes-bsp/formfactor/formfactor/mx7/machconfig b/recipes-bsp/formfactor/formfactor/mx7-nxp-bsp/machconfig index e3b99b7c..e3b99b7c 100644 --- a/recipes-bsp/formfactor/formfactor/mx7/machconfig +++ b/recipes-bsp/formfactor/formfactor/mx7-nxp-bsp/machconfig diff --git a/recipes-bsp/formfactor/formfactor/mx7ulp/machconfig b/recipes-bsp/formfactor/formfactor/mx7ulp-nxp-bsp/machconfig index 25b18f21..25b18f21 100644 --- a/recipes-bsp/formfactor/formfactor/mx7ulp/machconfig +++ b/recipes-bsp/formfactor/formfactor/mx7ulp-nxp-bsp/machconfig diff --git a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb index 60598ae5..3883c024 100644 --- a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb +++ b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb @@ -2,10 +2,10 @@ SUMMARY = "Freescale TLU(Table Lookup Unit) test package" DESCRIPTION = "This package includes the TLU(Table Lookup Unit) test scripts \ and configuration files." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fsl-tlu;protocol=https;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/fsl-tlu;protocol=https;nobranch=1" SRCREV = "8837cce3c86b30c0931c319e9e1a8ca622ae5354" S = "${WORKDIR}/git" diff --git a/recipes-bsp/imx-atf/imx-atf/0001-Makefile-Suppress-array-bounds-error.patch b/recipes-bsp/imx-atf/imx-atf/0001-Makefile-Suppress-array-bounds-error.patch new file mode 100644 index 00000000..c7ace225 --- /dev/null +++ b/recipes-bsp/imx-atf/imx-atf/0001-Makefile-Suppress-array-bounds-error.patch @@ -0,0 +1,47 @@ +From 85f576054a4d5496706bbd37a520942f51cb74b9 Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Mon, 16 May 2022 13:45:16 -0500 +Subject: [PATCH] Makefile: Suppress array-bounds error + +The array-bounds error is triggered now in cases where it was silent +before, causing errors like: + +``` +plat/imx/imx8m/hab.c: In function 'imx_hab_handler': +plat/imx/imx8m/hab.c:64:57: error: array subscript 0 is outside array bounds of 'uint32_t[0]' {aka 'unsigned int[]'} [-Werror=array-bounds] + 64 | #define HAB_RVT_CHECK_TARGET_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x18)) + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``` + +The error is a false-positive and is entered as a bug [1]. The problem +is fixed partially in GCC 12 and fully in GCC 13 [2]. + +The partial fix does not work here because the constant addresses used +are less than the 4kB boundary chosen for the partial fix, so suppress +the error until GCC is upgraded to 13. + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578 +[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578#c39 + +Upstream-Status: Inappropriate [other] +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index c87c3ae08..2d6b90f47 100644 +--- a/Makefile ++++ b/Makefile +@@ -346,7 +346,7 @@ WARNINGS += -Wshift-overflow -Wshift-sign-overflow \ + endif + + ifneq (${E},0) +-ERRORS := -Werror ++ERRORS := -Werror -Wno-error=array-bounds + endif + + CPPFLAGS = ${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc \ +-- +2.17.1 + diff --git a/recipes-bsp/imx-atf/imx-atf/rwx-segments.patch b/recipes-bsp/imx-atf/imx-atf/rwx-segments.patch new file mode 100644 index 00000000..a4518ec6 --- /dev/null +++ b/recipes-bsp/imx-atf/imx-atf/rwx-segments.patch @@ -0,0 +1,38 @@ +Binutils 2.39 now warns when a segment has RXW permissions[1]: + +aarch64-none-elf-ld.bfd: warning: bl31.elf has a LOAD segment with RWX +permissions + +However, TF-A passes --fatal-warnings to LD, so this is a build failure. + +There is a ticket filed upstream[2], so until that is resolved just +remove --fatal-warnings. + +[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 +[2] https://developer.trustedfirmware.org/T996 + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/Makefile b/Makefile +index 3941f8698..13bbac348 100644 +--- a/Makefile ++++ b/Makefile +@@ -418,7 +418,7 @@ TF_LDFLAGS += $(TF_LDFLAGS_$(ARCH)) + # LD = gcc (used when GCC LTO is enabled) + else ifneq ($(findstring gcc,$(notdir $(LD))),) + # Pass ld options with Wl or Xlinker switches +-TF_LDFLAGS += -Wl,--fatal-warnings -O1 ++TF_LDFLAGS += -O1 + TF_LDFLAGS += -Wl,--gc-sections + ifeq ($(ENABLE_LTO),1) + ifeq (${ARCH},aarch64) +@@ -435,7 +435,7 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case diff --git a/recipes-bsp/imx-atf/imx-atf_2.4.bb b/recipes-bsp/imx-atf/imx-atf_2.4.bb deleted file mode 100644 index 8360bfa8..00000000 --- a/recipes-bsp/imx-atf/imx-atf_2.4.bb +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (C) 2017-2021 NXP - -DESCRIPTION = "i.MX ARM Trusted Firmware" -SECTION = "BSP" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" - -PV .= "+git${SRCPV}" - -SRCBRANCH = "lf_v2.4" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ -" -SRCREV = "bb4957067d4b96a6ee197a333425948e409e990d" - -S = "${WORKDIR}/git" - -inherit deploy - -BOOT_TOOLS = "imx-boot-tools" - -ATF_PLATFORM ??= "INVALID" - -EXTRA_OEMAKE += " \ - CROSS_COMPILE="${TARGET_PREFIX}" \ - PLAT=${ATF_PLATFORM} \ -" - -BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" - -CFLAGS:remove:mx8mq = "-O2" - -do_compile() { - # Clear LDFLAGS to avoid the option -Wl recognize issue - unset LDFLAGS - oe_runmake bl31 - if ${BUILD_OPTEE}; then - oe_runmake clean BUILD_BASE=build-optee - oe_runmake BUILD_BASE=build-optee SPD=opteed bl31 - fi -} - -do_install[noexec] = "1" - -do_deploy() { - install -Dm 0644 ${S}/build/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${ATF_PLATFORM}.bin - if ${BUILD_OPTEE}; then - install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${ATF_PLATFORM}.bin-optee - fi -} -addtask deploy after do_compile - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8|imx-boot-container)" diff --git a/recipes-bsp/imx-atf/imx-atf_2.6.bb b/recipes-bsp/imx-atf/imx-atf_2.6.bb new file mode 100644 index 00000000..33663a3a --- /dev/null +++ b/recipes-bsp/imx-atf/imx-atf_2.6.bb @@ -0,0 +1,84 @@ +# Copyright (C) 2017-2022 NXP + +DESCRIPTION = "i.MX ARM Trusted Firmware" +SECTION = "BSP" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" + +PV .= "+git${SRCPV}" + +SRC_URI = " \ + git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ + file://0001-Makefile-Suppress-array-bounds-error.patch \ + file://rwx-segments.patch \ +" +SRCBRANCH = "lf_v2.6" +SRCREV = "3c1583ba0a5d11e5116332e91065cb3740153a46" + +S = "${WORKDIR}/git" + +inherit deploy + +ATF_PLATFORM ??= "INVALID" + +# FIXME: We should return INVALID here but currently only i.MX8M has support to override the UART +# base address in source code. +ATF_BOOT_UART_BASE ?= "" + +EXTRA_OEMAKE += " \ + CROSS_COMPILE="${TARGET_PREFIX}" \ + PLAT=${ATF_PLATFORM} \ +" + +# Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is a standalone application +CFLAGS[unexport] = "1" +LDFLAGS[unexport] = "1" +AS[unexport] = "1" +LD[unexport] = "1" + +# Baremetal, just need a compiler +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "virtual/${HOST_PREFIX}gcc" + +# Bring in clang compiler if using clang as default +DEPENDS:append:toolchain-clang = " clang-cross-${TARGET_ARCH}" + +BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" + +# CC and LD introduce arguments which conflict with those otherwise provided by +# this recipe. The heads of these variables excluding those arguments +# are therefore used instead. +def remove_options_tail (in_string): + from itertools import takewhile + return ' '.join(takewhile(lambda x: not x.startswith('-'), in_string.split(' '))) + +EXTRA_OEMAKE += 'LD="${@remove_options_tail(d.getVar('LD'))}"' + +EXTRA_OEMAKE += 'CC="${@remove_options_tail(d.getVar('CC'))}"' + +# Set the UART to use during the boot. +EXTRA_OEMAKE += 'IMX_BOOT_UART_BASE=${ATF_BOOT_UART_BASE}' + +do_configure[noexec] = "1" + +do_compile() { + # Clear LDFLAGS to avoid the option -Wl recognize issue + oe_runmake bl31 + if ${BUILD_OPTEE}; then + oe_runmake clean BUILD_BASE=build-optee + oe_runmake BUILD_BASE=build-optee SPD=opteed bl31 + fi +} + +do_install[noexec] = "1" + +addtask deploy after do_compile +do_deploy() { + install -Dm 0644 ${S}/build/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin + if ${BUILD_OPTEE}; then + install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${ATF_PLATFORM}.bin-optee + fi +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(mx8-generic-bsp|mx9-generic-bsp)" diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb index 58bd44f8..c8880d49 100644 --- a/recipes-bsp/imx-kobs/imx-kobs_git.bb +++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb @@ -4,15 +4,16 @@ SUMMARY = "Nand boot write source" SECTION = "base" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" PV = "5.5+git${SRCPV}" SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https;branch=master \ + file://0001-Add-missing-includes-as-pointed-out-by-musl.patch \ " SRCREV = "269fdffcf97238684de9f28977a73677282e061f" S = "${WORKDIR}/git" inherit autotools pkgconfig -COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" +COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb index 4e210057..3bb1dcaf 100644 --- a/recipes-bsp/imx-lib/imx-lib_git.bb +++ b/recipes-bsp/imx-lib/imx-lib_git.bb @@ -3,7 +3,7 @@ # Copyright 2017 NXP DESCRIPTION = "Platform specific libraries for imx platform" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" SECTION = "multimedia" LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" @@ -12,25 +12,24 @@ PE = "1" PV = "5.9+${SRCPV}" -SRCBRANCH = "lf-5.10.52_2.1.0" - -SRC_URI = "git://source.codeaurora.org/external/imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" +SRCBRANCH = "lf-5.15.71_2.2.0" SRCREV = "87ddd80953835eb29027d1d5a12044a08e809e40" S = "${WORKDIR}/git" inherit use-imx-headers -PLATFORM:mx6q = "IMX6Q" -PLATFORM:mx6dl = "IMX6Q" -PLATFORM:mx6sl = "IMX6S" -PLATFORM:mx6sll = "IMX6UL" -PLATFORM:mx6sx = "IMX6S" -PLATFORM:mx6ul = "IMX6UL" -PLATFORM:mx6ull = "IMX6UL" -PLATFORM:mx7d = "IMX7" -PLATFORM:mx7ulp = "IMX7" -PLATFORM:mx8ulp = "IMX8ULP" +PLATFORM:mx6q-nxp-bsp = "IMX6Q" +PLATFORM:mx6dl-nxp-bsp = "IMX6Q" +PLATFORM:mx6sl-nxp-bsp = "IMX6S" +PLATFORM:mx6sll-nxp-bsp = "IMX6UL" +PLATFORM:mx6sx-nxp-bsp = "IMX6S" +PLATFORM:mx6ul-nxp-bsp = "IMX6UL" +PLATFORM:mx6ull-nxp-bsp = "IMX6UL" +PLATFORM:mx7d-nxp-bsp = "IMX7" +PLATFORM:mx7ulp-nxp-bsp = "IMX7" +PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP" PARALLEL_MAKE="-j 1" EXTRA_OEMAKE = "" @@ -47,4 +46,4 @@ do_install () { find ${D}/ -name *.go -exec rm {} \; } -COMPATIBLE_MACHINE = "(mx6|mx7|mx8ulp)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8ulp-nxp-bsp)" diff --git a/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch index a879208c..a8b0332d 100644 --- a/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch +++ b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch @@ -1,4 +1,4 @@ -From a4af3747abd88247bf4498ec0cf67a4151e64d41 Mon Sep 17 00:00:00 2001 +From 70b7d067ca0f6659e4f842f8d841714a26bf9d8c Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin <andrey.z@gmail.com> Date: Thu, 21 Oct 2021 08:53:38 +0000 Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot @@ -20,56 +20,56 @@ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> iMX8M/soc.mak | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak -index 4bfdc37..03b05f7 100644 ---- a/iMX8M/soc.mak -+++ b/iMX8M/soc.mak -@@ -148,7 +148,7 @@ u-boot.itb: $(dtb) +Index: git/iMX8M/soc.mak +=================================================================== +--- git.orig/iMX8M/soc.mak ++++ git/iMX8M/soc.mak +@@ -149,7 +149,7 @@ u-boot.itb: $(dtb) ./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) - DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb) > u-boot.its + BL32=$(TEE) DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb) > u-boot.its - ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb + mkimage -E -p 0x3000 -f u-boot.its u-boot.itb @rm -f u-boot.its $(dtb) dtb_ddr3l = valddr3l.dtb -@@ -160,7 +160,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) +@@ -161,7 +161,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) ./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l) - DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr3l) > u-boot-ddr3l.its + DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr3l) > u-boot-ddr3l.its - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb + mkimage -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb @rm -f u-boot.its $(dtb_ddr3l) dtb_ddr3l_evk = evkddr3l.dtb -@@ -172,7 +172,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) +@@ -173,7 +173,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) ./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk) - DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr3l_evk) > u-boot-ddr3l-evk.its + DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr3l_evk) > u-boot-ddr3l-evk.its - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb + mkimage -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb @rm -f u-boot.its $(dtb_ddr3l_evk) dtb_ddr4 = valddr4.dtb -@@ -184,7 +184,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) +@@ -185,7 +185,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) ./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4) - DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr4) > u-boot-ddr4.its + DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr4) > u-boot-ddr4.its - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb + mkimage -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb @rm -f u-boot.its $(dtb_ddr4) dtb_ddr4_evk = evkddr4.dtb -@@ -196,7 +196,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) +@@ -197,7 +197,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) ./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk) - DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr4_evk) > u-boot-ddr4-evk.its + DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr4_evk) > u-boot-ddr4-evk.its - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb + mkimage -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb @rm -f u-boot.its $(dtb_ddr4_evk) ifeq ($(HDMI),yes) -@@ -312,7 +312,6 @@ nightly : +@@ -343,7 +343,6 @@ nightly : @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/fsl-$(PLAT)-evk.dtb -O fsl-$(PLAT)-evk.dtb @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_hdmi_imx8m.bin -O signed_hdmi_imx8m.bin @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_dp_imx8m.bin -O signed_dp_imx8m.bin @@ -77,6 +77,3 @@ index 4bfdc37..03b05f7 100644 archive : git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME) --- -2.17.1 - diff --git a/recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch b/recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch deleted file mode 100644 index 3c2842af..00000000 --- a/recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 9cf936493388897379f33b511ec869c6fa5409ce Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Thu, 22 Apr 2021 12:20:28 +0000 -Subject: [PATCH] mkimage_fit_atf: fix fit generator node naming - -Since upstream commit 79af75f777 ("fit: Don't allow verification of images -with @ nodes") [1], unit addresses on the nodes are prohibited and nodes -that do contain those addresses are ignored during the ITS parsing. This -is done in an effort to cover the CVE-2021-27138, where nodes with unit -addresses can be mis-interpreted by libfdt. - -Correct FIT generator script and replace nodes with unit addresses to -plain node names with "-" instead of "@" to create a unique naming. - -In addition, extend sections which contains "firmware" in their types -with "os" parameter to conform to the latest FIT specification. - -Indicate that load and entry addresses are covered by one 32-bit value -by adding "address-cells" in the root node of the generated ITS. - -Upstream-Status: Inappropriate [script is imx-boot specific] -Link: [1] https://github.com/u-boot/u-boot/commit/79af75f7776fc20b0d7eb6afe1e27c00fdb4b9b4 -Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> -Cc: Tom Hochstein <tom.hochstein@nxp.com> ---- - iMX8M/mkimage_fit_atf.sh | 40 ++++++++++++++++++++++------------------ - 1 file changed, 22 insertions(+), 18 deletions(-) - -diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh -index 95749b1..10903ea 100755 ---- a/iMX8M/mkimage_fit_atf.sh -+++ b/iMX8M/mkimage_fit_atf.sh -@@ -23,7 +23,7 @@ else - fi - - BL32="tee.bin" --LOADABLES="\"atf@1\"" -+LOADABLES="\"atf-1\"" - - if [ ! -f $BL32 ]; then - BL32=/dev/null -@@ -31,7 +31,7 @@ else - echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2 - echo "tee.bin size: " >&2 - ls -lct tee.bin | awk '{print $5}' >&2 -- LOADABLES="$LOADABLES, \"tee@1\"" -+ LOADABLES="$LOADABLES, \"tee-1\"" - fi - - BL33="u-boot-nodtb.bin" -@@ -41,7 +41,7 @@ if [ ! -f $DEK_BLOB ]; then - DEK_BLOB=/dev/null - else - echo "Building with encrypted boot support, make sure to replace DEK Blob in final image." >&2 -- LOADABLES="\"dek_blob@1\", $LOADABLES" -+ LOADABLES="\"dek_blob-1\", $LOADABLES" - fi - - if [ ! -f $BL33 ]; then -@@ -64,10 +64,12 @@ cat << __HEADER_EOF - - / { - description = "Configuration to load ATF before U-Boot"; -+ #address-cells = <1>; - - images { -- uboot@1 { -+ uboot-1 { - description = "U-Boot (64-bit)"; -+ os = "u-boot"; - data = /incbin/("$BL33"); - type = "standalone"; - arch = "arm64"; -@@ -80,7 +82,7 @@ cnt=1 - for dtname in $* - do - cat << __FDT_IMAGE_EOF -- fdt@$cnt { -+ fdt-$cnt { - description = "$(basename $dtname .dtb)"; - data = /incbin/("$dtname"); - type = "flat_dt"; -@@ -91,8 +93,9 @@ cnt=$((cnt+1)) - done - - cat << __HEADER_EOF -- atf@1 { -+ atf-1 { - description = "ARM Trusted Firmware"; -+ os = "arm-trusted-firmware"; - data = /incbin/("$BL31"); - type = "firmware"; - arch = "arm64"; -@@ -104,8 +107,9 @@ __HEADER_EOF - - if [ -f $BL32 ]; then - cat << __HEADER_EOF -- tee@1 { -+ tee-1 { - description = "TEE firmware"; -+ os = "op-tee-firmware"; - data = /incbin/("$BL32"); - type = "firmware"; - arch = "arm64"; -@@ -118,7 +122,7 @@ fi - - if [ -f $DEK_BLOB ]; then - cat << __HEADER_EOF -- dek_blob@1 { -+ dek_blob-1 { - description = "dek_blob"; - data = /incbin/("$DEK_BLOB"); - type = "script"; -@@ -131,7 +135,7 @@ fi - cat << __CONF_HEADER_EOF - }; - configurations { -- default = "config@1"; -+ default = "config-1"; - - __CONF_HEADER_EOF - -@@ -141,31 +145,31 @@ do - if [ -f $BL32 ]; then - if [ $ROLLBACK_INDEX_IN_FIT ]; then - cat << __CONF_SECTION_EOF -- config@$cnt { -+ config-$cnt { - description = "$(basename $dtname .dtb)"; -- firmware = "uboot@1"; -+ firmware = "uboot-1"; - loadables = $LOADABLES; -- fdt = "fdt@$cnt"; -+ fdt = "fdt-$cnt"; - rbindex = "$ROLLBACK_INDEX_IN_FIT"; - }; - __CONF_SECTION_EOF - else - cat << __CONF_SECTION_EOF -- config@$cnt { -+ config-$cnt { - description = "$(basename $dtname .dtb)"; -- firmware = "uboot@1"; -+ firmware = "uboot-1"; - loadables = $LOADABLES; -- fdt = "fdt@$cnt"; -+ fdt = "fdt-$cnt"; - }; - __CONF_SECTION_EOF - fi - else - cat << __CONF_SECTION1_EOF -- config@$cnt { -+ config-$cnt { - description = "$(basename $dtname .dtb)"; -- firmware = "uboot@1"; -+ firmware = "uboot-1"; - loadables = $LOADABLES; -- fdt = "fdt@$cnt"; -+ fdt = "fdt-$cnt"; - }; - __CONF_SECTION1_EOF - fi --- -2.17.1 - diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index f8ebb730..b41c3bf4 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -3,15 +3,12 @@ require imx-mkimage_git.inc DESCRIPTION = "Generate Boot Loader for i.MX 8 device" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SECTION = "BSP" -inherit use-imx-security-controller-firmware +inherit use-imx-security-controller-firmware uboot-sign -IMX_EXTRA_FIRMWARE = "firmware-imx-8 imx-sc-firmware imx-seco" -IMX_EXTRA_FIRMWARE:mx8m = "firmware-imx-8m" -IMX_EXTRA_FIRMWARE:mx8x = "imx-sc-firmware imx-seco" DEPENDS += " \ u-boot \ ${IMX_EXTRA_FIRMWARE} \ @@ -20,11 +17,14 @@ DEPENDS += " \ " # xxd is a dependency of fspi_packer.sh DEPENDS += "xxd-native" -DEPENDS:append:mx8m = " u-boot-mkimage-native dtc-native" +DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native" BOOT_NAME = "imx-boot" PROVIDES = "${BOOT_NAME}" -inherit deploy +inherit deploy uuu_bootloader_tag + +UUU_BOOTLOADER = "${BOOT_NAME}" +UUU_BOOTLOADER_TAGGED = "${BOOT_NAME}-tagged" # Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}" @@ -58,18 +58,30 @@ IMXBOOT_TARGETS ?= \ 'flash_multi_cores flash_dcd', d), d)}" BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}" -BOOT_STAGING:mx8m = "${S}/iMX8M" -BOOT_STAGING:mx8dx = "${S}/iMX8QX" +BOOT_STAGING:mx8m-generic-bsp = "${S}/iMX8M" +BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX" -SOC_FAMILY = "INVALID" -SOC_FAMILY:mx8 = "mx8" -SOC_FAMILY:mx8m = "mx8m" -SOC_FAMILY:mx8x = "mx8x" +SOC_FAMILY = "INVALID" +SOC_FAMILY:mx8-generic-bsp = "mx8" +SOC_FAMILY:mx8m-generic-bsp = "mx8m" +SOC_FAMILY:mx8x-generic-bsp = "mx8x" +SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp" +SOC_FAMILY:mx93-generic-bsp = "mx93" REV_OPTION ?= "" -REV_OPTION:mx8qxp = \ +REV_OPTION:mx8qxp-generic-bsp = \ "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \ 'REV=C0', d)}" +REV_OPTION:mx8dx-generic-bsp = "REV=C0" +REV_OPTION:mx8ulp-generic-bsp = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', '', \ + 'REV=A1', d)}" + +do_uboot_assemble_fitimage:prepend:imx-generic-bsp() { + for config in ${UBOOT_MACHINE}; do + mkdir -p ${B}/${config} + done +} compile_mx8m() { bbnote 8MQ/8MM/8MN/8MP boot binary build @@ -82,15 +94,19 @@ compile_mx8m() { cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \ ${BOOT_STAGING}/u-boot-spl.bin cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME} ${BOOT_STAGING} + if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then + # Use DTB binary patched with signature node + cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME} + fi cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} \ ${BOOT_STAGING}/u-boot-nodtb.bin - cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin + cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME} ${BOOT_STAGING}/u-boot.bin } compile_mx8() { bbnote 8QM boot binary build cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} ${BOOT_STAGING}/scfw_tcm.bin - cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin + cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME} ${BOOT_STAGING}/u-boot.bin cp ${DEPLOY_DIR_IMAGE}/${SECO_FIRMWARE_NAME} ${BOOT_STAGING} if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} ] ; then @@ -103,13 +119,42 @@ compile_mx8x() { bbnote 8QX boot binary build cp ${DEPLOY_DIR_IMAGE}/${SECO_FIRMWARE_NAME} ${BOOT_STAGING} cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} ${BOOT_STAGING}/scfw_tcm.bin - cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin + cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME} ${BOOT_STAGING}/u-boot.bin if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} ] ; then cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \ ${BOOT_STAGING}/u-boot-spl.bin fi } + +compile_mx8ulp() { + bbnote 8ULP boot binary build + cp ${DEPLOY_DIR_IMAGE}/${SECO_FIRMWARE_NAME} ${BOOT_STAGING}/ + cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin + cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/upower.bin ${BOOT_STAGING}/upower.bin + cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME} ${BOOT_STAGING}/u-boot.bin + if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} ] ; then + cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \ + ${BOOT_STAGING}/u-boot-spl.bin + fi +} + +compile_mx93() { + bbnote i.MX 93 boot binary build + for ddr_firmware in ${DDR_FIRMWARE_NAME}; do + bbnote "Copy ddr_firmware: ${ddr_firmware} from ${DEPLOY_DIR_IMAGE} -> ${BOOT_STAGING} " + cp ${DEPLOY_DIR_IMAGE}/${ddr_firmware} ${BOOT_STAGING} + done + + cp ${DEPLOY_DIR_IMAGE}/${SECO_FIRMWARE_NAME} ${BOOT_STAGING}/ + cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin + cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME} ${BOOT_STAGING}/u-boot.bin + if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} ] ; then + cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \ + ${BOOT_STAGING}/u-boot-spl.bin + fi +} + do_compile() { # mkimage for i.MX8 # Copy TEE binary to SoC target folder to mkimage @@ -169,6 +214,32 @@ deploy_mx8x() { ${DEPLOYDIR}/${BOOT_TOOLS} fi } + +deploy_mx8ulp() { + install -d ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0644 ${BOOT_STAGING}/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0755 ${S}/${TOOLS_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} + if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} ] ; then + install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \ + ${DEPLOYDIR}/${BOOT_TOOLS} + fi +} + +deploy_mx93() { + install -d ${DEPLOYDIR}/${BOOT_TOOLS} + + for ddr_firmware in ${DDR_FIRMWARE_NAME}; do + install -m 0644 ${DEPLOY_DIR_IMAGE}/${ddr_firmware} ${DEPLOYDIR}/${BOOT_TOOLS} + done + + install -m 0644 ${BOOT_STAGING}/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0755 ${S}/${TOOLS_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} + if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} ] ; then + install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \ + ${DEPLOYDIR}/${BOOT_TOOLS} + fi +} + do_deploy() { deploy_${SOC_FAMILY} # copy the sc fw, dcd and uboot to deploy path @@ -190,13 +261,12 @@ do_deploy() { fi install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${target} ${DEPLOYDIR} done - cd ${DEPLOYDIR} - ln -sf ${BOOT_CONFIG_MACHINE}-${IMAGE_IMXBOOT_TARGET} ${BOOT_NAME} - cd - + + ln -sf ${BOOT_CONFIG_MACHINE}-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME} } addtask deploy before do_build after do_compile PACKAGE_ARCH = "${MACHINE_ARCH}" FILES:${PN} = "/boot" -COMPATIBLE_MACHINE = "(mx8)" +COMPATIBLE_MACHINE = "(mx8-generic-bsp|mx9-generic-bsp)" diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb index f9943342..f95f2a2b 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb @@ -1,27 +1,23 @@ # Copyright (C) 2016 Freescale Semiconductor -# Copyright (C) 2017-2021 NXP +# Copyright (C) 2017-2022 NXP require imx-mkimage_git.inc DESCRIPTION = "i.MX make image" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SECTION = "BSP" inherit deploy native -CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR} -L ${STAGING_LIBDIR}" +EXTRA_OEMAKE = "SOC=iMX8M mkimage_imx8" -do_compile () { - cd ${S} - oe_runmake clean - oe_runmake bin - oe_runmake -C iMX8M -f soc.mak mkimage_imx8 -} +CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR} -L ${STAGING_LIBDIR}" -do_install () { - cd ${S} +do_install() { install -d ${D}${bindir} install -m 0755 iMX8M/mkimage_imx8 ${D}${bindir}/mkimage_imx8m + install -m 0755 iMX8M/mkimage_fit_atf.sh ${D}${bindir}/mkimage_fit_atf.sh + install -m 0755 iMX8M/print_fit_hab.sh ${D}${bindir}/print_fit_hab.sh install -m 0755 mkimage_imx8 ${D}${bindir}/mkimage_imx8 } diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index c51c1e08..4a4bc4c9 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -1,13 +1,13 @@ -# Copyright 2017-2021 NXP +# Copyright 2017-2022 NXP DEPENDS = "zlib-native openssl-native" -SRCBRANCH = "lf-5.10.52_2.1.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch \ +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 \ " -SRCREV = "1112c88470f339dc631e2a7117087f416af6d6b5" +SRCBRANCH = "lf-5.15.71_2.2.0" +SRCREV = "3bfcfccb71ddf894be9c402732ccb229fe72099e" + S = "${WORKDIR}/git" BOOT_TOOLS = "imx-boot-tools" diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb index e3dad7da..3273c270 100644 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb @@ -1,24 +1,24 @@ # Copyright (C) 2016 Freescale Semiconductor -# Copyright (C) 2017-2021 NXP +# Copyright 2017-2022 NXP DESCRIPTION = "i.MX System Controller Firmware" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" SECTION = "BSP" inherit fsl-eula-unpack pkgconfig deploy SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "5c2b9d35e526136042a84e8d8f6c116e" -SRC_URI[sha256sum] = "0adc3d2c2df250a873232f1b62b14674694b50a4e01dd6ceae479e4ff2b2276b" +SRC_URI[md5sum] = "d608eb2b3d312da1dbde55b8514c1e0f" +SRC_URI[sha256sum] = "1272ac5c31a88017ef548721f3acf930a7eda6ac73aa9f41b5f0cade9d5c0e5f" BOARD_TYPE ?= "mek" SC_FIRMWARE_NAME ?= "INVALID" -SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8qxp-nxp-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8dx-nxp-bsp = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" symlink_name = "scfw_tcm.bin" @@ -38,4 +38,4 @@ INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)" +COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" diff --git a/recipes-bsp/imx-seco/imx-seco-libs/0001-Fix-return-value-of-void-functions.patch b/recipes-bsp/imx-seco/imx-seco-libs/0001-Fix-return-value-of-void-functions.patch new file mode 100644 index 00000000..656469c2 --- /dev/null +++ b/recipes-bsp/imx-seco/imx-seco-libs/0001-Fix-return-value-of-void-functions.patch @@ -0,0 +1,57 @@ +From 2eff97fe2345d8255869224404322d23193f1115 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 7 Jan 2023 21:59:15 -0800 +Subject: [PATCH] Fix return value of void* functions + +This is found with clang + +Fixes +error: non-void function does not return a value [-Werror,-Wreturn-type] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/hsm/hsm_test.c | 1 + + test/she/src/she_test_storage_manager.c | 1 + + test/v2x/v2x_test.c | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/test/hsm/hsm_test.c b/test/hsm/hsm_test.c +index 9f29ca9..01820b8 100644 +--- a/test/hsm/hsm_test.c ++++ b/test/hsm/hsm_test.c +@@ -391,6 +391,7 @@ static uint32_t nvm_status; + static void *hsm_storage_thread(void *arg) + { + seco_nvm_manager(NVM_FLAGS_HSM, &nvm_status); ++ return 0; + } + + +diff --git a/test/she/src/she_test_storage_manager.c b/test/she/src/she_test_storage_manager.c +index 32a4cb9..68cdba7 100644 +--- a/test/she/src/she_test_storage_manager.c ++++ b/test/she/src/she_test_storage_manager.c +@@ -28,6 +28,7 @@ static uint32_t nvm_status; + static void *she_storage_thread(void *arg) + { + seco_nvm_manager(NVM_FLAGS_SHE, &nvm_status); ++ return 0; + } + + +diff --git a/test/v2x/v2x_test.c b/test/v2x/v2x_test.c +index aeb3d2a..5f02354 100644 +--- a/test/v2x/v2x_test.c ++++ b/test/v2x/v2x_test.c +@@ -181,6 +181,7 @@ static uint32_t nvm_status; + static void *v2x_hsm_storage_thread(void *arg) + { + seco_nvm_manager(NVM_FLAGS_V2X | NVM_FLAGS_HSM, &nvm_status); ++ return 0; + } + + +-- +2.39.0 + diff --git a/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch b/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch new file mode 100644 index 00000000..27107a6a --- /dev/null +++ b/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch @@ -0,0 +1,28 @@ +From 9e89d173a7fab97c913960344ae01dfa409b6258 Mon Sep 17 00:00:00 2001 +From: Cristinel Panfir <cristinel.panfir@nxp.com> +Date: Mon, 27 Jul 2020 18:55:30 +0000 +Subject: [PATCH] Makefile: Fix LIBDIR for multilib + +Upstream-Status: Pending +Signed-off-by: Cristinel Panfir <cristinel.panfir@nxp.com> +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index b16cebf..492d700 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,8 @@ all: she_test hsm_test v2x_test she_lib.a seco_nvm_manager.a hsm_lib.a + CFLAGS = -O1 -Werror -fPIC + DESTDIR ?= export + BINDIR ?= /usr/bin +-LIBDIR ?= /usr/lib ++base_libdir ?= /lib ++LIBDIR ?= /usr/$(base_libdir) + INCLUDEDIR ?= /usr/include + + ifdef COVERAGE +-- +2.7.4 + diff --git a/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch b/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch new file mode 100644 index 00000000..81a4c17e --- /dev/null +++ b/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch @@ -0,0 +1,33 @@ +From b62f020ea723dc33f28e5e865d0ddd13219971c9 Mon Sep 17 00:00:00 2001 +From: Cristinel Panfir <cristinel.panfir@nxp.com> +Date: Mon, 29 Mar 2021 15:24:42 +0300 +Subject: [PATCH] Makefile: Add v2x test to the installed-binaries + +Upstream-Status: Pending +Signed-off-by: Cristinel Panfir <cristinel.panfir@nxp.com> +[regenerate the patch to be applied after meta-imx patches] +Signed-off-by: Fausto Chiatante <fausto.chiatante@nxp.com> + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 25ad333..a397814 100644 +--- a/Makefile ++++ b/Makefile +@@ -61,9 +61,9 @@ hsm_doc: include/hsm/hsm_api.h + cp doc/latex/refman.pdf doc/hsm_api_document.pdf + rm -rf doc/latex/ + +-install: hsm_test she_test she_lib.a seco_nvm_manager.a hsm_lib.a ++install: hsm_test she_test v2x_test she_lib.a seco_nvm_manager.a hsm_lib.a + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR) + cp seco_nvm_manager.a hsm_lib.a she_lib.a $(DESTDIR)$(LIBDIR) +- cp hsm_test she_test $(DESTDIR)$(BINDIR) ++ cp hsm_test she_test v2x_test $(DESTDIR)$(BINDIR) + cp -a include/* $(DESTDIR)$(INCLUDEDIR) + +-- +2.25.1 + diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 41128e28..b0296e97 100644 --- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -1,24 +1,27 @@ -# Copyright (C) 2019-2021 NXP +# Copyright 2019-22 NXP SUMMARY = "NXP i.MX SECO library" -DESCRIPTION = "NXP i.MX Security Controller library" +DESCRIPTION = "Library for NXP i.MX Security Controller Subsystem" SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://EULA.txt;md5=85d06b38f17b935ca11784d67075b846" +LIC_FILES_CHKSUM = "file://EULA.txt;md5=d3c315c6eaa43e07d8c130dc3a04a011" DEPENDS = "zlib" -SRCBRANCH = "lf-5.10.y_2.0.0" +SRCBRANCH = "imx_5.4.70_2.3.11" SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \ - file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch" -SRCREV = "44caf511023012e9eda93f8bf64c90eaff1bade6" + file://0001-Makefile-Fix-LIBDIR-for-multilib.patch \ + file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch \ + file://0001-add-v2x_test-to-the-installed-binaries.patch \ + file://0001-Fix-return-value-of-void-functions.patch" +SRCREV = "aa8d62900c41cc779c11fe4e6f58b40c3c9f82f0" S = "${WORKDIR}/git" TARGET_CC_ARCH += "${LDFLAGS}" do_install () { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} BINDIR=${bindir} LIBDIR=${libdir} install } -COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)" +COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" diff --git a/recipes-bsp/imx-seco/imx-seco_3.8.2.bb b/recipes-bsp/imx-seco/imx-seco_5.9.0.bb index bd749e4f..712be23a 100644 --- a/recipes-bsp/imx-seco/imx-seco_3.8.2.bb +++ b/recipes-bsp/imx-seco/imx-seco_5.9.0.bb @@ -1,17 +1,18 @@ -# Copyright (C) 2019-2021 NXP +# Copyright 2019-2022 NXP SUMMARY = "NXP i.MX SECO firmware" -DESCRIPTION = "NXP i.MX Security Controller firmware" +DESCRIPTION = "Firmware for i.MX Security Controller Subsystem" SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" inherit fsl-eula-unpack use-imx-security-controller-firmware deploy SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "92a15f2ffe162374806e2dfe9b0aa2e9" -SRC_URI[sha256sum] = "c543cd3ec4d30c0cf5ee2a2f4dc7efe209363e45087e0b7c380b727b7bcf2c8a" +SRC_URI[md5sum] = "b722a534c4d3cc90270e05eaa812514d" +SRC_URI[sha256sum] = "c3bd761f457e939035b01a0ab36e79064a2a1bc6c3cdb3cd847f7f38df0964df" + do_compile[noexec] = "1" @@ -23,4 +24,4 @@ do_deploy () { install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} } -COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)" +COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" diff --git a/recipes-bsp/imx-test/imx-test_00.00.00.bb b/recipes-bsp/imx-test/imx-test_00.00.00.bb index 070fbd30..1850a16a 100644 --- a/recipes-bsp/imx-test/imx-test_00.00.00.bb +++ b/recipes-bsp/imx-test/imx-test_00.00.00.bb @@ -7,4 +7,4 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ad ALLOW_EMPTY:${PN} = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf50|vf60)" +COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index f7ef0348..e041c794 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -1,27 +1,27 @@ # Copyright (C) 2012-2016 O.S. Systems Software LTDA. # Copyright (C) 2013-2016 Freescale Semiconductor -# Copyright (C) 2017-2021 NXP +# Copyright (C) 2017-2022 NXP SUMMARY = "Test programs for i.MX BSP" DESCRIPTION = "Unit tests for the i.MX BSP" SECTION = "base" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" -DEPENDS = "alsa-lib libdrm" -DEPENDS:append:mx6 = " imx-lib" -DEPENDS:append:mx7 = " imx-lib" +DEPENDS = "alsa-lib freetype libdrm" DEPENDS:append:imxvpu = " virtual/imxvpu" +DEPENDS:append:mx6-nxp-bsp = " imx-lib" +DEPENDS:append:mx7-nxp-bsp = " imx-lib" +DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib" PE = "1" PV = "7.0+${SRCPV}" -SRCBRANCH = "lf-5.10.52_2.1.0" -SRC_URI = " \ - git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ - file://memtool_profile \ -" -SRCREV = "2dcb987a91183770f328258b424d9ad2fdfdc17a" +SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ + file://memtool_profile" +SRCBRANCH = "lf-5.15.71_2.2.0" +SRCREV = "68243988862f0e66a37754b4dbe4e7833b903f0c" + S = "${WORKDIR}/git" inherit module-base use-imx-headers @@ -29,22 +29,23 @@ inherit module-base use-imx-headers INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -PLATFORM:mx6q = "IMX6Q" -PLATFORM:mx6dl = "IMX6Q" -PLATFORM:mx6sl = "IMX6SL" -PLATFORM:mx6sll = "IMX6SL" -PLATFORM:mx6sx = "IMX6SX" -PLATFORM:mx6ul = "IMX6UL" -PLATFORM:mx7d = "IMX7D" -PLATFORM:mx7ulp = "IMX7D" -PLATFORM:mx8 = "IMX8" +PLATFORM:mx6q-nxp-bsp = "IMX6Q" +PLATFORM:mx6dl-nxp-bsp = "IMX6Q" +PLATFORM:mx6sl-nxp-bsp = "IMX6SL" +PLATFORM:mx6sll-nxp-bsp = "IMX6SL" +PLATFORM:mx6sx-nxp-bsp = "IMX6SX" +PLATFORM:mx6ul-nxp-bsp = "IMX6UL" +PLATFORM:mx7d-nxp-bsp = "IMX7D" +PLATFORM:mx7ulp-nxp-bsp = "IMX7D" +PLATFORM:mx8-nxp-bsp = "IMX8" +PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP" PARALLEL_MAKE = "-j 1" EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG:append:imxvpu = " vpu" -PACKAGECONFIG:append:mx8m = " swpdm" +PACKAGECONFIG:append:mx8m-nxp-bsp = " swpdm" PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr" PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu" diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb index 0de2ad85..4b4915e5 100644 --- a/recipes-bsp/imx-uuc/imx-uuc_git.bb +++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb @@ -3,7 +3,7 @@ SUMMARY = "A Daemon wait for NXP mfgtools host's command" SECTION = "base" DEPENDS = "virtual/kernel dosfstools-native" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit autotools-brokensep @@ -12,10 +12,10 @@ PR = "r1" PV = "0.5.1+git${SRCPV}" SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master" -SRCREV = "d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc" +SRCREV = "61f258fb6f10f690633eb068a8d4aaaba5e5e8a2" S = "${WORKDIR}/git" FILES:${PN} += "/linuxrc /fat" -COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" +COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.9.0.bb index e6cffaca..26ebf181 100644 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.9.0.bb @@ -1,8 +1,8 @@ -# Copyright (C) 2019-2021 NXP +# Copyright 2019-2022 NXP DESCRIPTION = "i.MX VC8000E Encoder library" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" inherit fsl-eula-unpack @@ -10,8 +10,8 @@ SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" S = "${WORKDIR}/${BPN}-${PV}" -SRC_URI[md5sum] = "fbd43a100c27abbae301428f1ae2bc64" -SRC_URI[sha256sum] = "e59ac2ded726d722f61793b17fc394ce87b1c5710cb79f0b1d60b87fca5829e1" +SRC_URI[md5sum] = "192b354d1c21836dc7338606e60b45ae" +SRC_URI[sha256sum] = "62b5ba3c4aab21d0d4be3eee9b204a9bb50b83b6140ee1a3b27c648809bdfbaa" # SCR is the location and name of the Software Content Register file # relative to ${D}${D_SUBDIR}. @@ -32,4 +32,5 @@ do_install () { FILES:${PN} = "/" -COMPATIBLE_MACHINE = "(mx8mp)" +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.4.bb index 25f54c7a..b5e1d0e1 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.4.bb @@ -4,17 +4,15 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" DEPENDS = "imx-vpu-hantro" -DEPENDS:append:mx8mp = " imx-vpu-hantro-vc" +DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" -SRC_URI = " \ - ${FSL_MIRROR}/${BP}.tar.gz \ -" -SRC_URI[md5sum] = "980237589af195c2c4b852a7aad175ee" -SRC_URI[sha256sum] = "a5d915fefd3637e68d693638edd1161c30e75011a6312251b914f04546fd0fc9" +SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz" +SRC_URI[md5sum] = "e4bdaa1e064e3959576f7dd5a2d89389" +SRC_URI[sha256sum] = "83ba2798564702d74ab65f6238f95f59247d983b846de1de4c19bdfaf6dabeb8" -PLATFORM:mx8mm = "IMX8MM" -PLATFORM:mx8mq = "IMX8MQ" -PLATFORM:mx8mp = "IMX8MP" +PLATFORM:mx8mm-nxp-bsp = "IMX8MM" +PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" +PLATFORM:mx8mp-nxp-bsp = "IMX8MP" EXTRA_OEMAKE = " \ CROSS_COMPILE="${HOST_PREFIX}" \ @@ -28,4 +26,4 @@ do_install () { } PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" +COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch new file mode 100644 index 00000000..861230bb --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch @@ -0,0 +1,49 @@ +From aba22ec2e285cf7557a5049fa6181e82e7f1a489 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Mon, 21 Nov 2022 12:04:09 +0000 +Subject: [PATCH] buildsystem: don't ignore externally set cflags + +Upstream-Status: pending +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + decoder_sw/software/linux/h264high/Makefile | 4 ++-- + decoder_sw/software/linux/vp6/Makefile | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/decoder_sw/software/linux/h264high/Makefile b/decoder_sw/software/linux/h264high/Makefile +index 556ff71..7bdd99d 100755 +--- a/decoder_sw/software/linux/h264high/Makefile ++++ b/decoder_sw/software/linux/h264high/Makefile +@@ -50,10 +50,10 @@ CLEAR_HDRINFO_IN_SEEK = n + DEBUG = y + # Add your debugging flag (or not) to CFLAGS + ifeq ($(DEBUG),y) +- CFLAGS = $(M32) -g -O0 ++ CFLAGS += $(M32) -g -O0 + DEBFLAGS = -DDEBUG -D_ASSERT_USED -D_RANGE_CHECK -D_ERROR_PRINT + else +- CFLAGS = $(M32) -O3 ++ CFLAGS += $(M32) -O3 + DEBFLAGS = -DNDEBUG + endif + +diff --git a/decoder_sw/software/linux/vp6/Makefile b/decoder_sw/software/linux/vp6/Makefile +index b6e6914..b933d46 100755 +--- a/decoder_sw/software/linux/vp6/Makefile ++++ b/decoder_sw/software/linux/vp6/Makefile +@@ -50,10 +50,10 @@ DEBUG = y + + # Add your debugging flag (or not) to CFLAGS + ifeq ($(DEBUG),y) +- CFLAGS = -g -O0 ++ CFLAGS += -g -O0 + DEBFLAGS = -DDEBUG -D_ASSERT_USED -D_ERROR_PRINT + else +- CFLAGS = -O3 ++ CFLAGS += -O3 + DEBFLAGS = -DNDEBUG + endif + +-- +2.35.3 + diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb deleted file mode 100644 index 427dbf92..00000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2017-2020 NXP - -DESCRIPTION = "i.MX Hantro VPU library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" - -PROVIDES = "virtual/imxvpu" - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "3f8d4bb593d851d0523d0146131946ae" -SRC_URI[sha256sum] = "a312a0b6d32ed16527e5bfcff362b231069428362ad5710f816bca019f70c6a2" - -inherit fsl-eula-unpack use-imx-headers - -PARALLEL_MAKE="-j 1" - -PLATFORM:mx8mm = "IMX8MM" -PLATFORM:mx8mq = "IMX8MQ" -PLATFORM:mx8mp = "IMX8MP" - -EXTRA_OEMAKE = " \ - CROSS_COMPILE="${HOST_PREFIX}" \ - SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ - PLATFORM="${PLATFORM}" \ -" - -do_install () { - oe_runmake install DEST_DIR="${D}" -} - -FILES:${PN} += "/unit_tests" - -RDEPENDS:${PN} += "imx-vpu-hantro-daemon" - -COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb new file mode 100644 index 00000000..35adecf8 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb @@ -0,0 +1,39 @@ +# Copyright (C) 2017-2020 NXP + +DESCRIPTION = "i.MX Hantro VPU library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" + +PROVIDES = "virtual/imxvpu" + +SRC_URI = " \ + ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ + file://0001-buildsystem-don-t-ignore-externally-set-cflags.patch \ +" +SRC_URI[md5sum] = "cfa0e92da0eca9cf622c4d7abc618cef" +SRC_URI[sha256sum] = "7e9bcdbd067ce66a1247373cbf088945346feb0027deb61af541ebc1256277c3" + +inherit fsl-eula-unpack use-imx-headers + +PARALLEL_MAKE="-j 1" + +PLATFORM:mx8mm-nxp-bsp = "IMX8MM" +PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" +PLATFORM:mx8mp-nxp-bsp = "IMX8MP" + +EXTRA_OEMAKE = " \ + CROSS_COMPILE="${HOST_PREFIX}" \ + SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ + PLATFORM="${PLATFORM}" \ +" + +do_install () { + oe_runmake install DEST_DIR="${D}" +} + +FILES:${PN} += "/unit_tests" + +RDEPENDS:${PN} += "imx-vpu-hantro-daemon" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb index 95252dae..383a0e2a 100644 --- a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb +++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Freescale Semiconductor # Copyright (C) 2017-2020 NXP -DESCRIPTION = "Freescale VPU library" +DESCRIPTION = "Freescale VPU library for Chips&Media VPU" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" @@ -28,5 +28,4 @@ do_install() { oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install } -# Compatible only for i.MX with Chips&Media VPU -COMPATIBLE_MACHINE = "(mx6q|mx6dl)" +COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.19.0.bb index 0122d273..e19ad6af 100644 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.19.0.bb @@ -1,15 +1,15 @@ -# Copyright 2020-2021 NXP +# Copyright 2020-2022 NXP DESCRIPTION = "Basler camera binary drivers" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" inherit fsl-eula-unpack SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "963339f568e8b0ba5d67328238284d47" -SRC_URI[sha256sum] = "f4d4aa08103937ddd86b9c0880d07c1e0db1ec7f51a420a8ccc76dcf2fb7dbe6" +SRC_URI[md5sum] = "99962b0cbba53ef773b7ac8cb50ce05a" +SRC_URI[sha256sum] = "fd2f71c854134683ac293393255d61b985e75d8dae2e090c99c21dff756017fb" do_install() { dest_dir=${D}/opt/imx8-isp/bin @@ -22,6 +22,7 @@ do_install() { SYSTEMD_AUTO_ENABLE = "enable" FILES:${PN} = "${libdir} /opt" -INSANE_SKIP:${PN} = "file-rdeps already-stripped" +INSANE_SKIP:${PN} = "already-stripped" +RDEPENDS:${PN} += "isp-imx" -COMPATIBLE_MACHINE = "(mx8mp)" +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch deleted file mode 100644 index c3ee088f..00000000 --- a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch +++ /dev/null @@ -1,72 +0,0 @@ -From ea5ce303fa5bc7b6a17c522b4caf49d349adb12b Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Sat, 30 Oct 2021 17:26:42 +0200 -Subject: [PATCH] isp-imx: drop use of __TIME__, __DATE__ - -With reproducible build enabled the compiler is configured to throw -an error if __TIME__, __DATE__ preprocessor macros are used. - -| isp-imx-4.2.2.11.0/mediacontrol/daemon/main_v4l2.cpp:99:44: error: macro "__DATE__" might prevent reproducible builds [-Werror=date-time] -| 99 | std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl; -| | ^~~~~~~~ - -Fix this by replacing __DATE__, __TIME__ with BUILD_DATE and setting -BUILD_DATE from CMakeLists.txt to either SOURCE_DATE_EPOCH if present -or the local time otherwise. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - mediacontrol/CMakeLists.txt | 3 +++ - mediacontrol/daemon/main_v4l2.cpp | 8 ++++---- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/mediacontrol/CMakeLists.txt b/mediacontrol/CMakeLists.txt -index 5849c163e..8a8e1a4a0 100755 ---- a/mediacontrol/CMakeLists.txt -+++ b/mediacontrol/CMakeLists.txt -@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1.0) - - project(ISP_MEDIA_CONTROL) - -+string(TIMESTAMP BUILD_DATE "%b %d %Y" UTC) -+add_compile_definitions(BUILD_DATE="${BUILD_DATE}") -+ - if( NOT DEFINED APPSHELL_TOP_COMPILE) - if(DEFINED PLATFORM) - if(${PLATFORM} STREQUAL ARM64) -diff --git a/mediacontrol/daemon/main_v4l2.cpp b/mediacontrol/daemon/main_v4l2.cpp -index d3d1c2423..dd0514358 100644 ---- a/mediacontrol/daemon/main_v4l2.cpp -+++ b/mediacontrol/daemon/main_v4l2.cpp -@@ -105,7 +105,7 @@ int main(int argc, char* argv[]) { - if(!(string2Version.find(argv[1])==string2Version.end())){ - std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl; - #ifndef ANDROID -- std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl; -+ std::cout << "Build Time : "<<BUILD_DATE<<std::endl; - #endif - return 0; - } -@@ -116,8 +116,8 @@ int main(int argc, char* argv[]) { - { - ALOGI("******************************************************************"); - #ifndef ANDROID -- ALOGI("VIV ISP Media Control Framework V%s (%s, %s)", -- MEDIA_SERVER_VERSION, __DATE__, __TIME__); -+ ALOGI("VIV ISP Media Control Framework V%s (%s)", -+ MEDIA_SERVER_VERSION, BUILD_DATE); - #else - ALOGI("VIV ISP Media Control Framework V%s", MEDIA_SERVER_VERSION); - #endif -@@ -138,7 +138,7 @@ int main(int argc, char* argv[]) { - if(!(string2Version.find(argv[i])==string2Version.end())){ - std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl; - #ifndef ANDROID -- std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl; -+ std::cout << "Build Time : "<<BUILD_DATE<<std::endl; - #endif - i++; - continue; --- -2.20.1 - diff --git a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch deleted file mode 100644 index 950098cd..00000000 --- a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c65e20b82cfd9e82b849b3140eec7b8c18922dc Mon Sep 17 00:00:00 2001 -From: Chris Dimich <Chris.Dimich@boundarydevices.com> -Date: Mon, 13 Sep 2021 17:56:02 -0700 -Subject: [PATCH 1/1] start_isp.sh: fix NR_DEVICE_TREE_BASLER variable - -Also remove uneeded -lm option from run.sh script. - -Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com> ---- - imx/start_isp.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/imx/start_isp.sh b/imx/start_isp.sh -index 6daabc59c..250226935 100755 ---- a/imx/start_isp.sh -+++ b/imx/start_isp.sh -@@ -7,7 +7,7 @@ - # - - RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" --NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null) -+NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam `find /sys/firmware/devicetree/base/soc@0/ -name compatible | grep i2c` -l | wc -l 2> /dev/null) - NR_DEVICE_TREE_OV5640=$(grep ov5640 /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null) - - # check if the basler device has been enabled in the device tree -@@ -21,13 +21,13 @@ if [ $NR_DEVICE_TREE_BASLER -eq 1 ]; then - - # Default configuration for Basler daA3840-30mc: basler_4k - # Available configurations: basler_4k, basler_1080p60, basler_4khdr, basler_1080p60hdr -- exec ./run.sh -c basler_4k -lm -+ exec ./run.sh -c basler_4k - - elif [ $NR_DEVICE_TREE_OV5640 -eq 1 ]; then - - # Default configuration for Basler daA3840-30mc: basler_1080p60 - # Available configurations: basler_1080p60, basler_1080p60hdr -- exec ./run.sh -c basler_1080p60 -lm -+ exec ./run.sh -c basler_1080p60 - - fi - -@@ -38,7 +38,7 @@ elif [ $NR_DEVICE_TREE_BASLER -eq 2 ]; then - cd $RUNTIME_DIR - # Default configuration for Basler daA3840-30mc: dual_basler_1080p60 - # Available configurations: dual_basler_1080p60, dual_basler_1080p60hdr, dual_basler_1080p25hdr -- exec ./run.sh -c dual_basler_1080p60 -lm -+ exec ./run.sh -c dual_basler_1080p60 - - else - # no device tree found exit with code no device or address --- -2.31.1 - diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb deleted file mode 100644 index 9ede07bd..00000000 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 2020-2021 NXP - -DESCRIPTION = "i.MX Verisilicon Software ISP" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" -DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2-8" - -SRC_URI = " \ - ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ - file://0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch \ - file://0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch \ -" - -SRC_URI[md5sum] = "e9e0943b9f4923c767d07901e550c41c" -SRC_URI[sha256sum] = "13274c0fd442da4b3b9900a7568c59872ffa6408f5699d35eebc6760a8e51297" - -inherit fsl-eula-unpack cmake systemd use-imx-headers - -# Build the sub-folder appshell -OECMAKE_SOURCEPATH = "${S}/appshell" - -# Use make instead of ninja -OECMAKE_GENERATOR = "Unix Makefiles" - -SYSTEMD_SERVICE:${PN} = "imx8-isp.service" - -EXTRA_OECMAKE += " \ - -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \ - -DCMAKE_BUILD_TYPE=release \ - -DISP_VERSION=ISP8000NANO_V1802 \ - -DPLATFORM=ARM64 \ - -DAPPMODE=V4L2 \ - -DQTLESS=1 \ - -DFULL_SRC_COMPILE=1 \ - -DWITH_DRM=1 \ - -DWITH_DWE=1 \ - -DSERVER_LESS=1 \ - -DSUBDEV_V4L2=1 \ - -DENABLE_IRQ=1 \ - -DPARTITION_BUILD=0 \ - -D3A_SRC_BUILD=0 \ - -DIMX_G2D=ON \ - -Wno-dev \ -" - -do_configure:prepend() { - export SDKTARGETSYSROOT=${STAGING_DIR_HOST} -} - -do_compile:prepend() { - ln -sf ${RECIPE_SYSROOT}/${libdir}/libtinyxml2.so.?.?.? ${RECIPE_SYSROOT}/${libdir}/libtinyxml2.so -} - -do_install() { - install -d ${D}/${libdir} - install -d ${D}/${includedir} - install -d ${D}/opt/imx8-isp/bin - - cp -r ${WORKDIR}/build/generated/release/bin/*_test ${D}/opt/imx8-isp/bin - cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin - cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin - cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin - cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir} - cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} - - cp ${WORKDIR}/${BP}/imx/run.sh ${D}/opt/imx8-isp/bin - cp ${WORKDIR}/${BP}/imx/start_isp.sh ${D}/opt/imx8-isp/bin - - chmod +x ${D}/opt/imx8-isp/bin/run.sh - chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/${BP}/imx/imx8-isp.service ${D}${systemd_system_unitdir} - fi -} - -# The build contains a mix of versioned and unversioned libraries, so -# the default packaging configuration needs some modifications -FILES_SOLIBSDEV = "" -FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" -FILES:${PN}-dev += " \ - ${libdir}/libjsoncpp.so \ - ${libdir}/libos08a20.so \ - ${libdir}/libov2775.so \ -" - -INSANE_SKIP:${PN} = "rpaths" - -RDEPENDS:${PN} = "libdrm libpython3" - -COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb new file mode 100644 index 00000000..33dadad3 --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb @@ -0,0 +1,88 @@ +# Copyright 2020-2023 NXP + +DESCRIPTION = "i.MX Verisilicon Software ISP" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" +DEPENDS = "libdrm virtual/libg2d libtinyxml2" + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" +SRC_URI[md5sum] = "01f83394df91091f414f122c339c02bc" +SRC_URI[sha256sum] = "ab65a413f397230010266579df570beac5fde4af430e31fc251d7cf7c8fa2232" + +inherit fsl-eula-unpack cmake systemd use-imx-headers + +# Build the sub-folder appshell +OECMAKE_SOURCEPATH = "${S}/appshell" + +# Use make instead of ninja +OECMAKE_GENERATOR = "Unix Makefiles" + +# Workaround for linking issues seen with gold linker +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +SYSTEMD_SERVICE:${PN} = "imx8-isp.service" + +EXTRA_OECMAKE += " \ + -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \ + -DCMAKE_BUILD_TYPE=release \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ + -DISP_VERSION=ISP8000NANO_V1802 \ + -DPLATFORM=ARM64 \ + -DAPPMODE=V4L2 \ + -DQTLESS=1 \ + -DFULL_SRC_COMPILE=1 \ + -DWITH_DRM=1 \ + -DWITH_DWE=1 \ + -DSERVER_LESS=1 \ + -DSUBDEV_V4L2=1 \ + -DENABLE_IRQ=1 \ + -DPARTITION_BUILD=0 \ + -D3A_SRC_BUILD=0 \ + -DIMX_G2D=ON \ + -Wno-dev \ +" + +do_install() { + install -d ${D}/${libdir} + install -d ${D}/${includedir} + install -d ${D}/opt/imx8-isp/bin + install -d ${D}/opt/imx8-isp/bin/dewarp_config + + cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/${BP}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} + cp -r ${B}/generated/release/include/* ${D}/${includedir} + + cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin + cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin + + chmod +x ${D}/opt/imx8-isp/bin/run.sh + chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir} + fi +} + +# The build contains a mix of versioned and unversioned libraries, so +# the default packaging configuration needs some modification so that +# unversioned .so libraries go to the main package and versioned .so +# symlinks go to -dev. +FILES_SOLIBSDEV = "" +FILES_SOLIBS_VERSIONED = " \ + ${libdir}/libar1335.so \ + ${libdir}/libjsoncpp.so \ + ${libdir}/libos08a20.so \ + ${libdir}/libov2775.so \ +" +FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" +FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}" + +RDEPENDS:${PN} = "libdrm" + +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb b/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb deleted file mode 100644 index 07d52355..00000000 --- a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" -HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" - -SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https" - -SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb" - -S = "${WORKDIR}/git" - -inherit cmake - -# make sure we don't provide files which are also present in the -# current libtinyxml2 version's -dev package. -do_install:append() { - rm -rf ${D}/${includedir} - rm -rf ${D}/${libdir}/cmake - rm -rf ${D}/${libdir}/libtinyxml2.so - rm -rf ${D}/${libdir}/pkgconfig -} diff --git a/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch b/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch new file mode 100644 index 00000000..490d3a2f --- /dev/null +++ b/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch @@ -0,0 +1,28 @@ +From 41825b11289be251fed64470893d18b89b0dd38b Mon Sep 17 00:00:00 2001 +From: Carlos Rafael Giani <crg7475@mailbox.org> +Date: Sun, 8 May 2022 16:25:44 +0200 +Subject: [PATCH] g2d: Fix typo + +Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> + +Upstream-Status: Backport [41825b11289be251fed64470893d18b89b0dd38b] +--- + imxdmabuffer/imxdmabuffer_g2d_allocator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/imxdmabuffer/imxdmabuffer_g2d_allocator.c b/imxdmabuffer/imxdmabuffer_g2d_allocator.c +index f10a909..497dcea 100644 +--- a/imxdmabuffer/imxdmabuffer_g2d_allocator.c ++++ b/imxdmabuffer/imxdmabuffer_g2d_allocator.c +@@ -139,7 +139,7 @@ static uint8_t* imx_dma_buffer_g2d_allocator_map(ImxDmaBufferAllocator *allocato + * (Other allocators perform more steps than this.) */ + if (imx_g2d_buffer->mapping_refcount > 0) + { +- assert((imx_dwl_buffer->map_flags & flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK) == (flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK)); ++ assert((imx_g2d_buffer->map_flags & flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK) == (flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK)); + imx_g2d_buffer->mapping_refcount++; + } + else +-- +2.32.0 + diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb deleted file mode 100644 index 38481b54..00000000 --- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = 'Library for allocating and managing physically contiguous memory \ - ("DMA memory" or "DMA buffers") on i.MX devices.' -HOMEPAGE = "https://github.com/Freescale/libimxdmabuffer" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324" -SECTION = "base" - -PV .= "+git${SRCPV}" - -SRCBRANCH ?= "master" -SRCREV = "d2058aa404ee1e8e8abd552c6a637787bcdcf514" -SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \ - file://run-ptest \ - " - - -S = "${WORKDIR}/git" - -inherit pkgconfig waf use-imx-headers ptest - -EXTRA_OECONF = "--imx-linux-headers-path=${STAGING_INCDIR_IMX} \ - --libdir=${libdir} \ - ${PACKAGECONFIG_CONFARGS}" - -# If imxdpu is in use, the DPU is also used for implementing -# libg2d. However, that implementation's g2d_alloc() function -# is broken, so we cannot use it. -LIBG2D_PACKAGECONFIG = "g2d" -LIBG2D_PACKAGECONFIG:imxdpu = "" - -PACKAGECONFIG ?= " " -PACKAGECONFIG:append:imxgpu2d = " ${LIBG2D_PACKAGECONFIG}" -PACKAGECONFIG:append:imxipu = " ipu" -PACKAGECONFIG:append:imxpxp = " pxp" -PACKAGECONFIG:append:mx8m = " ion dwl" -PACKAGECONFIG:append:mx8qm = " ion" -PACKAGECONFIG:append:mx8qxp = " ion" - -HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2" - -PACKAGECONFIG[dwl] = "--with-dwl-allocator=yes ${HANTRO_CONF},--with-dwl-allocator=no,imx-vpu-hantro" -PACKAGECONFIG[ion] = "--with-ion-allocator=yes, --with-ion-allocator=no," -PACKAGECONFIG[ipu] = "--with-ipu-allocator=yes, --with-ipu-allocator=no," -PACKAGECONFIG[g2d] = "--with-g2d-allocator=yes, --with-g2d-allocator=no,virtual/libg2d" -PACKAGECONFIG[pxp] = "--with-pxp-allocator=yes, --with-pxp-allocator=no," - -# Using do_install_ptest_base instead of do_install_ptest, since -# the default do_install_ptest_base is hardcoded to expect Makefiles. -do_install_ptest_base() { - install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest - install -m 0755 ${B}/test-alloc ${D}${PTEST_PATH} -} - -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.2.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.2.bb new file mode 100644 index 00000000..090593be --- /dev/null +++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.2.bb @@ -0,0 +1,90 @@ +DESCRIPTION = 'Library for allocating and managing physically contiguous memory \ + ("DMA memory" or "DMA buffers") on i.MX devices.' +HOMEPAGE = "https://github.com/Freescale/libimxdmabuffer" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324" +SECTION = "base" + +PV .= "+git${SRCPV}" + +SRCBRANCH ?= "master" +SRCREV = "5410b44fb0c5bbd9fb1f3ba0681e65068d8cde57" +SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \ + file://0001-g2d-Fix-typo.patch \ + file://run-ptest \ + " + + +S = "${WORKDIR}/git" + +inherit pkgconfig waf use-imx-headers ptest + +EXTRA_OECONF = "--imx-linux-headers-path=${STAGING_INCDIR_IMX} \ + --libdir=${libdir} \ + ${@bb.utils.contains_any('PACKAGECONFIG', \ + [ 'dma-heap-cached', 'dma-heap-uncached' ], \ + '', '--with-dma-heap-allocator=no',d)} \ + ${PACKAGECONFIG_CONFARGS}" + +# If imxdpu is in use, the DPU is also used for implementing +# libg2d. However, that implementation's g2d_alloc() function +# is broken, so we cannot use it. +LIBG2D_PACKAGECONFIG = "g2d" +LIBG2D_PACKAGECONFIG:imxdpu = "" + +# The dma-heap allocator is special in that it can use more than one heap device +# node. In libimxdmabuffer, only heaps that allocate physically contiguous memory +# can be used, otherwise usable DMA buffers cannot be allocated. Furthermore, +# on NXP machines, there is a dma-heap for cached and one for uncached memory. +# +# One of them has to be selected by choosing either the "dma-heap-cached" or the +# "dma-heap-uncached" PACKAGECONFIG. The uncached one is picked by default for +# performance reasons (it does not suffer from cache coherence issues). +# +# Note that the uncached heap is not available prior to imx-kernel 5.15.5; +# older kernels can only use the cached one. + +CACHED_DMA_HEAP_DEVICE_NODE_PATH = "/dev/dma_heap/linux,cma" +UNCACHED_DMA_HEAP_DEVICE_NODE_PATH = "/dev/dma_heap/linux,cma-uncached" + +CACHED_DMA_HEAP_CONF = "--dma-heap-device-node-path=${CACHED_DMA_HEAP_DEVICE_NODE_PATH}" +UNCACHED_DMA_HEAP_CONF = "--dma-heap-device-node-path=${UNCACHED_DMA_HEAP_DEVICE_NODE_PATH} \ + --dma-heap-uncached-memory" + +PACKAGECONFIG ?= " " +PACKAGECONFIG:append:imxgpu2d = " ${LIBG2D_PACKAGECONFIG}" +PACKAGECONFIG:append:imxipu = " ipu" +PACKAGECONFIG:append:imxpxp = " pxp" +# All i.MX8 machines can use the dma-heap allocator. i.MX8m ones +# can also use the DWL allocator, though dma-heap is preferred. +# Vendor kernels that are older than kernel 5.6 cannot use +# dma-heap, however, and should use ion instead, since the +# former is not available pre-5.6. Out of the dma-heaps, we +# pick the uncached one by default (see above). +PACKAGECONFIG:append:mx8-nxp-bsp = " dma-heap-uncached" +PACKAGECONFIG:append:mx8m-nxp-bsp = " dwl" + +HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2" + +PACKAGECONFIG[dwl] = "--with-dwl-allocator=yes ${HANTRO_CONF}, --with-dwl-allocator=no,imx-vpu-hantro" +PACKAGECONFIG[ion] = "--with-ion-allocator=yes, --with-ion-allocator=no," +PACKAGECONFIG[ipu] = "--with-ipu-allocator=yes, --with-ipu-allocator=no," +PACKAGECONFIG[g2d] = "--with-g2d-allocator=yes, --with-g2d-allocator=no,virtual/libg2d" +PACKAGECONFIG[pxp] = "--with-pxp-allocator=yes, --with-pxp-allocator=no," +# --with-dma-heap-allocator=no is not added by these packageconfigs. +# Otherwise, it would always be added, since only one of these two +# dma-heap-* packageconfigs can be selected. Instead, that switch +# is added to EXTRA_OECONF above. +PACKAGECONFIG[dma-heap-cached] = "--with-dma-heap-allocator=yes ${CACHED_DMA_HEAP_CONF}, \ + ,,,,dma-heap-uncached" +PACKAGECONFIG[dma-heap-uncached] = "--with-dma-heap-allocator=yes ${UNCACHED_DMA_HEAP_CONF}, \ + ,,,,dma-heap-cached" + +# Using do_install_ptest_base instead of do_install_ptest, since +# the default do_install_ptest_base is hardcoded to expect Makefiles. +do_install_ptest_base() { + install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest + install -m 0755 ${B}/test-alloc ${D}${PTEST_PATH} +} + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb index 97bbd7e7..fc0486e0 100644 --- a/recipes-bsp/mc-utils/mc-utils_git.bb +++ b/recipes-bsp/mc-utils/mc-utils_git.bb @@ -1,14 +1,14 @@ DESCRIPTION = "The Management Complex (MC) is a key component of DPAA" SECTION = "mc-utils" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987" DEPENDS += "dtc-native" inherit deploy -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/mc-utils;nobranch=1" -SRCREV = "12ffee82d210cb6b5c8fa30fbc6f5d29e4be2e6f" +SRC_URI = "git://github.com/nxp-qoriq/mc-utils;protocol=https;nobranch=1" +SRCREV = "bc141334051a2e1e3ea2f4eedee8e1165d52e4a5" S = "${WORKDIR}/git" diff --git a/recipes-bsp/mxsldr/mxsldr_git.bb b/recipes-bsp/mxsldr/mxsldr_git.bb index 62b4b7ad..17da814f 100644 --- a/recipes-bsp/mxsldr/mxsldr_git.bb +++ b/recipes-bsp/mxsldr/mxsldr_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Freescale i.MX233/i.MX28 USB loader" DEPENDS = "libusb1" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCREV = "c40d80472525e1d57dae5317c028b745968c0399" diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb index 04f71ba3..901fed5d 100644 --- a/recipes-bsp/rcw/rcw_git.bb +++ b/recipes-bsp/rcw/rcw_git.bb @@ -1,14 +1,14 @@ SUMMARY = "Reset Configuration Word" DESCRIPTION = "Reset Configuration Word - hardware boot-time parameters for the QorIQ targets" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=44a0d0fad189770cc022af4ac6262cbe" DEPENDS += "tcl-native" inherit deploy siteinfo -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/rcw;nobranch=1" -SRCREV = "1f431891c7f0e7d4f52327f1fe19504a284491c4" +SRC_URI = "git://github.com/nxp-qoriq/rcw;protocol=https;nobranch=1" +SRCREV = "a4db86818de35d0168a48d3f17878ec68fb1cf6d" S = "${WORKDIR}/git" @@ -20,6 +20,7 @@ BOARD_TARGETS="${M}" BOARD_TARGETS:ls2088ardb="${M} ${M}_rev1.1" BOARD_TARGETS:ls1088ardb-pb="ls1088ardb" BOARD_TARGETS:lx2160ardb = "${M} ${M}_rev2" +BOARD_TARGETS:lx2160ardb-rev2 = "lx2160ardb_rev2" do_compile () { oe_runmake BOARDS="${BOARD_TARGETS}" DESTDIR=${D}/boot/rcw/ diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2023.01.inc index 7d401692..c0b49b0c 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2023.01.inc @@ -1,19 +1,19 @@ -# Copyright (C) 2012-2019 O.S. Systems Software LTDA. +# Copyright (C) 2012-2022 O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) inherit fsl-u-boot-localversion -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "691e634bfd317ede487d2b864a126847ffeb4aa7" -SRCBRANCH = "2021.07+fslc" +SRCREV = "3b524eeb247425edbfe5bb10c3fd289b0f34855a" +SRCBRANCH = "2023.01+fslc" -PV = "v2021.07+git${SRCPV}" +PV = "2023.01+git${SRCPV}" S = "${WORKDIR}/git" B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb index 2e79166b..2e79166b 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb +++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2023.01.bb index a3a732ef..b7e4ca76 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2023.01.bb @@ -3,7 +3,17 @@ require u-boot-fslc-common_${PV}.inc DESCRIPTION = "U-boot bootloader mxsboot tool" SECTION = "bootloader" -DEPENDS = "bison-native dtc openssl" +inherit python3native + +DEPENDS += " \ + bison-native \ + dtc \ + gnutls \ + openssl \ + python3-setuptools-native \ + swig-native \ + util-linux-libuuid \ +" PROVIDES = "u-boot-mxsboot" @@ -12,7 +22,7 @@ EXTRA_OEMAKE:class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" H EXTRA_OEMAKE:class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' do_compile () { - oe_runmake -C ${S} O=${B} sandbox_defconfig + oe_runmake -C ${S} O=${B} tools-only_defconfig # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and # generating it requires bin2header tool, which for target build @@ -27,6 +37,6 @@ do_install () { ln -sf uboot-mxsboot ${D}${bindir}/mxsboot } -COMPATIBLE_MACHINE:class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" +COMPATIBLE_MACHINE:class-target = "(mxs-generic-bsp)" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2021.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb index 21989ae5..f6164a76 100644 --- a/recipes-bsp/u-boot/u-boot-fslc_2021.07.bb +++ b/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb @@ -8,13 +8,7 @@ version, or because it is not applicable for upstreaming." inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')} -DEPENDS += "bc-native dtc-native python3-setuptools-native lzop-native" - -# Location known to imx-boot component, where U-Boot artifacts -# should be additionally deployed. -# See below note above do_deploy:append:mx8m for the purpose of -# this delopyment location -BOOT_TOOLS = "imx-boot-tools" +DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native" PROVIDES += "u-boot" @@ -28,4 +22,4 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ HOSTSTRIP=true' PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" +COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc deleted file mode 100644 index 2abcac9b..00000000 --- a/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards." - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCBRANCH = "lf_v2021.04" -SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" -SRCREV = "3463140881c523e248d2fcb6bfc9ed25c0db93bd" - -DEPENDS += "flex-native bison-native bc-native dtc-native" - -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" - -inherit fsl-u-boot-localversion - -LOCALVERSION ?= "-imx_v2021.04_5.10.35_2.0.0" - -BOOT_TOOLS = "imx-boot-tools" - diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc new file mode 100644 index 00000000..939031d8 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards." + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" +SRCBRANCH = "lf_v2022.04" +LOCALVERSION ?= "-imx_v2022.04_5.15.71-2.2.0" +SRCREV = "181859317bfafef1da79c59a4498650168ad9df6" + +DEPENDS += " \ + bc-native \ + bison-native \ + dtc-native \ + flex-native \ + gnutls-native \ + xxd-native \ +" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" + +inherit fsl-u-boot-localversion + +BOOT_TOOLS = "imx-boot-tools" diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb index af502889..d9d5b9d5 100644 --- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb @@ -2,7 +2,12 @@ # Copyright (C) 2014-2016 Freescale Semiconductor # Copyright 2017-2019 NXP +# Re-use the u-boot-imx recipe and its files +require u-boot-imx_${PV}.bb FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-imx:" -require u-boot-imx_${PV}.bb require u-boot-mfgtool.inc + +UUU_BOOTLOADER_TAGGED = "" +UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" diff --git a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb index bb5809e2..c1ddf12f 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb @@ -7,7 +7,16 @@ require u-boot-imx-common_${PV}.inc PROVIDES += "u-boot" -do_deploy:append:mx8m() { +inherit uuu_bootloader_tag + +UUU_BOOTLOADER = "" +UUU_BOOTLOADER:mx6-generic-bsp = "${UBOOT_BINARY}" +UUU_BOOTLOADER:mx7-generic-bsp = "${UBOOT_BINARY}" +UUU_BOOTLOADER_TAGGED = "" +UUU_BOOTLOADER_TAGGED:mx6-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER_TAGGED:mx7-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" + +do_deploy:append:mx8m-generic-bsp() { # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary if [ -n "${UBOOT_CONFIG}" ] then @@ -29,4 +38,4 @@ do_deploy:append:mx8m() { } PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8|use-mainline-bsp)" +COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|mx8-generic-bsp|mx9-generic-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb index db93710d..6c174210 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb @@ -5,7 +5,7 @@ PROVIDES += "u-boot" inherit fsl-u-boot-localversion -LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1" +LICENSE = "GPL-2.0-only & BSD-3-Clause & BSD-2-Clause & LGPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \ @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ " -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1" SRCREV= "1c0116f3da250c5a52858c53efb8b38c0963f477" S = "${WORKDIR}/git" diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb index d7ef0b72..51a8be63 100644 --- a/recipes-bsp/uefi/uefi_git.bb +++ b/recipes-bsp/uefi/uefi_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315" inherit deploy SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https" -SRCREV= "1b28cad962a3f7b61baae2229cb3b84926941cfa" +SRCREV = "d887e52b7a50c7d20fd8200cd741ac61309e0af2" S = "${WORKDIR}/git" diff --git a/recipes-devtools/devregs/devregs_git.bb b/recipes-devtools/devregs/devregs_git.bb index 2bee7b8b..f24cb0f6 100644 --- a/recipes-devtools/devregs/devregs_git.bb +++ b/recipes-devtools/devregs/devregs_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "i.MX Register tool" SECTION = "devel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5003fa041d799dd5dd5f646b74e36924" SRCREV = "dcc3e3f26d3d867d5297a104dc32bd99f5e6fa71" diff --git a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb index 1a1e1a9c..deffd853 100644 --- a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb +++ b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "i.MX/Vybrid recovery utility" SECTION = "devel" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libusb1" diff --git a/recipes-devtools/qemu/qemu-qoriq_4.2.bb b/recipes-devtools/qemu/qemu-qoriq_4.2.bb index f788f724..5ac774ed 100644 --- a/recipes-devtools/qemu/qemu-qoriq_4.2.bb +++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb @@ -9,7 +9,7 @@ DEPENDS = "glib-2.0 zlib pixman bison-native" LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" -SRC_URI = "gitsm://source.codeaurora.org/external/qoriq/qoriq-components/qemu;nobranch=1 \ +SRC_URI = "gitsm://github.com/nxp-qoriq/qemu;protocol=https;nobranch=1 \ file://powerpc_rom.bin \ file://run-ptest \ file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \ diff --git a/recipes-devtools/qemu/qemu.inc b/recipes-devtools/qemu/qemu.inc index 532bcf6d..b8b5f318 100644 --- a/recipes-devtools/qemu/qemu.inc +++ b/recipes-devtools/qemu/qemu.inc @@ -4,7 +4,7 @@ machine's processor through dynamic binary translation and provides a set \ of different hardware and device models for the machine, enabling it to run \ a variety of guest operating systems" HOMEPAGE = "http://qemu.org" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" RDEPENDS:${PN}-ptest = "bash make" diff --git a/recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch b/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch index d25675aa..d25675aa 100644 --- a/recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch +++ b/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb index d4a9a859..8d345836 100644 --- a/recipes-devtools/cst/cst_git.bb +++ b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb @@ -1,10 +1,10 @@ SUMMARY = "utility for security boot" SECTION = "cst" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e959d5d617e33779d0e90ce1d9043eff" -DEPENDS += "openssl cst-native" +DEPENDS += "openssl qoriq-cst-native" RDEPENDS:${PN} = "bash" GENKEYS ?= "${STAGING_BINDIR_NATIVE}/cst/gen_keys" @@ -16,10 +16,10 @@ inherit kernel-arch #SECURE_PRI_KEY = "/path/srk.pri" #SECURE_PUB_KEY = "/path/srk.pub" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cst;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1 \ file://0001-tools-Mark-struct-input_field-file_field-extern.patch \ " -SRCREV = "dfe30d3f05cfe281896482839e57ed49c52f2088" +SRCREV = "af56e6c5c66dd2bc86a83b0bee8cb61b88d2120c" S = "${WORKDIR}/git" diff --git a/recipes-devtools/utp-com/utp-com_git.bb b/recipes-devtools/utp-com/utp-com_git.bb index 0b0a6cf2..85c80acb 100644 --- a/recipes-devtools/utp-com/utp-com_git.bb +++ b/recipes-devtools/utp-com/utp-com_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Tool used to send commands to hardware via NXP's UTP protocol" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" DEPENDS = "sg3-utils" diff --git a/recipes-devtools/uuu/files/0001-remove-unnecessary-libzip-dependency.patch b/recipes-devtools/uuu/files/0001-remove-unnecessary-libzip-dependency.patch deleted file mode 100644 index 52a6b880..00000000 --- a/recipes-devtools/uuu/files/0001-remove-unnecessary-libzip-dependency.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 96ed03b04cb9a94043e44c5f5caa8825a0e89f3a Mon Sep 17 00:00:00 2001 -From: Rasmus Villemoes <rasmus.villemoes@prevas.dk> -Date: Wed, 13 Oct 2021 10:18:50 +0200 -Subject: [PATCH] remove unnecessary libzip dependency - -It seems that the libzip dependency has been added by mistake. See -full analysis in https://github.com/NXPmicro/mfgtools/issues/294 . - -Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> -Upstream-Status: Backport [https://github.com/NXPmicro/mfgtools/pull/295] ---- - .travis.yml | 1 - - README.md | 4 ++-- - appveyor.yml | 4 ++-- - libuuu/CMakeLists.txt | 1 - - snap/snapcraft.yaml | 2 -- - uuu/CMakeLists.txt | 5 ++--- - 6 files changed, 6 insertions(+), 11 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index 9138aff..1d2d235 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -33,7 +33,6 @@ addons: - packages: - - cmake - - libusb -- - libzip - - openssl - - pkg-config - -diff --git a/README.md b/README.md -index 20c3f97..6910276 100644 ---- a/README.md -+++ b/README.md -@@ -68,7 +68,7 @@ Note that, since uuu is an OSI compliant Open Source project, you are entitled t - ## Linux - - `git clone https://github.com/NXPmicro/mfgtools.git` - - `cd mfgtools` --- `sudo apt-get install libusb-1.0-0-dev libzip-dev libbz2-dev pkg-config cmake libssl-dev g++` -+- `sudo apt-get install libusb-1.0-0-dev libbz2-dev pkg-config cmake libssl-dev g++` - - `cmake . && make` - - The above commands build mfgtools in source. To build it out of source -@@ -83,7 +83,7 @@ For cmake prior 3.13: - ## macOS - - `git clone https://github.com/NXPmicro/mfgtools.git` - - `cd mfgtools` --- `brew install cmake libusb libzip openssl pkg-config` -+- `brew install cmake libusb openssl pkg-config` - - `cmake -DOPENSSL_ROOT_DIR=$(brew --prefix)/opt/openssl . && make` - - Note that we assume [brew](https://brew.sh) is installed and can be used to resolve dependencies as shown above. The remaining dependency `libbz2` can be resolved via the XCode supplied libraries. -diff --git a/appveyor.yml b/appveyor.yml -index 9e1c74a..e679f84 100644 ---- a/appveyor.yml -+++ b/appveyor.yml -@@ -28,11 +28,11 @@ install: - - - cmd: cd .. - --- sh: if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = "macOS" ]; then brew install libusb libzip pkg-config; fi -+- sh: if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = "macOS" ]; then brew install libusb pkg-config; fi - - - sh: if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" != "macOS" ]; then sudo apt-get update; fi - --- sh: if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" != "macOS" ]; then sudo DEBIAN_FRONTEND=noninteractive apt-get --yes --force-yes install libusb-1.0-0-dev libzip-dev libbz2-dev asciidoc rename; fi -+- sh: if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" != "macOS" ]; then sudo DEBIAN_FRONTEND=noninteractive apt-get --yes --force-yes install libusb-1.0-0-dev libbz2-dev asciidoc rename; fi - - build_script: - -diff --git a/libuuu/CMakeLists.txt b/libuuu/CMakeLists.txt -index f4390a7..2ace072 100644 ---- a/libuuu/CMakeLists.txt -+++ b/libuuu/CMakeLists.txt -@@ -7,7 +7,6 @@ set(CMAKE_SKIP_RPATH ON) - find_package(BZip2 REQUIRED) - find_package(PkgConfig REQUIRED) - pkg_check_modules(LIBUSB REQUIRED libusb-1.0>=1.0.16) --pkg_check_modules(LIBZIP REQUIRED libzip) - find_package(Threads) - - if (STATIC) -diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml -index 09b9065..8a98cca 100644 ---- a/snap/snapcraft.yaml -+++ b/snap/snapcraft.yaml -@@ -103,14 +103,12 @@ parts: - - libbz2-dev - - libusb-1.0-0-dev - - libssl-dev -- - libzip-dev - - pkg-config - plugin: cmake - stage-packages: - - libbz2-1.0 - - libusb-1.0-0 - - libssl1.0.0 -- - libzip4 - filesets: - docs-copyright: - - usr/share/doc/*/copyright -diff --git a/uuu/CMakeLists.txt b/uuu/CMakeLists.txt -index b57a67e..ab78529 100644 ---- a/uuu/CMakeLists.txt -+++ b/uuu/CMakeLists.txt -@@ -6,7 +6,6 @@ set(CMAKE_SKIP_RPATH ON) - - find_package(PkgConfig REQUIRED) - pkg_check_modules(LIBUSB REQUIRED libusb-1.0>=1.0.16) --pkg_check_modules(LIBZIP REQUIRED libzip) - pkg_check_modules(LIBZ REQUIRED zlib) - find_package(Threads) - -@@ -34,7 +33,7 @@ set(LSTS - nand_burn_loader.lst - ) - --link_directories(${CMAKE_CURRENT_SOURCE_DIR}/libuuu ${LIBUSB_LIBRARY_DIRS} ${LIBZIP_LIBRARY_DIRS} ${LIBZ_LIBRARY_DIRS}) -+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/libuuu ${LIBUSB_LIBRARY_DIRS} ${LIBZ_LIBRARY_DIRS}) - - set(CLIST_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/gen_txt_include.sh) - set(generated_files_dir "${CMAKE_BINARY_DIR}/uuu/gen") -@@ -70,7 +69,7 @@ set(SOURCES - ) - - add_executable(uuu ${SOURCES}) --target_link_libraries(uuu uuc_s ${OPENSSL_LIBRARIES} ${LIBUSB_LIBRARIES} ${LIBZIP_LIBRARIES} ${LIBZ_LIBRARIES} dl bz2) -+target_link_libraries(uuu uuc_s ${OPENSSL_LIBRARIES} ${LIBUSB_LIBRARIES} ${LIBZ_LIBRARIES} dl bz2) - - install(TARGETS uuu DESTINATION bin) - target_compile_definitions(uuu --- -2.31.1 - diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb index dedcbe84..08fa51c2 100644 --- a/recipes-devtools/uuu/uuu_git.bb +++ b/recipes-devtools/uuu/uuu_git.bb @@ -3,10 +3,8 @@ DESCRIPTION = "Image deploy tool for i.MX chips" HOMEPAGE = "https://github.com/NXPmicro/mfgtools" SRC_URI = "git://github.com/NXPmicro/mfgtools.git;protocol=https;branch=master" -SRCREV = "e10b0260076e0119c259f7f44447904f14109ba2" -PV = "1.4.165" - -SRC_URI += "file://0001-remove-unnecessary-libzip-dependency.patch" +SRCREV = "ed48c514ee4c1ea4562c875877b180a87474f895" +PV = "1.4.243" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5" @@ -17,6 +15,6 @@ S = "${WORKDIR}/git" DEPENDS = "libusb zlib bzip2 openssl" -COMPATIBLE_MACHINE = "(imx)" +COMPATIBLE_MACHINE = "(imx-generic-bsp)" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.2.182.0.bb b/recipes-downgrade/vulkan/vulkan-headers_1.2.182.0.bb new file mode 100644 index 00000000..7c7d3e39 --- /dev/null +++ b/recipes-downgrade/vulkan/vulkan-headers_1.2.182.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Vulkan Header files and API registry" +DESCRIPTION = "Vulkan is a 3D graphics and compute API providing cross-platform access \ +to modern GPUs with low overhead and targeting realtime graphics applications such as \ +games and interactive media. This package contains the development headers \ +for packages wanting to make use of Vulkan." +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master;protocol=https" + +SRCREV = "37164a5726f7e6113810f9557903a117498421cf" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN} += "${datadir}/vulkan" + +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.2.182.0.bb b/recipes-downgrade/vulkan/vulkan-loader_1.2.182.0.bb new file mode 100644 index 00000000..e7b38222 --- /dev/null +++ b/recipes-downgrade/vulkan/vulkan-loader_1.2.182.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "3D graphics and compute API common loader" +DESCRIPTION = "Vulkan is a new generation graphics and compute API \ +that provides efficient access to modern GPUs. These packages \ +provide only the common vendor-agnostic library loader, headers and \ +the vulkaninfo utility." +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;protocol=https;branch=master \ + " +SRCREV = "1896143df69d439b0933c1bb485f5a4587bdf2dc" + +S = "${WORKDIR}/git" + +REQUIRED_DISTRO_FEATURES = "vulkan" + +inherit cmake features_check pkgconfig +ANY_OF_DISTRO_FEATURES = "x11 wayland" + +DEPENDS += "vulkan-headers" + +EXTRA_OECMAKE = "\ + -DBUILD_TESTS=OFF \ + -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ + -DASSEMBLER_WORKS=FALSE \ + -DVulkanHeaders_INCLUDE_DIR=${STAGING_INCDIR} \ + -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \ + " + +# must choose x11 or wayland or both +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" + +PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" +PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" + +RRECOMMENDS:${PN} = "mesa-vulkan-drivers" + +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.2.182.0.bb b/recipes-downgrade/vulkan/vulkan-tools_1.2.182.0.bb new file mode 100644 index 00000000..242b8973 --- /dev/null +++ b/recipes-downgrade/vulkan/vulkan-tools_1.2.182.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "Vulkan Utilities and Tools" +DESCRIPTION = "Assist development by enabling developers to verify their applications correct use of the Vulkan API." +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Tools" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;protocol=https;branch=sdk-1.2.182" +SRCREV = "9d3305731c3be8de05c9f223a79959d448506a37" + +S = "${WORKDIR}/git" + +inherit cmake features_check +ANY_OF_DISTRO_FEATURES = "x11 wayland" +REQUIRED_DISTRO_FEATURES = "vulkan" + +DEPENDS += "vulkan-headers vulkan-loader" + +EXTRA_OECMAKE = "\ + -DBUILD_TESTS=OFF \ + -DBUILD_CUBE=OFF \ + -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ + " + +# must choose x11 or wayland or both +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" + +PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" +PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" + +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" diff --git a/recipes-dpaa/eth-config/eth-config_git.bb b/recipes-dpaa/eth-config/eth-config_git.bb index cfeae114..06e4382f 100644 --- a/recipes-dpaa/eth-config/eth-config_git.bb +++ b/recipes-dpaa/eth-config/eth-config_git.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Ethernet Configuration Files" SECTION = "eth-config" -LICENSE = "BSD & GPLv2+" +LICENSE = "BSD-3-Clause & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=47716bd5b656aa5e298a132a64d2d1e4" PR = "r2" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/eth-config;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/eth-config;protocol=https;nobranch=1" SRCREV = "6164664070e45810c793f112781ebcedc979e132" S = "${WORKDIR}/git" diff --git a/recipes-dpaa/flib/flib_git.bb b/recipes-dpaa/flib/flib_git.bb index 645efdb3..f1ebd87f 100644 --- a/recipes-dpaa/flib/flib_git.bb +++ b/recipes-dpaa/flib/flib_git.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Foundation Library" SECTION = "flib" -LICENSE = "BSD & GPLv2" +LICENSE = "BSD-3-Clause & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9f6d1afdf6b0f6b3ba65c25ba589ee53" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/flib;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1" SRCREV = "cbb31427466649c07d2ac2739a41bb42f5f6be7c" S = "${WORKDIR}/git" diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb index f79122c6..c7eb7319 100644 --- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb +++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb @@ -1,14 +1,14 @@ DESCRIPTION = "Fman microcode binary" SECTION = "fm-ucode" -LICENSE = "Freescale-Binary-EULA" -LIC_FILES_CHKSUM = "file://Freescale-Binary-EULA;md5=b784c031868ba1bd5ebc5de372c823fa" +LICENSE = "NXP-Binary-EULA" +LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=12e248d404ce1ea8bed0148fcf127e69" PR = "r1" inherit deploy SRC_URI = "git://github.com/NXP/qoriq-fm-ucode.git;nobranch=1;protocol=https" -SRCREV = "c275e91392e2adab1ed22f3867b8269ca3c54014" +SRCREV = "83e8467a356316265c7695bdc7741f23066795aa" S = "${WORKDIR}/git" diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb index f4b6cc20..98f5c0d7 100644 --- a/recipes-dpaa/fmlib/fmlib_git.bb +++ b/recipes-dpaa/fmlib/fmlib_git.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Frame Manager User Space Library" SECTION = "fman" -LICENSE = "BSD & GPLv2" +LICENSE = "BSD-3-Clause & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9c7bd5e45d066db084bdb3543d55b1ac" PR = "r1" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/fmlib;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/fmlib;protocol=https;nobranch=1" SRCREV = "69a70474cd8411d5a099c34f40760b6567d781d6" S = "${WORKDIR}/git" diff --git a/recipes-dpaa2/aiopsl/aiopsl_git.bb b/recipes-dpaa2/aiopsl/aiopsl_git.bb index 4f21a696..68f7a8de 100644 --- a/recipes-dpaa2/aiopsl/aiopsl_git.bb +++ b/recipes-dpaa2/aiopsl/aiopsl_git.bb @@ -7,7 +7,7 @@ BASEDEPENDS = "" S = "${WORKDIR}/git" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/aiopsl;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/aiopsl;protocol=https;nobranch=1" SRCREV = "87d83d8e99770325cc7ad9e10965c9959e7cb828" do_configure[noexec] = "1" diff --git a/recipes-dpaa2/dce/dce_git.bb b/recipes-dpaa2/dce/dce_git.bb index 368e5aa6..d4f61c43 100644 --- a/recipes-dpaa2/dce/dce_git.bb +++ b/recipes-dpaa2/dce/dce_git.bb @@ -3,8 +3,8 @@ SECTION = "dpaa2" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=956df5ea6cfe0a1dcf2dee7ca37c0cdf" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dce;nobranch=1 \ - git://source.codeaurora.org/external/qoriq/qoriq-components/qbman_userspace;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \ +SRC_URI = "git://github.com/nxp-qoriq/dce;protocol=https;nobranch=1 \ + git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \ file://0001-support-user-merge.patch \ " SRCREV = "9db9c08379aa89f45f514f4f3f0a8e8212198758" diff --git a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb index a96913e8..303aa8ff 100644 --- a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb +++ b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb @@ -6,7 +6,7 @@ SECTION = "dpaa2" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/gpp-aioptool;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/gpp-aioptool;protocol=https;nobranch=1 \ file://0001-remove-libio.h.patch \ file://0001-add-fcommon-to-fix-gcc-10-build-issue.patch \ " diff --git a/recipes-dpaa2/management-complex/management-complex_10.35.0.bb b/recipes-dpaa2/management-complex/management-complex_10.35.0.bb new file mode 100644 index 00000000..d114a92e --- /dev/null +++ b/recipes-dpaa2/management-complex/management-complex_10.35.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "DPAA2 Management Complex Firmware" +LICENSE = "NXP-Binary-EULA" +LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=1db1363924ceccb1edea921b6495bdc2" + +inherit deploy + +INHIBIT_DEFAULT_DEPS = "1" + +SRC_URI = "git://github.com/nxp/qoriq-mc-binary;protocol=https;nobranch=1" +SRCREV = "836d7bf606b51c18b5e3726d68dcf3b3ac4de74a" + +S = "${WORKDIR}/git" + +REGLEX:ls2088a = "ls2088a" +REGLEX:ls2080a = "ls2080a" +REGLEX:ls1088a = "ls1088a" +REGLEX:lx2160a = "lx216xa" +REGLEX:lx2162a = "lx216xa" + +do_install () { + install -d ${D}/boot + install -m 755 ${S}/${REGLEX}/*.itb ${D}/boot +} + +do_deploy () { + install -d ${DEPLOYDIR}/mc_app + install -m 755 ${S}/${REGLEX}/*.itb ${DEPLOYDIR}/mc_app + # make a symlink to the latest binary + for mc_binary in `find ${DEPLOYDIR}/mc_app -type f -printf "%f\n" |sort`;do + ln -sfT ${mc_binary} ${DEPLOYDIR}/mc_app/mc.itb + done +} +addtask deploy before do_build after do_install + +PACKAGES += "${PN}-image" +FILES:${PN}-image += "/boot" + +INHIBIT_PACKAGE_STRIP = "1" + +COMPATIBLE_MACHINE = "(qoriq-arm64)" +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb index 3ff5afd8..3af4b8aa 100644 --- a/recipes-dpaa2/restool/restool_git.bb +++ b/recipes-dpaa2/restool/restool_git.bb @@ -1,11 +1,11 @@ SUMMARY = "DPAA2 Resource Manager Tool" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause | GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=ec8d84e9cd4de287e290275d09db27f0" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/restool;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \ file://disable-manpage-generation.patch \ " -SRCREV = "d29522aef9f92ff2557978d5d3979b771a9576fe" +SRCREV = "65c9a10d95b19e61d2f86dbcaa45d12ba98e85e1" S = "${WORKDIR}/git" diff --git a/recipes-dpaa2/spc/spc_git.bb b/recipes-dpaa2/spc/spc_git.bb index 2ef1d01d..1ac61c69 100644 --- a/recipes-dpaa2/spc/spc_git.bb +++ b/recipes-dpaa2/spc/spc_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=163b09a1c249a6ff2b28da1ceca2e0a8" DEPENDS = "libxml2 fmlib tclap" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/spc;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/spc;protocol=https;nobranch=1" SRCREV = "398138687a3d3d6ef174501221711de74ff7bc40" S = "${WORKDIR}/git" diff --git a/recipes-extended/crconf/crconf_git.bb b/recipes-extended/crconf/crconf_git.bb index 1727888a..755365d6 100644 --- a/recipes-extended/crconf/crconf_git.bb +++ b/recipes-extended/crconf/crconf_git.bb @@ -1,9 +1,9 @@ SUMMARY = "crconf -Linux crypto layer configuraton tool" SECTION = "base" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=5;md5=0f77fc44eb5911007ae4ac9f6736e111" -EXTRA_OEMAKE = "'CC=${CC}' 'HOSTCC=${CC}'" +EXTRA_OEMAKE = "'CC=${CC}' 'HOSTCC=${CC}' SBINDIR='${sbindir}' MANDIR='${mandir}'" SRC_URI = "git://git.code.sf.net/p/crconf/code;protocol=https;nobranch=1" SRCREV = "c2b9595d739a9515a86ff3b1980b5cfdfcc42d68" @@ -13,5 +13,3 @@ S = "${WORKDIR}/git" do_install () { oe_runmake install DESTDIR=${D} } - -FILES:${PN} += "/share/man/* ${libdir}/* ${sbindir}/*" diff --git a/recipes-extended/dpdk/dpdk-20.11.inc b/recipes-extended/dpdk/dpdk-20.11.inc index 00aed60d..90b4c405 100644 --- a/recipes-extended/dpdk/dpdk-20.11.inc +++ b/recipes-extended/dpdk/dpdk-20.11.inc @@ -1,11 +1,11 @@ DESCRIPTION = "Data Plane Development Kit" HOMEPAGE = "http://dpdk.org" -LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2" +LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1" SRCREV = "f74b8bd5ab1c6ff76e956fc202a56aea2d200270" S = "${WORKDIR}/git" diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index f4c932ea..f2ab1370 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc @@ -14,7 +14,7 @@ COMPATIBLE_HOST:armv4 = 'null' COMPATIBLE_HOST:armv5 = 'null' COMPATIBLE_HOST:armv6 = 'null' -COMPATIBLE_MACHINE = "(imx|qoriq)" +COMPATIBLE_MACHINE = "(imx-nxp-bsp|qoriq)" DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc" DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc" @@ -24,7 +24,7 @@ DPDK_RTE_TARGET ?= "${ARCH}-dpaa-linuxapp-gcc" export RTE_TARGET = "${DPDK_RTE_TARGET}" export RTE_OUTPUT = "${S}/${RTE_TARGET}" -export MODULE_DIR = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/net" +export MODULE_DIR = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net" S = "${WORKDIR}/git" @@ -117,3 +117,6 @@ FILES:${PN} += " ${datadir}/ \ FILES:${PN}-examples += " \ ${datadir}/examples/* \ " + +TOOLCHAIN = "gcc" + diff --git a/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch b/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch new file mode 100644 index 00000000..b73b3a96 --- /dev/null +++ b/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch @@ -0,0 +1,49 @@ +From 229fc129be85a4d2d2c4efddae7bb97c3d87d416 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 13 Mar 2023 22:02:01 -0700 +Subject: [PATCH] examples: fix Arm build with GCC 12 + +GCC-12 warns when a pointer of type union points to an array of same +defined size, as union internally gets paded with pad bytes. + + ../examples/common/neon/port_group.h:42:21: error: array subscript + 'union <anonymous>[0]' is partly outside array bounds of + 'uint16_t[5]' {aka 'short unsigned int[5]'} + [-Werror=array-bounds] + 42 | pnum->u64 = gptbl[v].pnum; + | ^~ + ../examples/common/neon/port_group.h:21:23: note: object 'pn' of + size [0, 10] + 21 | port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1 + | ~~~~~~~~~^~~~~~~~~~~~~~~ + ../examples/common/neon/port_group.h:43:21: error: array subscript + 'union <anonymous>[0]' is partly outside array bounds of + 'uint16_t[5]' {aka 'short unsigned int[5]'} [-Werror=array-bounds] + 43 | pnum->u16[FWDSTEP] = 1; + | ^~ + +Fixes: 732115ce38c6 ("examples/l3fwd: move packet group function in common") + +Upstream-Status: Backport [https://github.com/DPDK/dpdk/commit/b269bd630e96b276a69d698e13ad9ebfbbb67512] +Signed-off-by: Amit Prakash Shukla <amitprakashs@marvell.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/l3fwd/l3fwd_neon.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/l3fwd/l3fwd_neon.h b/examples/l3fwd/l3fwd_neon.h +index 86ac5971d7..dc73e9fef7 100644 +--- a/examples/l3fwd/l3fwd_neon.h ++++ b/examples/l3fwd/l3fwd_neon.h +@@ -77,7 +77,7 @@ port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1, + union { + uint16_t u16[FWDSTEP + 1]; + uint64_t u64; +- } *pnum = (void *)pn; ++ } __rte_packed *pnum = (void *)pn; + + int32_t v; + uint16x8_t mask = {1, 2, 4, 8, 0, 0, 0, 0}; +-- +2.39.2 + diff --git a/recipes-extended/dpdk/dpdk_19.11-20.12.bb b/recipes-extended/dpdk/dpdk_19.11-20.12.bb index 37582124..b14d4fbf 100644 --- a/recipes-extended/dpdk/dpdk_19.11-20.12.bb +++ b/recipes-extended/dpdk/dpdk_19.11-20.12.bb @@ -1,13 +1,14 @@ -LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2" +LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1 \ file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ file://0001-add-Wno-cast-function-type.patch \ file://0001-Add-RTE_KERNELDIR_OUT.patch \ file://0005-use-python3-instead-of-python.patch \ + file://0001-examples-fix-Arm-build-with-GCC-12.patch \ " SRCREV = "7071c27f6f5aefb57de1cffab3484707b1e82e2b" diff --git a/recipes-extended/ipc-ust/ipc-ust_git.bb b/recipes-extended/ipc-ust/ipc-ust_git.bb index f307816e..c9225a8b 100644 --- a/recipes-extended/ipc-ust/ipc-ust_git.bb +++ b/recipes-extended/ipc-ust/ipc-ust_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "DSP boot application and ipc test application" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/ipc;branch=nxp/sdk-v2.0.x \ +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ipc;branch=nxp/sdk-v2.0.x \ file://Makefile-use-LDFLAGS-if-set.patch \ " SRCREV = "74d662707558290f070f9589177db730444bc435" diff --git a/recipes-extended/jailhouse/jailhouse_0.12.bb b/recipes-extended/jailhouse/jailhouse_0.12.bb index 43b4cdf5..b031b13c 100644 --- a/recipes-extended/jailhouse/jailhouse_0.12.bb +++ b/recipes-extended/jailhouse/jailhouse_0.12.bb @@ -1,7 +1,7 @@ SUMMARY = "Jailhouse, i.MX fork" HOMEPAGE = "https://github.com/siemens/jailhouse" SECTION = "jailhouse" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ file://tools/root-cell-config.c.tmpl;beginline=6;endline=33;md5=2825581c1666c44a17955dc574cfbfb3 \ @@ -13,12 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ " -SRCBRANCH = "imx_5.4.47_2.2.0" -SRCREV = "8bbe203ee7c1fc16198ce1bf964e54c90606c3c2" +SRCBRANCH = "lf-5.15.52_2.1.0" +SRCREV = "da1b37baf48295bf1a4f25661220506f5bb948f2" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-jailhouse.git;protocol=ssh;branch=${SRCBRANCH} \ - file://0001-tools-scripts-update-shebang-to-python3.patch \ -" +SRC_URI = "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https;branch=${SRCBRANCH}" DEPENDS = " \ make-native \ @@ -38,11 +36,6 @@ CELL_DIR ?= "${JH_DATADIR}/cells" CELLCONF_DIR ?= "${JH_DATADIR}/configs" INMATES_DIR ?= "${JH_DATADIR}/inmates" -JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" -JH_CONFIG:x86 ?= "${S}/ci/jailhouse-config-x86.h" -JH_CONFIG:x86-64 ?= "${S}/ci/jailhouse-config-x86.h" -JH_CONFIG:arm ?= "${S}/ci/jailhouse-config-banana-pi.h" - do_configure() { if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; then @@ -50,29 +43,14 @@ do_configure() { fi } -USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ - -DJAILHOUSE_VERSION=\\\"$JAILHOUSE_VERSION\\\" \ - -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \ - -I../driver' - -TOOLS_SRC_DIR = "${S}/tools" -TOOLS_OBJ_DIR = "${S}/tools" - -do_compile() { +do_compile:prepend() { unset LDFLAGS oe_runmake V=1 CC="${CC}" \ ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \ KDIR=${STAGING_KERNEL_BUILDDIR} - - cd ${TOOLS_SRC_DIR} - export JAILHOUSE_VERSION=$(cat ../VERSION) - oe_runmake V=1 \ - CFLAGS="${USER_SPACE_CFLAGS}" \ - src=${TOOLS_SRC_DIR} obj=${TOOLS_OBJ_DIR} \ - ${TOOLS_OBJ_DIR}/jailhouse-config-collect ${TOOLS_OBJ_DIR}/jailhouse } -do_install() { +do_install:prepend() { oe_runmake \ PYTHON=python3 \ V=1 \ @@ -81,6 +59,8 @@ do_install() { ARCH=${JH_ARCH} \ CROSS_COMPILE=${TARGET_PREFIX} \ KDIR=${STAGING_KERNEL_BUILDDIR} \ + INSTALL_MOD_PATH=${D}${root_prefix} \ + firmwaredir=${nonarch_base_libdir}/firmware \ DESTDIR=${D} install install -d ${D}${CELL_DIR} @@ -99,10 +79,12 @@ do_install() { install ${B}/inmates/tools/${JH_ARCH}/linux-loader.bin ${D}${INMATES_DIR}/tools/${JH_ARCH} } -PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse" +PACKAGE_BEFORE_PN = "pyjailhouse" FILES:${PN} += "${nonarch_base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}" -FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}/pyjailhouse" +# Remove libdir/* appended by setuptools3-base.bbclass for module split to work correctly +FILES:${PN}:remove = "${libdir}/*" +FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}" RDEPENDS:${PN} += " \ python3-curses \ @@ -119,4 +101,4 @@ RDEPENDS:pyjailhouse = " \ INSANE_SKIP:${PN} = "ldflags" -COMPATIBLE_MACHINE = "(mx8m)" +COMPATIBLE_MACHINE = "(mx8m-nxp-bsp)" diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb index 42b48779..731b7a23 100644 --- a/recipes-extended/libpkcs11/libpkcs11_git.bb +++ b/recipes-extended/libpkcs11/libpkcs11_git.bb @@ -1,8 +1,8 @@ DESCRIPTION = "PKCS library" -LICENSE = "GPLv2 & BSD" +LICENSE = "GPL-2.0-only & BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/libpkcs11;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/libpkcs11;protocol=https;nobranch=1 \ file://0001-fix-multiple-definition-error.patch \ " SRCREV = "8d85182b7a7cd393ab6dd72930f8d1b69468f741" diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc index d1e10b0f..88b67e6d 100644 --- a/recipes-extended/odp/odp.inc +++ b/recipes-extended/odp/odp.inc @@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ca6103dc75397fb6bec596187d6b7829" FILESEXTRAPATHS:prepend := "${THISDIR}/odp:" SRC_URI = " \ -git://source.codeaurora.org/external/qoriq/qoriq-components/odp;nobranch=1 \ -git://source.codeaurora.org/external/qoriq/qoriq-components/qbman_userspace;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \ -git://source.codeaurora.org/external/qoriq/qoriq-components/flib;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \ +git://github.com/nxp-qoriq/odp;protocol=https;nobranch=1 \ +git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \ +git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \ " SRC_URI += "file://0001-Fix-this-build-error.patch" diff --git a/recipes-extended/ofp/ofp_git.bb b/recipes-extended/ofp/ofp_git.bb index ec7328c8..47e54315 100644 --- a/recipes-extended/ofp/ofp_git.bb +++ b/recipes-extended/ofp/ofp_git.bb @@ -6,7 +6,7 @@ SECTION = "console/network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=fbe4957c430eed6cc20521d4eb429fae" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ofp;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/ofp;protocol=https;nobranch=1" SRCREV = "fe66f4659f7d356f7aa73a8fb32fcf67c6cf1108" diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb index fb41b457..20d06dd6 100644 --- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb +++ b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb @@ -7,7 +7,7 @@ RDEPENDS:${PN} = "bash libcrypto libssl python3" inherit python3native pkgconfig -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/ovs-dpdk;protocol=https;nobranch=1" SRCREV = "f2c0744d2f68c4cd2840d6e409d7b0520e4caf99" S = "${WORKDIR}/git" diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc index 2d26a7e9..64e4a6b7 100644 --- a/recipes-extended/secure-obj/secure-obj.inc +++ b/recipes-extended/secure-obj/secure-obj.inc @@ -10,7 +10,7 @@ inherit python3native LDFLAGS += "${TOOLCHAIN_OPTIONS}" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/secure_obj;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/secure_obj;protocol=https;nobranch=1" SRCREV = "5ff1231f74b4b01744be95a3137a14ad0a483e61" WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}" diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb index b75c0feb..c08c9492 100644 --- a/recipes-extended/skmm-ep/skmm-ep_git.bb +++ b/recipes-extended/skmm-ep/skmm-ep_git.bb @@ -1,13 +1,13 @@ DESCRIPTION = "SKMM application for PCIe endpoint" SECTION = "skmm-ep" -LICENSE = "BSD & GPLv2" +LICENSE = "BSD & GPL-2.0-only" LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=39e58bedc879163c9338596e52df5b1f" DEPENDS = "libedit openssl virtual/kernel" PACKAGE_ARCH = "${MACHINE_ARCH}" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=1 \ file://add-two-missing-header-files.patch \ " SRCREV = "de6816c7d66129683bc62229b482ac3cf585d896" diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb index f1ddbec8..6d1eb69c 100644 --- a/recipes-extended/tsntool/tsntool_git.bb +++ b/recipes-extended/tsntool/tsntool_git.bb @@ -1,14 +1,14 @@ SUMMARY = "Configure TSN funtionalitie" DESCRIPTION = "A tool to configure TSN funtionalities in user space" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=ef58f855337069acd375717db0dbbb6d" DEPENDS = "cjson libnl readline" inherit pkgconfig -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/tsntool;protocol=https;nobranch=1" -SRCREV = "b767c260b851aac94828ed26c6a9a327e4e98334" +SRC_URI = "git://github.com/nxp-qoriq/tsntool;protocol=https;nobranch=1" +SRCREV = "a0769e23304957a22f0cbeee6d1f547b20c3c21e" S = "${WORKDIR}/git" diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb index d832a926..415587a8 100644 --- a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb +++ b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup ISP_PKGS ?= "" -ISP_PKGS:mx8mp = " \ +ISP_PKGS:mx8mp-nxp-bsp = " \ isp-imx \ basler-camera \ basler-camera-dev \ diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb b/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb index 59f58976..d0367fdb 100644 --- a/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb +++ b/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb @@ -46,4 +46,4 @@ RDEPENDS:${PN}-extfs = " \ e2fsprogs-mke2fs \ e2fsprogs-e2fsck \ " -COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" +COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend index 2c73c7f3..c61e9a58 100644 --- a/recipes-graphics/cairo/cairo_%.bbappend +++ b/recipes-graphics/cairo/cairo_%.bbappend @@ -1,2 +1,8 @@ PACKAGECONFIG:append:imxgpu3d = " egl glesv2" PACKAGECONFIG:remove:imxgpu3d = "opengl" + +# links with imx-gpu libs which are pre-built for glibc +# gcompat will address it during runtime +LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" + +RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat" diff --git a/recipes-graphics/drm/libdrm/0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch b/recipes-graphics/drm/libdrm/0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch deleted file mode 100644 index ae6b0ab7..00000000 --- a/recipes-graphics/drm/libdrm/0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 45f48f8a5de59c04b0510c23853772bc970f411e Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Thu, 9 Jan 2020 01:01:35 +0000 -Subject: [PATCH] meson: add libdrm-vivante to the meson meta data - -Upstream libdrm added the option to use meason as the buildsystem. -Integrate Vivante into the relevant meson build information. - -Upstream-Status: Pending - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - meson.build | 14 +++++++++++++ - meson_options.txt | 7 +++++++ - vivante/meson.build | 50 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 71 insertions(+) - create mode 100644 vivante/meson.build - -diff --git a/meson.build b/meson.build -index e292554a..f4740634 100644 ---- a/meson.build -+++ b/meson.build -@@ -157,6 +157,15 @@ if _vc4 != 'false' - with_vc4 = _vc4 == 'true' or ['arm', 'aarch64'].contains(host_machine.cpu_family()) - endif - -+with_vivante = false -+_vivante = get_option('vivante') -+if _vivante == 'true' -+ if not with_atomics -+ error('libdrm_vivante requires atomics.') -+ endif -+ with_vivante = true -+endif -+ - # XXX: Apparently only freebsd and dragonfly bsd actually need this (and - # gnu/kfreebsd), not openbsd and netbsd - with_libkms = false -@@ -312,6 +321,7 @@ install_headers( - 'include/drm/savage_drm.h', 'include/drm/sis_drm.h', - 'include/drm/tegra_drm.h', 'include/drm/vc4_drm.h', - 'include/drm/via_drm.h', 'include/drm/virtgpu_drm.h', -+ 'include/drm/vivante_drm.h', - subdir : 'libdrm', - ) - if with_vmwgfx -@@ -362,6 +372,9 @@ endif - if with_etnaviv - subdir('etnaviv') - endif -+if with_vivante -+ subdir('vivante') -+endif - if with_man_pages - subdir('man') - endif -@@ -382,5 +395,6 @@ message(' EXYNOS API @0@'.format(with_exynos)) - message(' Freedreno API @0@ (kgsl: @1@)'.format(with_freedreno, with_freedreno_kgsl)) - message(' Tegra API @0@'.format(with_tegra)) - message(' VC4 API @0@'.format(with_vc4)) -+message(' Vivante API @0@'.format(with_etnaviv)) - message(' Etnaviv API @0@'.format(with_etnaviv)) - message('') -diff --git a/meson_options.txt b/meson_options.txt -index 8af33f1c..dc69563d 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -95,6 +95,13 @@ option( - choices : ['true', 'false', 'auto'], - description : '''Enable support for vc4's KMS API.''', - ) -+option( -+ 'vivante', -+ type : 'combo', -+ value : 'false', -+ choices : ['true', 'false', 'auto'], -+ description : '''Enable support for vivante's propriatary experimental KMS API.''', -+) - option( - 'etnaviv', - type : 'combo', -diff --git a/vivante/meson.build b/vivante/meson.build -new file mode 100644 -index 00000000..f6adb598 ---- /dev/null -+++ b/vivante/meson.build -@@ -0,0 +1,50 @@ -+# Copyright © 2017-2018 Intel Corporation -+ -+# Permission is hereby granted, free of charge, to any person obtaining a copy -+# of this software and associated documentation files (the "Software"), to deal -+# in the Software without restriction, including without limitation the rights -+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+# copies of the Software, and to permit persons to whom the Software is -+# furnished to do so, subject to the following conditions: -+ -+# The above copyright notice and this permission notice shall be included in -+# all copies or substantial portions of the Software. -+ -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+# SOFTWARE. -+ -+ -+libdrm_vivante = shared_library( -+ 'drm_vivante', -+ [ -+ files( -+ 'vivante_bo.c', -+ ), -+ config_file -+ ], -+ include_directories : [inc_root, inc_drm], -+ link_with : libdrm, -+ c_args : libdrm_c_args, -+ dependencies : [dep_pthread_stubs, dep_rt, dep_atomic_ops], -+ version : '1.0.0', -+ install : true, -+) -+ -+pkg.generate( -+ name : 'libdrm_vivante', -+ libraries : libdrm_vivante, -+ subdirs : ['.', 'libdrm'], -+ version : meson.project_version(), -+ requires_private : 'libdrm', -+ description : 'Userspace interface to Vivante kernel DRM services', -+) -+ -+ext_libdrm_vivante = declare_dependency( -+ link_with : [libdrm, libdrm_vivante], -+ include_directories : [inc_drm, include_directories('.')], -+) --- -2.20.1 - diff --git a/recipes-graphics/drm/libdrm_2.4.102.imx.bb b/recipes-graphics/drm/libdrm_2.4.109.imx.bb index bffef407..5edc0611 100644 --- a/recipes-graphics/drm/libdrm_2.4.102.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.109.imx.bb @@ -10,15 +10,14 @@ LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5 PROVIDES = "drm" DEPENDS = "libpthread-stubs" -IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1" -IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.102" -SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \ - file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch " -SRCREV = "40ea53973b99b7df07f472318918a8c2b310e4a7" +SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}" +IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https;nobranch=1" +SRCBRANCH ?= "libdrm-imx-2.4.109" +SRCREV = "063bd699054866852ae182d2b31d4d3e7eae4f03" S = "${WORKDIR}/git" DEFAULT_PREFERENCE = "-1" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" inherit meson pkgconfig manpages @@ -40,7 +39,7 @@ PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind" PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false" PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false" PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" -PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native" +PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native python3-docutils-native" ALLOW_EMPTY:${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ diff --git a/recipes-graphics/glew/glew_%.bbappend b/recipes-graphics/glew/glew_%.bbappend new file mode 100644 index 00000000..95da4790 --- /dev/null +++ b/recipes-graphics/glew/glew_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:imxgpu = "egl-gles2" diff --git a/recipes-graphics/gtk+/gtk+3_%.bbappend b/recipes-graphics/gtk+/gtk+3_%.bbappend index 2f108a27..6bc01807 100644 --- a/recipes-graphics/gtk+/gtk+3_%.bbappend +++ b/recipes-graphics/gtk+/gtk+3_%.bbappend @@ -1,5 +1 @@ DEPENDS:append:imxgpu2d = " virtual/egl" - -PACKAGECONFIG:remove:imxgpu2d = " \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "x11", "", d)} \ -" diff --git a/recipes-graphics/harfbuzz/harfbuzz_%.bbappend b/recipes-graphics/harfbuzz/harfbuzz_%.bbappend new file mode 100644 index 00000000..bf8c38fc --- /dev/null +++ b/recipes-graphics/harfbuzz/harfbuzz_%.bbappend @@ -0,0 +1,5 @@ +# links with imx-gpu libs which are pre-built for glibc +# gcompat will address it during runtime +LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" + +RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat" diff --git a/recipes-graphics/images/core-image-weston.bbappend b/recipes-graphics/images/core-image-weston.bbappend index 77d2fe74..0d4a0c6f 100644 --- a/recipes-graphics/images/core-image-weston.bbappend +++ b/recipes-graphics/images/core-image-weston.bbappend @@ -1,3 +1,3 @@ # FIXME: i.MX6SL cannot use mesa for Graphics and it lacks GL support, # so for now we skip it. -CORE_IMAGE_BASE_INSTALL:remove:mx6sl = "clutter-1.0-examples" +CORE_IMAGE_BASE_INSTALL:remove:mx6sl-nxp-bsp = "clutter-1.0-examples" diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb deleted file mode 100644 index c340505e..00000000 --- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2021 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and DPU" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" -PROVIDES += "virtual/libg2d" - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "0b7fc529b3af3ecc3087a99cca0c627d" -SRC_URI[sha256sum] = "42d470373fd72b2e2aa8d8a226e133c61b0a88e4e5bddbfec9509f7d2764f206" - -inherit fsl-eula-unpack - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir} - cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} - cp -r ${S}/gpu-demos/opt ${D} -} - -FILES:${PN} = "${libdir}/libg2d* /opt" -FILES:${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}" -INSANE_SKIP:${PN} += "ldflags" - -RDEPENDS:${PN} = "libgal-imx libdrm libopencl-imx" - -# This is required to provide support for VPU Amphion HEVC tile format -# From NXP [MGS-5547] (commit e175d6b4f78deab24d319b852998bef55cdecc99): -# VPU Amphion HEVC tile support was added using OpenCL, so add a dependency on libopencl-imx. -RDEPENDS:${PN} += "libopencl-imx" - -COMPATIBLE_MACHINE = "(imxdpu)" diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb new file mode 100644 index 00000000..667bc26b --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb @@ -0,0 +1,36 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2022 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=5a0bf11f745e68024f37b4724a5364fe" + +DEPENDS = "libgal-imx libdrm" +PROVIDES += "virtual/libg2d" + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" +SRC_URI[md5sum] = "488d9f63b2d02c687a0bc8c3debfb51c" +SRC_URI[sha256sum] = "62050bc5dd35e942c97e7a8ab22b0b98d02e27a38935b585e622cdc5221ef2a3" + +inherit fsl-eula-unpack + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir} + cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} +} + +INSANE_SKIP:${PN} += "ldflags" +INSANE_SKIP:append:libc-musl = " file-rdeps" + +# The packaged binaries have been stripped of debug info, so disable +# operations accordingly. +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" + +COMPATIBLE_MACHINE = "(imxdpu)" + +RDEPENDS:${PN}:append:libc-musl = " gcompat" diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb new file mode 100644 index 00000000..c02a4f50 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb @@ -0,0 +1,60 @@ +SUMMARY = "i.MX G2D Samples" +DESCRIPTION = "Set of sample applications for i.MX G2D" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=0858ec9c7a80c4a2cf16e4f825a2cc91" + +DEPENDS = "virtual/libg2d cairo" + +PV = "2.1+git${SRCPV}" + +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.1" +SRCREV = "3efd75a90e3c606c9b7bed6791bcd4085ae69b9b" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}" +PACKAGECONFIG_IMPLEMENTATION = "" +PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu" +PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm" +PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev" + +PACKAGECONFIG[dpu] = " \ + BUILD_IMPLEMENTATION=dpu, \ + , \ + imx-dpu-g2d wayland-native wayland-protocols, \ + , \ + , \ + gpu-drm gpu-fbdev" +PACKAGECONFIG[gpu-drm] = " \ + BUILD_IMPLEMENTATION=gpu-drm, \ + , \ + imx-gpu-g2d wayland-native wayland-protocols, \ + , \ + , \ + dpu gpu-fbdev" +PACKAGECONFIG[gpu-fbdev] = " \ + BUILD_IMPLEMENTATION=gpu-fbdev, \ + , \ + imx-gpu-g2d, \ + , \ + , \ + dpu gpu-drm" + +EXTRA_OEMAKE += " \ + SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ + ${PACKAGECONFIG_CONFARGS} \ +" + +do_install() { + oe_runmake install DESTDIR=${D} +} + +FILES:${PN} += "/opt" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" + +COMPATIBLE_MACHINE = "(imxgpu2d)" diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.6.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.6.bb new file mode 100644 index 00000000..d513c720 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.6.bb @@ -0,0 +1,46 @@ +# Copyright (C) 2016 Freescale Semiconductor +# 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=5a0bf11f745e68024f37b4724a5364fe" +DEPENDS = "libgal-imx" +PROVIDES = "virtual/libg2d" + +FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" + +SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" +SRC_URI[aarch64.md5sum] = "41e6c3a6f8d4151d30c1f34341465b30" +SRC_URI[aarch64.sha256sum] = "70e007f66459ee6a392f4a21f4d4a753ff22a75b728cc7d952251b00ba3ab51e" +SRC_URI[arm.md5sum] = "4c751218aa4db1f545bcec17ee963cc0" +SRC_URI[arm.sha256sum] = "288f78419d825e71563c38a39a738f040e098b581b76e6f8b8fc5895e7d9d7c4" + +S = "${WORKDIR}/${FSLBIN_NAME}" + +inherit fsl-eula-unpack + +SOC_INSTALL_DIR = "SOC_INSTALL_DIR_NOT_SET" +SOC_INSTALL_DIR:mx8mm-nxp-bsp = "mx8mm" + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir} + if [ -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR} ]; then + cp -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR}/*.so* ${D}${libdir} + fi + cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} +} + +# The packaged binaries have been stripped of debug info, so disable +# operations accordingly. +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" + +INSANE_SKIP:${PN} = "ldflags" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(imxgpu2d)" diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb new file mode 100644 index 00000000..fbf56e0c --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb @@ -0,0 +1,28 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2022 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://EULA.txt;md5=d3c315c6eaa43e07d8c130dc3a04a011" + +PROVIDES += "virtual/libg2d" + +PV = "2.1.0+git${SRCPV}" + +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.1" +SRCREV = "178970dc7cdba69b94c2219b5bade46d67adb640" + +S = "${WORKDIR}/git" + +inherit use-imx-headers + +EXTRA_OEMAKE = "PLATFORM=IMX93 INCLUDE='-I${STAGING_INCDIR_IMX}' DEST_DIR=${D}" + +do_install() { + oe_runmake install +} + +COMPATIBLE_MACHINE = "(mx93-nxp-bsp)" diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0001-dlsym-workaround-glibc-2.34-build-failure.patch b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0001-dlsym-workaround-glibc-2.34-build-failure.patch index 9f3410d7..2ed5587f 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0001-dlsym-workaround-glibc-2.34-build-failure.patch +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0001-dlsym-workaround-glibc-2.34-build-failure.patch @@ -15,19 +15,16 @@ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> wrappers/dlsym.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp -index cdf5cfdb..4061afc4 100644 ---- a/wrappers/dlsym.cpp -+++ b/wrappers/dlsym.cpp +Index: git/wrappers/dlsym.cpp +=================================================================== +--- git.orig/wrappers/dlsym.cpp ++++ git/wrappers/dlsym.cpp @@ -34,7 +34,7 @@ #include "os.hpp" --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !(__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) +-#if defined(__GLIBC__) && !defined(__UCLIBC__) ++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !(__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) #include <dlfcn.h> --- -2.17.1 - diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb index dfa8dde7..f325ff94 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb @@ -4,22 +4,22 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50" DEPENDS = "imx-gpu-viv zlib libpng procps" -SRC_URI = "git://source.codeaurora.org/external/imx/apitrace-imx.git;protocol=https;branch=imx_9.0 \ +SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_10.0 \ file://0001-dlsym-workaround-glibc-2.34-build-failure.patch \ " -SRCREV = "c50e6a954e44998f2e3793a8de863e961f8008c6" +SRCREV = "90a59407f1cddd31b4dac67e5a2500100eb091bc" S = "${WORKDIR}/git" inherit cmake pkgconfig perlnative python3native -PACKAGECONFIG_BACKEND:mx6 = " \ +PACKAGECONFIG_BACKEND:mx6-nxp-bsp = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ '', d), d)} \ " -PACKAGECONFIG_BACKEND:mx7 = "${PACKAGECONFIG_BACKEND:mx6}" -PACKAGECONFIG_BACKEND:mx8 = "waffle" +PACKAGECONFIG_BACKEND:mx7-nxp-bsp = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}" +PACKAGECONFIG_BACKEND:mx8-nxp-bsp = "waffle" PACKAGECONFIG_GPU2D = "" PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" @@ -43,6 +43,13 @@ FILES:${PN} += " \ ${libdir}/apitrace/scripts/* \ ${libdir}/apitrace/wrappers/* \ " - +EXTRA_OECMAKE += "\ + -DENABLE_GUI=OFF \ + -DENABLE_STATIC_LIBGCC=OFF \ + -DENABLE_STATIC_LIBSTDCXX=OFF \ + -DPython3_ROOT_DIR=/usr/bin/python3-native \ +" PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(imxgpu)" +SECURITY_CFLAGS:toolchain-clang = "" + diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p2.2.bb b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p2.2.bb deleted file mode 100644 index cc12c451..00000000 --- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p2.2.bb +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2021 NXP -# Copyright 2018 (C) O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and no DPU" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" - -DEPENDS += "libgal-imx" -PROVIDES += "virtual/libg2d" - -FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" - -SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" -SRC_URI[aarch64.md5sum] = "64559ad7909bdfe70c66e942e922b49a" -SRC_URI[aarch64.sha256sum] = "40a5ccb7b49eecff4a8003fa74104d4cf659a6519039d3fa9d2f7548813db879" -SRC_URI[arm.md5sum] = "3c50524afe5a19044ea8c0ce2bd9575e" -SRC_URI[arm.sha256sum] = "9c81dfba32f2c86c92d811650e509bdf148b0181f9b3ce9a752e1210f2c78a73" - -S = "${WORKDIR}/${FSLBIN_NAME}" - -inherit fsl-eula-unpack - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - cp ${S}/g2d/usr/lib/*.so* ${D}${libdir} - cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} - cp -r ${S}/gpu-demos/opt ${D} -} - -FILES:${PN} = "${libdir}/libg2d* /opt" -FILES:${PN}-dev = "${includedir}" -INSANE_SKIP:${PN} = "ldflags" - -RDEPENDS:${PN} = "libgal-imx" - -COMPATIBLE_MACHINE = "(imxgpu2d)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 14912e1b..169606c2 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -6,7 +6,7 @@ DESCRIPTION = "GPU driver and apps for i.MX" SECTION = "libs" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ @@ -18,25 +18,15 @@ DEPENDS += " \ '', d)} \ " DEPENDS:append:imxdrm = " libdrm wayland" -DEPENDS:append:mx8 = " patchelf-native" +DEPENDS:append:mx8-nxp-bsp = " patchelf-native" # imx-gpu-viv does not provide everything it needs to for virtual/libgl # on x11 backend or on Wayland backend with XWayland support. # We depend on mesa to fill in what is missing. DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}" -EXTRA_PROVIDES = "" -EXTRA_PROVIDES:append:imxgpu3d = " \ - virtual/libgl \ - virtual/libgles1 \ - virtual/libgles2 \ -" -EXTRA_PROVIDES:append:mx8 = " \ - virtual/libgbm \ -" -PROVIDES_OPENVX = "" -PROVIDES_OPENVX:mx8 = "virtual/libopenvx" -PROVIDES_OPENVX:mx8mm = "" +DEPENDS:append:libc-musl = " gcompat" + PROVIDES += " \ imx-gpu-viv \ libgal-imx \ @@ -46,19 +36,40 @@ PROVIDES += " \ virtual/egl \ virtual/libopenvg \ virtual/opencl-icd \ - ${PROVIDES_OPENVX} \ ${EXTRA_PROVIDES} \ " +EXTRA_PROVIDES = " \ + ${PROVIDES_OPENGLES3} \ + ${PROVIDES_OPENVX} \ +" +EXTRA_PROVIDES:append:imxgpu3d = " \ + virtual/libgl \ + virtual/libgles1 \ + virtual/libgles2 \ +" +EXTRA_PROVIDES:append:mx8-nxp-bsp = " \ + virtual/libgbm \ +" + +PROVIDES_OPENGLES3 = "" +PROVIDES_OPENGLES3:mx8-nxp-bsp = "virtual/libgles3" +PROVIDES_OPENGLES3:mx8mm-nxp-bsp = "" + +# Note: OpenVX is fully supported on i.MX 8 QuadMax and 8 QuadPlus. +# However, only limited support is provided on other i.MX 8 machines +# as needed for i.MX machine learning packages. +PROVIDES_OPENVX = "" +PROVIDES_OPENVX:mx8-nxp-bsp = "virtual/libopenvx" +PROVIDES_OPENVX:mx8mm-nxp-bsp = "" RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv" PE = "1" -inherit fsl-eula-unpack features_check +inherit fsl-eula-unpack -REQUIRED_DISTRO_FEATURES:mx8 = "wayland" - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \ + file://imx_icd.json" PACKAGECONFIG ?= "" @@ -66,36 +77,46 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[valgrind] = "" # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below -IMX_PACKAGES_GBM = "" -IMX_PACKAGES_GBM:mx8 = "libgbm-imx libgbm-imx-dev" -PACKAGES =+ "libclc-imx libclc-imx-dev \ +PACKAGES =+ " \ libgl-imx libgl-imx-dev \ libgles1-imx libgles1-imx-dev \ libgles2-imx libgles2-imx-dev \ libgles3-imx-dev \ libglslc-imx libglslc-imx-dev \ - libopencl-imx libopencl-imx-dev \ + ${PACKAGES_OPENCL} \ libopenvg-imx libopenvg-imx-dev \ libvdk-imx libvdk-imx-dev \ libegl-imx libegl-imx-dev \ libgal-imx libgal-imx-dev \ - libvivante-dri-imx \ libvsc-imx \ - ${IMX_PACKAGES_GBM} \ + ${PACKAGES_GBM} \ imx-gpu-viv-tools \ imx-gpu-viv-demos \ - libvulkan-imx libvulkan-imx-dev \ - libopenvx-imx libopenvx-imx-dev \ + ${PACKAGES_VULKAN} \ + ${PACKAGES_OPENVX} \ libnn-imx \ " + +PACKAGES_GBM = "" +PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev" + +PACKAGES_OPENCL = "libopencl-imx libopencl-imx-dev libclc-imx libclc-imx-dev" +PACKAGES_OPENCL:mx7-nxp-bsp = "" + +PACKAGES_OPENVX = \ + "${@bb.utils.contains("PROVIDES_OPENVX", "virtual/libopenvx", \ + "libopenvx-imx libopenvx-imx-dev", "", d)}" + +PACKAGES_VULKAN = "" +PACKAGES_VULKAN:imxvulkan = "libvulkan-imx libvulkan-imx-dev" + python __anonymous () { has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0') if has_vivante_kernel_driver_support != '1': raise bb.parse.SkipPackage('The kernel of machine needs to have Vivante kernel driver support for this recipe to be used.') } -USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" -USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" +BACKEND = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "fb", d)}" # The packaged binaries have been stripped of debug info, so disable # operations accordingly. @@ -137,26 +158,26 @@ python __anonymous() { } IS_MX6SL = "0" -IS_MX6SL:mx6sl = "1" +IS_MX6SL:mx6sl-nxp-bsp = "1" IS_MX8 = "0" -IS_MX8:mx8 = "1" +IS_MX8:mx8-nxp-bsp = "1" PACKAGE_FP_TYPE = "hardfp" HAS_GBM = "false" -HAS_GBM:mx8 = "true" +HAS_GBM:mx8-nxp-bsp = "true" IMX_SOC = "IMX_SOC_NOT_SET" -IMX_SOC:mx8qm = "mx8qm" -IMX_SOC:mx8mp = "mx8mp" -IMX_SOC:mx8mq = "mx8mq" -IMX_SOC:mx8qxp = "mx8qxp" -IMX_SOC:mx8mn = "mx8mn" -IMX_SOC:mx8ulp = "mx8ulp" +IMX_SOC:mx8qm-nxp-bsp = "mx8qm" +IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp" +IMX_SOC:mx8dx-nxp-bsp = "mx8qxp" +IMX_SOC:mx8mp-nxp-bsp = "mx8mp" +IMX_SOC:mx8mq-nxp-bsp = "mx8mq" +IMX_SOC:mx8mn-nxp-bsp = "mx8mn" +IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" -LIBVULKAN_VERSION_MAJOR = "1" -LIBVULKAN_VERSION = "${LIBVULKAN_VERSION_MAJOR}.1.6" +LIBVULKAN_API_VERSION = "1.2.182" do_install () { install -d ${D}${libdir} @@ -171,6 +192,7 @@ do_install () { # Use vulkan header from vulkan-headers recipe to support vkmark rm -rf ${D}${includedir}/vulkan/ + # Install SOC-specific drivers if [ -d ${S}/gpu-core/usr/lib/${IMX_SOC} ]; then cp -r ${S}/gpu-core/usr/lib/${IMX_SOC}/* ${D}${libdir} fi @@ -180,66 +202,71 @@ do_install () { install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc fi - # The preference order, based in DISTRO_FEATURES, is Wayland (with or without X11), X11 and fb - if [ "${USE_WL}" = "yes" ]; then - - backend=wayland + install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc + install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc + install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc + # Install backend-specific drivers + if [ "${BACKEND}" = "wayland" ]; then + # Wayland backend install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc - - if [ "${USE_X11}" = "yes" ]; then - - cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} - - fi - - elif [ "${USE_X11}" = "yes" ]; then - - cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} - - backend=x11 - - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gl_x11.pc ${D}${libdir}/pkgconfig/gl.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc - - else - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc - - # Regular framebuffer + cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir} + elif [ "${IS_MX8}" != "1" ]; then + # Framebuffer backend for i.MX 6 and 7 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc - - backend=fb - + cp -r ${S}/gpu-core/usr/lib/fb/* ${D}${libdir} + else + # Framebuffer backend for i.MX 8 and beyond + install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl.pc ${D}${libdir}/pkgconfig/egl.pc + cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir} + set -f + for f in ${FILES:libvdk-imx} ${FILES:libvdk-imx-dev}; do + set +f + rm -rf ${D}/$f + done + rm -rf \ + ${D}/opt/viv_samples/es20 \ + ${D}/opt/viv_samples/tiger \ + ${D}/opt/viv_samples/vdk fi - - # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) - install -d ${D}${sysconfdir}/OpenCL/vendors/ - install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd - - # Handle backend specific drivers - cp -r ${S}/gpu-core/usr/lib/${backend}/* ${D}${libdir} - if [ "${USE_WL}" = "yes" ]; then + if [ "${BACKEND}" = "wayland" ] && [ "${IS_MX8}" != "1" ]; then # Special case for libVDK on Wayland backend, deliver fb library as well. cp ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0 fi + + if [ -z "${PACKAGES_OPENCL}" ]; then + set -f + for f in ${FILES:libopencl-imx} ${FILES:libopencl-imx-dev} ${FILES:libclc-imx} ${FILES:libclc-imx-dev}; do + set +f + rm -rf ${D}$f + done + rm -rf ${D}/opt/viv_samples/cl11 + else + # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) + install -d ${D}${sysconfdir}/OpenCL/vendors/ + install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd + fi + + if [ -z "${PACKAGES_OPENVX}" ]; then + set -f + for f in ${FILES:libopenvx-imx} ${FILES:libopenvx-imx-dev}; do + set +f + rm -rf ${D}$f + done + fi + if [ "${IS_MX8}" = "1" ]; then - # Rename the vulkan implementation library which is wrapped by the vulkan-loader - # library of the same name - MAJOR=${LIBVULKAN_VERSION_MAJOR} - FULL=${LIBVULKAN_VERSION} - mv ${D}${libdir}/libvulkan.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$FULL - patchelf --set-soname libvulkan_VSI.so.$MAJOR ${D}${libdir}/libvulkan_VSI.so.$FULL - rm ${D}${libdir}/libvulkan.so.$MAJOR ${D}${libdir}/libvulkan.so - ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR - ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so + if [ -z "${PACKAGES_VULKAN}" ]; then + set -f + for f in ${FILES:libvulkan-imx} ${FILES:libvulkan-imx-dev}; do + set +f + rm -rf ${D}$f + done + else + install -Dm 0644 ${WORKDIR}/imx_icd.json ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json + sed -i "s,%libdir%,${libdir}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json + sed -i "s,%api_version%,${LIBVULKAN_API_VERSION}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json + fi fi # FIXME: MX6SL does not have 3D support; hack it for now @@ -268,6 +295,24 @@ do_install () { chown -R root:root "${D}" } +do_install:append:libc-musl() { + # libs + for f in `find ${D}${libdir} -name '*.so*' -type f` + do + patchelf --add-needed libgcompat.so.0 $f + done + # binaries + for f in `find ${D}/opt ${D}${bindir} -name '*' -type f -executable` + do + # prune scripts + if `patchelf --print-interpreter $f 2>&1 > /dev/null` + then + patchelf --set-interpreter ${root_prefix}`patchelf --print-interpreter $f` $f + patchelf --add-needed libgcompat.so.0 $f + fi + done +} + ALLOW_EMPTY:${PN} = "1" FILES:libclc-imx = "${libdir}/libCLC${SOLIBS} ${includedir}/CL/cl_viv_vx_ext.h" @@ -287,12 +332,15 @@ INSANE_SKIP:libgal-imx += "build-deps" FILES:libvsc-imx = "${libdir}/libVSC${SOLIBS}" -FILES:libgbm-imx:mx8 = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}" -FILES:libgbm-imx-dev:mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" -RDEPENDS:libgbm-imx:append:mx8 = " libdrm" +FILES:libgbm-imx = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}" +FILES:libgbm-imx-dev = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" +RDEPENDS:libgbm-imx:append = " libdrm" INSANE_SKIP:libgbm-imx += "dev-so" -FILES:libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" +FILES:libvulkan-imx = "\ + ${libdir}/libvulkan_VSI${REALSOLIBS} \ + ${libdir}/libSPIRV_viv${SOLIBS} \ + ${sysconfdir}/vulkan" FILES:libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" FILES:libopenvx-imx = " \ @@ -346,14 +394,9 @@ FILES:libopenvg-imx-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${l FILES:libvdk-imx = "${libdir}/libVDK*${REALSOLIBS}" FILES:libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}" -FILES:libvivante-dri-imx = "${libdir}/dri/vivante_dri.so" -RDEPENDS:libvivante-dri-imx = "libdrm" - FILES:imx-gpu-viv-tools = "${bindir}/gmem_info" FILES:imx-gpu-viv-demos = "/opt" INSANE_SKIP:imx-gpu-viv-demos += "rpaths dev-deps" FILES:libnn-imx = "${libdir}/libNN*${SOLIBS}" - -# COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json new file mode 100644 index 00000000..1194a0fb --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json @@ -0,0 +1,7 @@ +{ + "file_format_version": "1.0.0", + "ICD": { + "library_path": "%libdir%/libvulkan_VSI.so", + "api_version": "%api_version%" + } +} diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch32.bb deleted file mode 100644 index 77b75593..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch32.bb +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2013-2016 Freescale Semiconductor -# Copyright 2017-2020 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require imx-gpu-viv-6.inc - -SRC_URI[md5sum] = "200ee64d8b922bc2f8718e5d0af01539" -SRC_URI[sha256sum] = "b53e6e2f9b47678bb2f8ad107fea5bd70d111b085e03d246fbaafd1f6cc2dc3a" - -COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch64.bb deleted file mode 100644 index 3a86f97c..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch64.bb +++ /dev/null @@ -1,6 +0,0 @@ -require imx-gpu-viv-6.inc - -SRC_URI[md5sum] = "612a9bfc0663da7aeee0c4d277acffb7" -SRC_URI[sha256sum] = "ea9ecb151d2dcdaeff1184e5de097bb35d53d8747a743a96d4cfd4a8a3814752" - -COMPATIBLE_MACHINE = "(mx8)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bb new file mode 100644 index 00000000..7a8d0634 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bb @@ -0,0 +1,10 @@ +# Copyright (C) 2013-2016 Freescale Semiconductor +# Copyright 2017-2020 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +require imx-gpu-viv-6.inc + +SRC_URI[md5sum] = "92d8a1440b680917a4001ebe65811584" +SRC_URI[sha256sum] = "fdb9e4250d2baf9a76ba60eab376c2317f9c53b621fe2c886a02f6355c0e01c6" + +COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch64.bb new file mode 100644 index 00000000..2779ff3c --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch64.bb @@ -0,0 +1,10 @@ +require imx-gpu-viv-6.inc + +SRC_URI[md5sum] = "b33fde69f544674340ea617e9faf404e" +SRC_URI[sha256sum] = "60a63b66ef28cadc62bc1305a3ab5a2018c910e171b0cd72f4876317282dcfcc" + +INSANE_SKIP:append:libc-musl = " file-rdeps" + +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" + +RDEPENDS:${PN}:append:libc-musl = " gcompat" diff --git a/recipes-graphics/libsdl2/libsdl2_%.bbappend b/recipes-graphics/libsdl2/libsdl2_%.bbappend index af9c97bb..3b2655ce 100644 --- a/recipes-graphics/libsdl2/libsdl2_%.bbappend +++ b/recipes-graphics/libsdl2/libsdl2_%.bbappend @@ -1,6 +1,6 @@ # what vivante driver does libsdl2 mean? Anyway it fails with missing functions as # VIVANTE_Create VIVANTE_GLES_GetProcAddress VIVANTE_GLES_UnloadLibrary ... -EXTRA_OECONF:append:imxgpu2d = " --disable-video-vivante" +EXTRA_OECMAKE:append:imxgpu = " -DSDL_VIVANTE=OFF" CFLAGS:append:imxgpu = " -DLINUX \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_API_FB', d)} \ diff --git a/recipes-graphics/libva/libva_%.bbappend b/recipes-graphics/libva/libva_%.bbappend new file mode 100644 index 00000000..080052f8 --- /dev/null +++ b/recipes-graphics/libva/libva_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:remove:imxgpu = "glx" diff --git a/recipes-graphics/mesa/libglu_%.bbappend b/recipes-graphics/mesa/libglu_%.bbappend new file mode 100644 index 00000000..96745dd8 --- /dev/null +++ b/recipes-graphics/mesa/libglu_%.bbappend @@ -0,0 +1 @@ +REQUIRED_DISTRO_FEATURES:remove:imxgpu = "x11" diff --git a/recipes-graphics/mesa/mesa-demos/Add-OpenVG-demos-to-support-wayland.patch b/recipes-graphics/mesa/mesa-demos/Add-OpenVG-demos-to-support-wayland.patch deleted file mode 100644 index 19bcca98..00000000 --- a/recipes-graphics/mesa/mesa-demos/Add-OpenVG-demos-to-support-wayland.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 8aba54422d9a77383c150f9f70240b18b6e1918e Mon Sep 17 00:00:00 2001 -From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> -Date: Thu, 9 Apr 2015 15:47:21 -0500 -Subject: [PATCH] Add OpenVG demos to support wayland. - -Upstream-Status: Pending - -Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> ---- - src/egl/Makefile.am | 6 +++--- - src/egl/openvg/Makefile.am | 33 +++++++++++++++++++++++++++++---- - 2 files changed, 32 insertions(+), 7 deletions(-) - -Index: mesa-demos-8.2.0/src/egl/Makefile.am -=================================================================== ---- mesa-demos-8.2.0.orig/src/egl/Makefile.am 2016-05-09 11:45:51.479100180 -0500 -+++ mesa-demos-8.2.0/src/egl/Makefile.am 2016-05-09 11:45:51.475100160 -0500 -@@ -26,10 +26,10 @@ - eglut \ - opengles1 \ - opengles2 \ -- oes_vg -+ oes_vg \ -+ openvg - - if HAVE_GLU - SUBDIRS += \ -- opengl \ -- openvg -+ opengl - endif -Index: mesa-demos-8.2.0/src/egl/openvg/Makefile.am -=================================================================== ---- mesa-demos-8.2.0.orig/src/egl/openvg/Makefile.am 2016-05-09 11:45:51.479100180 -0500 -+++ mesa-demos-8.2.0/src/egl/openvg/Makefile.am 2016-05-09 12:39:30.000000000 -0500 -@@ -47,13 +47,26 @@ - endif - endif - -+if HAVE_WAYLAND -+EGL_WL_DEMOS = \ -+ lion_wayland \ -+ sp_wayland -+ -+if HAVE_FREETYPE2 -+EGL_WL_DEMOS += \ -+ vgtext_wayland -+endif -+endif -+ - if HAVE_EGL - if HAVE_VG - bin_PROGRAMS = \ -- $(EGL_X11_DEMOS) -+ $(EGL_X11_DEMOS) \ -+ $(EGL_WL_DEMOS) - endif - endif - -+if HAVE_X11 - lion_x11_SOURCES = lion.c lion-render.c lion-render.h - sp_x11_SOURCES = sp.c - -@@ -63,6 +76,20 @@ - text_SOURCES = text.c - text_CFLAGS = $(AM_CFLAGS) @FREETYPE2_CFLAGS@ - text_LDADD = @FREETYPE2_LIBS@ ../eglut/libeglut_x11.la -+endif -+ -+if HAVE_WAYLAND -+lion_wayland_SOURCES = lion.c lion-render.c lion-render.h -+lion_wayland_LDADD = ../eglut/libeglut_wayland.la -+ -+sp_wayland_SOURCES = sp.c -+sp_wayland_LDADD = ../eglut/libeglut_wayland.la -+ -+vgtext_wayland_SOURCES = text.c -+vgtext_wayland_CFLAGS = $(AM_CFLAGS) @FREETYPE2_CFLAGS@ -+vgtext_wayland_LDADD = @FREETYPE2_LIBS@ ../eglut/libeglut_wayland.la -+ -+endif - - SUBDIRS = \ - trivial diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index 4b518185..ff5d71ae 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1,26 +1,23 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI:append:imxgpu = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \ - file://fix-clear-build-break.patch \ - file://Add-OpenVG-demos-to-support-wayland.patch" +SRC_URI:append:imxgpu = " \ + file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \ + file://fix-clear-build-break.patch" +REQUIRED_DISTRO_FEATURES:remove:imxgpu = "x11" + +PACKAGECONFIG:remove = " \ + ${PACKAGECONFIG_REMOVE_IF_2D_ONLY} \ + ${PACKAGECONFIG_REMOVE_IF_GPU}" PACKAGECONFIG_REMOVE_IF_2D_ONLY = "" PACKAGECONFIG_REMOVE_IF_2D_ONLY:imxgpu2d = "gles1 gles2" PACKAGECONFIG_REMOVE_IF_2D_ONLY:imxgpu3d = "" PACKAGECONFIG_REMOVE_IF_GPU = "" -PACKAGECONFIG_REMOVE_IF_GPU:imxgpu = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu x11', '', d)} \ -" -PACKAGECONFIG:remove = " \ - ${PACKAGECONFIG_REMOVE_IF_2D_ONLY} \ - ${PACKAGECONFIG_REMOVE_IF_GPU} \ -" +PACKAGECONFIG_REMOVE_IF_GPU:imxgpu = "x11" -PACKAGECONFIG_APPEND_IF_GPU = "" -PACKAGECONFIG_APPEND_IF_GPU:imxgpu = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland vg', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glut', '', d)} \ -" PACKAGECONFIG:append = " \ - ${PACKAGECONFIG_APPEND_IF_GPU} \ -" + ${PACKAGECONFIG_APPEND_IF_GPU}" +PACKAGECONFIG_APPEND_IF_GPU = "" +PACKAGECONFIG_APPEND_IF_GPU:imxgpu = "glu" + +PACKAGECONFIG[glu] = ",,libglu" diff --git a/recipes-graphics/pango/pango_%.bbappend b/recipes-graphics/pango/pango_%.bbappend new file mode 100644 index 00000000..bf8c38fc --- /dev/null +++ b/recipes-graphics/pango/pango_%.bbappend @@ -0,0 +1,5 @@ +# links with imx-gpu libs which are pre-built for glibc +# gcompat will address it during runtime +LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" + +RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat" diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend new file mode 100644 index 00000000..882d4ddf --- /dev/null +++ b/recipes-graphics/piglit/piglit_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +CFLAGS:append:imxgpu:toolchain-clang = " -Wno-error=int-conversion" +PACKAGECONFIG:remove:imxgpu = "x11 glx" +PACKAGECONFIG:append:mx8-nxp-bsp = " opencl" diff --git a/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/recipes-graphics/vulkan/vulkan-loader_%.bbappend deleted file mode 100644 index 90776168..00000000 --- a/recipes-graphics/vulkan/vulkan-loader_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# The i.MX implementation is dynamically loaded, so it requires an -# explicit runtime dependency. -RRECOMMENDS:${PN}:append:imxgpu = " libvulkan-imx" diff --git a/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bbappend new file mode 100644 index 00000000..05f566a8 --- /dev/null +++ b/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bbappend @@ -0,0 +1,7 @@ +# libvulkan.so is loaded dynamically, so put it in the main package +SOLIBS = ".so*" +FILES_SOLIBSDEV = "" +INSANE_SKIP:${PN} += "dev-so" + +# Override default mesa drivers with i.MX GPU drivers +RRECOMMENDS:${PN}:imxvulkan = "libvulkan-imx" diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend index 380273a8..e88f558d 100644 --- a/recipes-graphics/waffle/waffle_%.bbappend +++ b/recipes-graphics/waffle/waffle_%.bbappend @@ -8,8 +8,8 @@ SRC_URI += " \ PACKAGECONFIG_IMXGPU_X11 = "" PACKAGECONFIG_IMXGPU_X11:imxgpu3d = "x11-egl glx" PACKAGECONFIG_IMXGPU_GBM = "gbm" -PACKAGECONFIG_IMXGPU_GBM:mx6 = "" -PACKAGECONFIG_IMXGPU_GBM:mx7 = "" +PACKAGECONFIG_IMXGPU_GBM:mx6-nxp-bsp = "" +PACKAGECONFIG_IMXGPU_GBM:mx7-nxp-bsp = "" PACKAGECONFIG:imxgpu = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ bb.utils.contains('DISTRO_FEATURES', 'x11', '${PACKAGECONFIG_IMXGPU_X11}', \ diff --git a/recipes-graphics/wayland/required-distro-features.inc b/recipes-graphics/wayland/required-distro-features.inc new file mode 100644 index 00000000..bb4a0e8e --- /dev/null +++ b/recipes-graphics/wayland/required-distro-features.inc @@ -0,0 +1,8 @@ +# distro features required by weston recipes + +inherit features_check + +# requires pam enabled if started via systemd +# +REQUIRED_DISTRO_FEATURES = "wayland opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" + diff --git a/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb index 0d1f4726..b31267c1 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb @@ -9,14 +9,20 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" -SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.20" -SRCREV = "9cacf108d0ee5863c7a656da5d2271bc2396e43d" +SRC_URI = "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.25" +SRCREV = "a104fb66d1b899dc04077422c2204638675ee4a6" S = "${WORKDIR}/git" -inherit autotools pkgconfig +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" + +# NOTE: For i.MX drop allarch since the recipe is SOCARCH +#inherit meson pkgconfig allarch +inherit meson pkgconfig + +EXTRA_OEMESON += "-Dtests=false" PACKAGES = "${PN}" FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp|mx9-nxp-bsp)" diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index 5710e9b5..478c7cd6 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -6,19 +6,16 @@ IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu2d = "opengl" IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu3d = "" REQUIRED_DISTRO_FEATURES:remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}" -SRC_URI:append:mx6sl = " file://weston.config" +SRC_URI:append:mx6sl-nxp-bsp = " file://weston.config" # To customize weston.ini, start by setting the desired assignment in weston.ini, # commented out. For example: # #xwayland=true # Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS. -INI_UNCOMMENT_ASSIGNMENTS:append:imx = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \ -" -INI_UNCOMMENT_ASSIGNMENTS:append:mx8 = " \ +INI_UNCOMMENT_ASSIGNMENTS:append:mx8-nxp-bsp = " \ repaint-window=16 \ " -INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq = " \ +INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq-nxp-bsp = " \ gbm-format=argb8888 \ \\[shell\\] \ size=1920x1080 \ @@ -27,10 +24,12 @@ INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq = " \ # FIXME: The 8QM and 8QXP SoCs have better performance without G2D so don't enable it # Ideally, this should be seamless and Vivante ought to handle it internally and take the fastest # rendering code. -INI_UNCOMMENT_USE_G2D:imxgpu2d ?= "use-g2d=1" -INI_UNCOMMENT_USE_G2D:mx8qm = "" -INI_UNCOMMENT_USE_G2D:mx8qxp = "" -INI_UNCOMMENT_ASSIGNMENTS:append:imxgpu2d = " \ +INI_UNCOMMENT_USE_G2D ?= "" +INI_UNCOMMENT_USE_G2D:imxgpu2d ?= "use-g2d=1" +INI_UNCOMMENT_USE_G2D:mx8qm-nxp-bsp ?= "" +INI_UNCOMMENT_USE_G2D:mx8qxp-nxp-bsp ?= "" +INI_UNCOMMENT_USE_G2D:mx8dx-nxp-bsp ?= "" +INI_UNCOMMENT_ASSIGNMENTS:append = " \ ${INI_UNCOMMENT_USE_G2D} \ " @@ -48,4 +47,5 @@ do_install:append() { for assignment in ${INI_UNCOMMENT_ASSIGNMENTS}; do uncomment "$assignment" ${D}${sysconfdir}/xdg/weston/weston.ini done + sed -i -e 's,@bindir@,${bindir},g' ${D}${sysconfdir}/xdg/weston/weston.ini } diff --git a/recipes-graphics/wayland/weston-init/imx/weston.ini b/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini index 916e621a..3e298973 100644 --- a/recipes-graphics/wayland/weston-init/imx/weston.ini +++ b/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini @@ -2,9 +2,9 @@ #gbm-format=argb8888 idle-time=0 #use-g2d=1 -#xwayland=true #repaint-window=16 #enable-overlay-view=1 +modules=screen-share.so #[shell] #size=1920x1080 @@ -27,4 +27,4 @@ touchscreen_calibrator=true #transform=rotate-90 [screen-share] -command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize +command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize --rdp-tls-cert=/etc/freerdp/keys/server.crt --rdp-tls-key=/etc/freerdp/keys/server.key diff --git a/recipes-graphics/wayland/weston-init/mx6sl/weston.config b/recipes-graphics/wayland/weston-init/mx6sl-nxp-bsp/weston.config index 6456cd24..6456cd24 100755 --- a/recipes-graphics/wayland/weston-init/mx6sl/weston.config +++ b/recipes-graphics/wayland/weston-init/mx6sl-nxp-bsp/weston.config diff --git a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch new file mode 100644 index 00000000..676d0338 --- /dev/null +++ b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch @@ -0,0 +1,40 @@ +From 77eba6f6b04ff21b77c41500657495b4fd12a5f6 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Mon, 11 Jul 2022 19:38:19 +0000 +Subject: [PATCH] Revert "protocol: no found wayland-scanner with Yocto + toolchain" + +This reverts commit 7859a762617682bd804e210ad3bda6bdcd3ea24a. + +With openembedded commit e525db4eb9 ("wayland: update 1.20.0 -> 1.21.0") +package config seems no longer to provide the path to the native +weston scanner. + +Thus the build fails with: + +| Run-time dependency wayland-scanner found: YES 1.21.0 +| Program /usr/bin/wayland-scanner found: NO +| +| ../git/protocol/meson.build:2:0: ERROR: Program '/usr/bin/wayland-scanner' not found or not executable + +Dropping weston 9.0.0-imx commit 7859a762 (protocol: no found +wayland-scanner with Yocto toolchain") fixes the issue. + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + protocol/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/protocol/meson.build b/protocol/meson.build +index bdd322ac..e50b23bb 100644 +--- a/protocol/meson.build ++++ b/protocol/meson.build +@@ -1,4 +1,4 @@ +-dep_scanner = dependency('wayland-scanner', native: false) ++dep_scanner = dependency('wayland-scanner', native: true) + prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) + + dep_wp = dependency('wayland-protocols', version: '>= 1.24') +-- +2.17.1 + diff --git a/recipes-graphics/wayland/weston/0001-g2d-renderer.c-Include-sys-stat.h.patch b/recipes-graphics/wayland/weston/0001-g2d-renderer.c-Include-sys-stat.h.patch new file mode 100644 index 00000000..b9cb31fb --- /dev/null +++ b/recipes-graphics/wayland/weston/0001-g2d-renderer.c-Include-sys-stat.h.patch @@ -0,0 +1,34 @@ +From 4afe9b2f9ef24ce0c9bf1cd41f94ca45afa4f445 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 12 Sep 2022 20:58:14 -0700 +Subject: [PATCH] g2d-renderer.c: Include sys/stat.h + +This is needed for getting stat() prototype, its flagged with clang-15 +as error. + +| ../git/libweston/renderer-g2d/g2d-renderer.c:2057:6: error: call to undeclared function 'stat'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +| if (stat(gr->drm_device, &dev_stat) != 0) { +| ^ +| 1 error generated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libweston/renderer-g2d/g2d-renderer.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libweston/renderer-g2d/g2d-renderer.c b/libweston/renderer-g2d/g2d-renderer.c +index f59fc4ee..36a458fc 100644 +--- a/libweston/renderer-g2d/g2d-renderer.c ++++ b/libweston/renderer-g2d/g2d-renderer.c +@@ -41,6 +41,7 @@ + #include <drm_fourcc.h> + #include <poll.h> + #include <errno.h> ++#include <sys/stat.h> /* stat() */ + + #include <libweston/libweston.h> + #include "g2d-renderer.h" +-- +2.37.3 + diff --git a/recipes-graphics/wayland/weston/0001-tests-Add-dependency-on-screenshooter-client-protoco.patch b/recipes-graphics/wayland/weston/0001-tests-Add-dependency-on-screenshooter-client-protoco.patch new file mode 100644 index 00000000..46538600 --- /dev/null +++ b/recipes-graphics/wayland/weston/0001-tests-Add-dependency-on-screenshooter-client-protoco.patch @@ -0,0 +1,33 @@ +From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001 +From: Daniel Stone <daniels@collabora.com> +Date: Tue, 8 Feb 2022 22:39:42 +0000 +Subject: [PATCH] tests: Add dependency on screenshooter client protocol + +Given that the test-helper code relies on the screenshooter protocol, +make sure it's available for us to build, and the dependency ensures we +build in order. + +Fixes: #588 + +Signed-off-by: Daniel Stone <daniels@collabora.com> +--- + tests/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 2d464ddcc..222091cd1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -29,8 +29,9 @@ lib_test_client = static_library( + 'weston-test-client-helper.c', + 'weston-test-fixture-compositor.c', + weston_test_client_protocol_h, +- weston_screenshooter_protocol_c, + weston_test_protocol_c, ++ weston_screenshooter_client_protocol_h, ++ weston_screenshooter_protocol_c, + viewporter_client_protocol_h, + viewporter_protocol_c, + 'color_util.h', + + diff --git a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch deleted file mode 100644 index 3279a728..00000000 --- a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +++ /dev/null @@ -1,199 +0,0 @@ -From a1548c742bf2dedbb47282d8a00407b60bbab669 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein <tom.hochstein@nxp.com> -Date: Wed, 22 Feb 2017 15:53:30 +0200 -Subject: [PATCH] weston-launch: Provide a default version that doesn't require - - PAM - -weston-launch requires PAM for starting weston as a non-root user. - -Since starting weston as root is a valid use case by itself, if -PAM is not available, provide a default version of weston-launch -without non-root-user support. - -Upstream-Status: Pending - -Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Signed-off-by: Denys Dmytriyenko <denys@ti.com> -Signed-off-by: Ming Liu <ming.liu@toradex.com> - ---- - libweston/meson.build | 16 ++++++++++++---- - libweston/weston-launch.c | 21 +++++++++++++++++++++ - meson_options.txt | 7 +++++++ - 3 files changed, 40 insertions(+), 4 deletions(-) - -diff --git a/libweston/meson.build b/libweston/meson.build -index 08d23ec..cb9fd3f 100644 ---- a/libweston/meson.build -+++ b/libweston/meson.build -@@ -216,16 +216,24 @@ dep_vertex_clipping = declare_dependency( - ) - - if get_option('weston-launch') -- dep_pam = cc.find_library('pam') -+ deps_weston_launch = [systemd_dep, dep_libdrm] - -- if not cc.has_function('pam_open_session', dependencies: dep_pam) -- error('pam_open_session not found for weston-launch') -+ if get_option('pam') -+ dep_pam = cc.find_library('pam') -+ if not cc.has_function('pam_open_session', dependencies: dep_pam) -+ error('pam_open_session not found for weston-launch') -+ endif -+ -+ if dep_pam.found() -+ deps_weston_launch += dep_pam -+ config_h.set('HAVE_PAM', '1') -+ endif - endif - - executable( - 'weston-launch', - 'weston-launch.c', -- dependencies: [dep_pam, systemd_dep, dep_libdrm], -+ dependencies: deps_weston_launch, - include_directories: common_inc, - install: true - ) -diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c -index 521cb2c..2d42d33 100644 ---- a/libweston/weston-launch.c -+++ b/libweston/weston-launch.c -@@ -51,7 +51,9 @@ - - #include <pwd.h> - #include <grp.h> -+#ifdef HAVE_PAM - #include <security/pam_appl.h> -+#endif - - #ifdef HAVE_SYSTEMD_LOGIN - #include <systemd/sd-login.h> -@@ -100,8 +102,10 @@ drmSetMaster(int drm_fd) - #endif - - struct weston_launch { -+#ifdef HAVE_PAM - struct pam_conv pc; - pam_handle_t *ph; -+#endif - int tty; - int ttynr; - int sock[2]; -@@ -192,6 +196,7 @@ weston_launch_allowed(struct weston_launch *wl) - return false; - } - -+#ifdef HAVE_PAM - static int - pam_conversation_fn(int msg_count, - const struct pam_message **messages, -@@ -232,6 +237,7 @@ setup_pam(struct weston_launch *wl) - - return 0; - } -+#endif - - static int - setup_launcher_socket(struct weston_launch *wl) -@@ -466,6 +472,7 @@ quit(struct weston_launch *wl, int status) - close(wl->signalfd); - close(wl->sock[0]); - -+#ifdef HAVE_PAM - if (wl->new_user) { - err = pam_close_session(wl->ph, 0); - if (err) -@@ -473,6 +480,7 @@ quit(struct weston_launch *wl, int status) - err, pam_strerror(wl->ph, err)); - pam_end(wl->ph, err); - } -+#endif - - /* - * Get a fresh handle to the tty as the previous one is in -@@ -710,6 +718,7 @@ setup_session(struct weston_launch *wl, char **child_argv) - setenv("HOME", wl->pw->pw_dir, 1); - setenv("SHELL", wl->pw->pw_shell, 1); - -+#ifdef HAVE_PAM - env = pam_getenvlist(wl->ph); - if (env) { - for (i = 0; env[i]; ++i) { -@@ -718,6 +727,7 @@ setup_session(struct weston_launch *wl, char **child_argv) - } - free(env); - } -+#endif - - /* - * We open a new session, so it makes sense -@@ -789,8 +799,10 @@ static void - help(const char *name) - { - fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); -+#ifdef HAVE_PAM - fprintf(stderr, " -u, --user Start session as specified username,\n" - " e.g. -u joe, requires root.\n"); -+#endif - fprintf(stderr, " -t, --tty Start session on alternative tty,\n" - " e.g. -t /dev/tty4, requires -u option.\n"); - fprintf(stderr, " -v, --verbose Be verbose\n"); -@@ -804,7 +816,9 @@ main(int argc, char *argv[]) - int i, c; - char *tty = NULL; - struct option opts[] = { -+#ifdef HAVE_PAM - { "user", required_argument, NULL, 'u' }, -+#endif - { "tty", required_argument, NULL, 't' }, - { "verbose", no_argument, NULL, 'v' }, - { "help", no_argument, NULL, 'h' }, -@@ -816,11 +830,16 @@ main(int argc, char *argv[]) - while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { - switch (c) { - case 'u': -+#ifdef HAVE_PAM - wl.new_user = optarg; - if (getuid() != 0) { - fprintf(stderr, "weston: Permission denied. -u allowed for root only\n"); - exit(EXIT_FAILURE); - } -+#else -+ fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n"); -+ exit(EXIT_FAILURE); -+#endif - break; - case 't': - tty = optarg; -@@ -872,8 +891,10 @@ main(int argc, char *argv[]) - if (setup_tty(&wl, tty) < 0) - exit(EXIT_FAILURE); - -+#ifdef HAVE_PAM - if (wl.new_user && setup_pam(&wl) < 0) - exit(EXIT_FAILURE); -+#endif - - if (setup_launcher_socket(&wl) < 0) - exit(EXIT_FAILURE); -diff --git a/meson_options.txt b/meson_options.txt -index 239bd2d..99e4ec3 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -73,6 +73,13 @@ option( - ) - - option( -+ 'pam', -+ type: 'boolean', -+ value: true, -+ description: 'Define if PAM is available' -+) -+ -+option( - 'xwayland', - type: 'boolean', - value: true, diff --git a/recipes-graphics/wayland/weston/systemd-notify.weston-start b/recipes-graphics/wayland/weston/systemd-notify.weston-start new file mode 100644 index 00000000..a97e7b38 --- /dev/null +++ b/recipes-graphics/wayland/weston/systemd-notify.weston-start @@ -0,0 +1,9 @@ +#!/bin/sh + +# SPDX-FileCopyrightText: Huawei Inc. +# SPDX-License-Identifier: Apache-2.0 + + +if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then + add_weston_module "systemd-notify.so" +fi diff --git a/recipes-graphics/wayland/weston/xwayland.weston-start b/recipes-graphics/wayland/weston/xwayland.weston-start index b483c97c..db384b1a 100644 --- a/recipes-graphics/wayland/weston/xwayland.weston-start +++ b/recipes-graphics/wayland/weston/xwayland.weston-start @@ -2,6 +2,4 @@ if type Xwayland >/dev/null 2>/dev/null; then mkdir -p /tmp/.X11-unix - - add_weston_argument "--modules=xwayland.so" fi diff --git a/recipes-graphics/wayland/weston_9.0.0.imx.bb b/recipes-graphics/wayland/weston_10.0.1.imx.bb index 76296c8e..84cd9fd8 100644 --- a/recipes-graphics/wayland/weston_9.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_10.0.1.imx.bb @@ -3,54 +3,59 @@ # recipe. The second section customizes the recipe for i.MX. ########### OE-core copy ################## -# Upstream hash: 0a882490fe75915c7a119f3498df6750be25f8e0 +# Upstream hash: 400aae43d08f0b9f787ac0d21cb3c97058d76748 SUMMARY = "Weston, a Wayland compositor" DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" HOMEPAGE = "http://wayland.freedesktop.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ - file://libweston/compositor.c;endline=27;md5=6c53bbbd99273f4f7c4affa855c33c0a" + file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ + " SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ - file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ - file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ -" + file://systemd-notify.weston-start \ + " SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " -SRC_URI[sha256sum] = "5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe" +SRC_URI[sha256sum] = "5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94e547ae" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit meson pkgconfig useradd features_check +inherit meson pkgconfig useradd + # depends on virtual/egl -# weston-init requires pam enabled if started via systemd -REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" +# +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:append:imxfbdev = " libdrm" LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}" WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" -EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" +EXTRA_OEMESON += "-Dpipewire=false" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - launch \ + ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \ image-jpeg \ screenshare \ shell-desktop \ shell-fullscreen \ shell-ivi" +# Can be 'damage', 'im', 'egl', 'shm', 'touch', 'dmabuf-feedback', 'dmabuf-v4l', 'dmabuf-egl' or 'all' +SIMPLECLIENTS ?= "all" + # # Compositor choices # @@ -63,9 +68,11 @@ PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libx # Headless Weston PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" # Weston on framebuffer -PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev" +PACKAGECONFIG[fbdev] = "-Ddeprecated-backend-fbdev=true,-Ddeprecated-backend-fbdev=false,udev mtdev" +# Weston on RDP +PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" # weston-launch -PACKAGECONFIG[launch] = "-Dweston-launch=true,-Dweston-launch=false,drm" +PACKAGECONFIG[launch] = "-Ddeprecated-weston-launch=true,-Ddeprecated-weston-launch=false,drm" # VA-API desktop recorder PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" # Weston with EGL support @@ -81,11 +88,9 @@ PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false" # colord CMS support PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord" # Clients support -PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" +PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Virtual remote output with GStreamer on DRM backend -PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0" -# Weston with PAM support -PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" +PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" # Weston with screen-share support PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false" # Traditional desktop shell @@ -96,6 +101,8 @@ PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=fa PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" # JPEG image loading support PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" +# support libseat based launch +PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" do_install:append() { # Weston doesn't need the .la files to load modules, so wipe them @@ -114,6 +121,10 @@ do_install:append() { install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland fi + if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then + install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify + fi + if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then chmod u+s ${D}${bindir}/weston-launch fi @@ -148,14 +159,15 @@ SUMMARY = "Weston, a Wayland compositor, i.MX fork" DEFAULT_PREFERENCE = "-1" -SRCBRANCH = "weston-imx-9.0" -SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ - file://weston.png \ - file://weston.desktop \ - file://xwayland.weston-start \ - file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ -" -SRCREV = "230e9bc3d647e511e0601e3d45034f22495ed3c7" +SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " +SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ + file://0001-g2d-renderer.c-Include-sys-stat.h.patch \ + file://0001-tests-Add-dependency-on-screenshooter-client-protoco.patch \ + " +SRCBRANCH = "weston-imx-10.0.1" +SRCREV = "3f8f336b5d2cf7ea7aa4e047d669d093fc46dfe6" + S = "${WORKDIR}/git" # Disable OpenGL for parts with GPU support for 2D but not 3D @@ -174,11 +186,10 @@ PACKAGECONFIG:append:imxfbdev = " fbdev clients" PACKAGECONFIG:append:imxgpu = " imxgpu" PACKAGECONFIG:append:imxgpu2d = " imxg2d" -# Clients support -SIMPLE_CLIENTS = "all" -SIMPLE_CLIENTS:imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l" +SIMPLECLIENTS:imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l" + +# Override PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor" -PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLE_CLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Weston with i.MX GPU support PACKAGECONFIG[imxgpu] = "-Dimxgpu=true,-Dimxgpu=false,virtual/egl" # Weston with i.MX G2D renderer @@ -186,6 +197,15 @@ PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d # Weston with OpenGL support PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false" +PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev" +EXTRA_OEMESON:append:imxfbdev = " -Dbackend-default=fbdev" + +EXTRA_OEMESON += "-Ddeprecated-wl-shell=true" + +# links with imx-gpu libs which are pre-built for glibc +# gcompat will address it during runtime +LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" + PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)" diff --git a/recipes-graphics/xinput-calibrator/pointercal-xinput/mx6/pointercal.xinput b/recipes-graphics/xinput-calibrator/pointercal-xinput/mx6-nxp-bsp/pointercal.xinput index ba34b89f..ba34b89f 100644 --- a/recipes-graphics/xinput-calibrator/pointercal-xinput/mx6/pointercal.xinput +++ b/recipes-graphics/xinput-calibrator/pointercal-xinput/mx6-nxp-bsp/pointercal.xinput diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi b/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi deleted file mode 100644 index 8c16a1d7..00000000 --- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: rc.autohdmi -# Required-Start: $all -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: -### END INIT INFO - -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -# Source function library. -. /etc/init.d/functions - -case "$1" in - start) - echo -n "Starting autohdmi: " - export DISPLAY=:0 - autohdmi & - echo - exit 0 - ;; - reload|force-reload) - echo "Error: argument '$1' not supported" >&2 - exit 3 - ;; - stop) - echo -n "Shutting down autohdmi: " - killproc autohdmi - echo - ;; - restart) - echo -n "Restarting autohdmi: " - $0 stop - $0 start - echo - ;; - *) - echo "Usage: $0 start|stop" >&2 - exit 3 - ;; -esac diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb deleted file mode 100644 index 6944184f..00000000 --- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright (C) 2012-2018 O.S. Systems Software LTDA. -# Copyright 2017-2018 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require recipes-graphics/xorg-driver/xorg-driver-video.inc - -PE = "3" - -inherit autotools-brokensep update-rc.d pkgconfig - -DEPENDS += "virtual/xserver virtual/libx11 libgal-imx imx-gpu-viv virtual/libg2d pixman" - -LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3" - -SRCREV = "c828e8a7c38743e960967e7bb78c134cec31c102" -SRCBRANCH = "imx_exa_viv6_g2d" -SRC_URI = "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https;branch=${SRCBRANCH} \ - file://rc.autohdmi" - -S = "${WORKDIR}/git" - -INITSCRIPT_PACKAGES = "xserver-xorg-extension-viv-autohdmi" -INITSCRIPT_NAME = "rc.autohdmi" -INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." - -EXTRA_OEMAKE += "prefix=${exec_prefix} \ - sysroot=${STAGING_DIR_TARGET} \ - SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ - BUSID_HAS_NUMBER=1 \ - BUILD_IN_YOCTO=1 \ - XSERVER_GREATER_THAN_13=1" -TARGET_CC_ARCH += "${LDFLAGS}" - -PACKAGES =+ "xserver-xorg-extension-viv-autohdmi" - -do_install:append () { - install -d ${D}${includedir} - cp -axr ${S}/EXA/src/vivante_gal/vivante_priv.h ${D}${includedir} - cp -axr ${S}/EXA/src/vivante_gal/vivante_gal.h ${D}${includedir} - - install -d ${D}/${sysconfdir}/init.d - install -m 755 ${WORKDIR}/rc.autohdmi ${D}/${sysconfdir}/init.d/rc.autohdmi - - find ${D}${includedir} -type f -exec chmod 660 {} \; -} - -RDEPENDS:${PN} += "libvivante-dri-imx \ - xserver-xorg-module-exa \ - mesa-driver-swrast \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx" - -REALSOLIBS := "${SOLIBS}" -SOLIBS = "${SOLIBSDEV}" - -FILES:${PN} = "${libdir}/*/*/*/vivante_drv${SOLIBS}" -FILES:${PN}-dev = "${includedir} /usr/src ${libdir}/libfsl_x11_ext${SOLIBSDEV}" -FILES:${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/.debug/autohdmi" - -FILES:xserver-xorg-extension-viv-autohdmi = " ${libdir}/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/autohdmi ${sysconfdir}/init.d/rc.autohdmi" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx6|mx7ulp)" diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5-generic-bsp/xorg.conf index a99e6f24..a99e6f24 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5-generic-bsp/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sll/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6-nxp-bsp/xorg.conf index 79b6c0fc..79b6c0fc 100755..100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sll/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6-nxp-bsp/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf deleted file mode 100644 index b89bed60..00000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf +++ /dev/null @@ -1,14 +0,0 @@ -Section "Device" - Identifier "i.MX Accelerated Framebuffer Device" - Driver "vivante" - Option "fbdev" "/dev/fb0" - Option "vivante_fbdev" "/dev/fb0" - Option "HWcursor" "false" -EndSection - -Section "ServerFlags" - Option "BlankTime" "0" - Option "StandbyTime" "0" - Option "SuspendTime" "0" - Option "OffTime" "0" -EndSection diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sl/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sl-nxp-bsp/xorg.conf index de3905ab..de3905ab 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sl/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sl-nxp-bsp/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sll-nxp-bsp/xorg.conf index 79b6c0fc..79b6c0fc 100644..100755 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sll-nxp-bsp/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sx/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sx-nxp-bsp/xorg.conf index de3905ab..de3905ab 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sx/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sx-nxp-bsp/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul-nxp-bsp/xorg.conf index 79b6c0fc..79b6c0fc 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul-nxp-bsp/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull-nxp-bsp/xorg.conf index 79b6c0fc..79b6c0fc 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull-nxp-bsp/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mxs/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7-nxp-bsp/xorg.conf index 79b6c0fc..79b6c0fc 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mxs/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7-nxp-bsp/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7ulp/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7ulp-nxp-bsp/xorg.conf index de6307a3..de6307a3 100755 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7ulp/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7ulp-nxp-bsp/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mxs-generic-bsp/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mxs-generic-bsp/xorg.conf new file mode 100644 index 00000000..79b6c0fc --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mxs-generic-bsp/xorg.conf @@ -0,0 +1,12 @@ +Section "Device" + Identifier "Kernel Framebuffer Device" + Driver "fbdev" + Option "fbdev" "/dev/fb0" +EndSection + +Section "ServerFlags" + Option "BlankTime" "0" + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" +EndSection diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/use-mainline-bsp/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/use-mainline-bsp/xorg.conf index 0c52ad3b..6fe64e11 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/use-mainline-bsp/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/use-mainline-bsp/xorg.conf @@ -1,7 +1,7 @@ Section "Device" Identifier "etnaviv" Driver "modesetting" - Option "kmsdev" "/dev/dri/card0" + Option "kmsdev" "/dev/dri/card1" Option "AccelMethod" "glamor" Option "Atomic" "On" EndSection diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/vf/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/vf-generic-bsp/xorg.conf index b4ee82a9..b4ee82a9 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/vf/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/vf-generic-bsp/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch deleted file mode 100644 index 6f232589..00000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ed3c55fa6260ad125a32f9ac67f9e44a9bce7cf1 Mon Sep 17 00:00:00 2001 -From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com> -Date: Mon, 11 May 2020 19:12:51 -0500 -Subject: [PATCH] MGS-5186 Per Specification EGL_NATIVE_PIXMAP_KHR requires - EGL_NO_CONTEXT - -https://www.khronos.org/registry/EGL/extensions/KHR/EGL_KHR_image_pixmap.txt - -Per Specification EGL_NATIVE_PIXMAP_KHR requires EGL_NO_CONTEXT. -So passing context will result in error. - -Upstream-Status: Pending -Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com> ---- - hw/xwayland/xwayland-glamor-gbm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: xorg-server-1.20.8/hw/xwayland/xwayland-glamor-gbm.c -=================================================================== ---- xorg-server-1.20.8.orig/hw/xwayland/xwayland-glamor-gbm.c -+++ xorg-server-1.20.8/hw/xwayland/xwayland-glamor-gbm.c -@@ -167,7 +167,7 @@ xwl_glamor_gbm_create_pixmap_for_bo(Scre - xwl_pixmap->bo = bo; - xwl_pixmap->buffer = NULL; - xwl_pixmap->image = eglCreateImageKHR(xwl_screen->egl_display, -- xwl_screen->egl_context, -+ EGL_NO_CONTEXT, - EGL_NATIVE_PIXMAP_KHR, - xwl_pixmap->bo, NULL); - if (xwl_pixmap->image == EGL_NO_IMAGE_KHR) diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-glamor_egl.c-EGL_NATIVE_PIXMAP_KHR-do-not-req.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-glamor_egl.c-EGL_NATIVE_PIXMAP_KHR-do-not-req.patch deleted file mode 100644 index c8f1ae73..00000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-glamor_egl.c-EGL_NATIVE_PIXMAP_KHR-do-not-req.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cc05c01925755310f027c61daa29648a10155f96 Mon Sep 17 00:00:00 2001 -From: Rohan Garg <rohan@garg.io> -Date: Thu, 13 Dec 2018 19:15:01 +0100 -Subject: [PATCH] glamor/glamor_egl.c: EGL_NATIVE_PIXMAP_KHR do not require - contexts - -From https://www.khronos.org/registry/EGL/extensions/KHR/EGL_KHR_image_pixmap.txt - - * If <target> is EGL_NATIVE_PIXMAP_KHR, and <ctx> is not EGL_NO_CONTEXT, - the error EGL_BAD_PARAMETER is generated. - -Fixes: a5321ea4 ("Allow to create textured pixmaps from gbm_bo without using gem names") ---- - glamor/glamor_egl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Upstream-Status: Backport [cc05c01925755310f027c61daa29648a10155f96] - -diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c -index 0f4edb5a3..69844d4e2 100644 ---- a/glamor/glamor_egl.c -+++ b/glamor/glamor_egl.c -@@ -233,7 +233,7 @@ glamor_egl_create_textured_pixmap_from_gbm_bo(PixmapPtr pixmap, - glamor_make_current(glamor_priv); - - image = eglCreateImageKHR(glamor_egl->display, -- glamor_egl->context, -+ EGL_NO_CONTEXT, - EGL_NATIVE_PIXMAP_KHR, bo, NULL); - if (image == EGL_NO_IMAGE_KHR) { - glamor_set_pixmap_type(pixmap, GLAMOR_DRM_ONLY); --- -2.17.1 - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch deleted file mode 100644 index 48f271ae..00000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 836f93de99b35050d78d61d3654f7c5655184144 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Fri, 19 Apr 2019 10:19:50 +0200 -Subject: [PATCH] hw/xwayland/Makefile.am: fix build without glx - -Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to -Xwayland_LDFLAGS but GLX can be disabled through --disable-glx. -In this case, build fails on: - -make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'. Stop. -make[3]: *** Waiting for unfinished jobs.... - -Fixes: - - http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef - -Upstream-Status: Backport [836f93de99b35050d78d61d3654f7c5655184144] -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - hw/xwayland/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am -index bc1cb8506..502879e2a 100644 ---- a/hw/xwayland/Makefile.am -+++ b/hw/xwayland/Makefile.am -@@ -21,10 +21,14 @@ Xwayland_SOURCES = \ - $(top_srcdir)/Xi/stubs.c \ - $(top_srcdir)/mi/miinitext.c - -+if GLX -+GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la -+endif -+ - Xwayland_LDADD = \ - $(glamor_lib) \ - $(XWAYLAND_LIBS) \ -- $(top_builddir)/glx/libglxvnd.la \ -+ $(GLXVND_LIB) \ - $(XWAYLAND_SYS_LIBS) \ - $(top_builddir)/Xext/libXvidmode.la \ - $(XSERVER_SYS_LIBS) --- -2.17.1 - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-prefer-to-use-GLES2-for-glamor-EGL-config.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-prefer-to-use-GLES2-for-glamor-EGL-config.patch deleted file mode 100644 index 6e140eaa..00000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-prefer-to-use-GLES2-for-glamor-EGL-config.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a99ff39b3b6095a16977fbb13b2b453a7359850f Mon Sep 17 00:00:00 2001 -From: Xianzhong <xianzhong.li@nxp.com> -Date: Mon, 11 Jan 2021 11:53:29 +0800 -Subject: [PATCH] prefer to use GLES2 for glamor EGL config - -created the initial patch for xorg/xserver 1.20.8 - -Upstream-Status: Pending -Signed-off-by: Xianzhong <xianzhong.li@nxp.com> ---- - hw/xwayland/xwayland-glamor-gbm.c | 13 ++++--------- - 1 file changed, 4 insertions(+), 9 deletions(-) - -diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c -index dce782fc3..1fdf45490 100644 ---- a/hw/xwayland/xwayland-glamor-gbm.c -+++ b/hw/xwayland/xwayland-glamor-gbm.c -@@ -912,13 +912,8 @@ xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen) - struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen); - EGLint major, minor; - Bool egl_initialized = FALSE; -- static const EGLint config_attribs_core[] = { -- EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR, -- EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR, -- EGL_CONTEXT_MAJOR_VERSION_KHR, -- GLAMOR_GL_CORE_VER_MAJOR, -- EGL_CONTEXT_MINOR_VERSION_KHR, -- GLAMOR_GL_CORE_VER_MINOR, -+ static const EGLint config_attribs_gles2[] = { -+ EGL_CONTEXT_CLIENT_VERSION, 2, - EGL_NONE - }; - const GLubyte *renderer; -@@ -947,10 +942,10 @@ xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen) - goto error; - } - -- eglBindAPI(EGL_OPENGL_API); -+ eglBindAPI(EGL_OPENGL_ES_API); - - xwl_screen->egl_context = eglCreateContext( -- xwl_screen->egl_display, NULL, EGL_NO_CONTEXT, config_attribs_core); -+ xwl_screen->egl_display, NULL, EGL_NO_CONTEXT, config_attribs_gles2); - if (xwl_screen->egl_context == EGL_NO_CONTEXT) { - xwl_screen->egl_context = eglCreateContext( - xwl_screen->egl_display, NULL, EGL_NO_CONTEXT, NULL); --- -2.17.1 - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-xfree86-define-FOURCC_NV12-and-XVIMAGE_NV12.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-xfree86-define-FOURCC_NV12-and-XVIMAGE_NV12.patch deleted file mode 100644 index e0958558..00000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-xfree86-define-FOURCC_NV12-and-XVIMAGE_NV12.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3a6fe85a5f123f53319b5be8a69666174cad09cf Mon Sep 17 00:00:00 2001 -From: Julien Isorce <julien.isorce@gmail.com> -Date: Thu, 6 Sep 2018 15:38:13 -0700 -Subject: [PATCH 1/8] xfree86: define FOURCC_NV12 and XVIMAGE_NV12 - -Useful for glamor. - -Upstream-Status: Backport -Signed-off-by: Julien Isorce <jisorce@oblong.com> -Tested-by: Olivier Fourdan <ofourdan@redhat.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> ---- - hw/xfree86/common/fourcc.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/hw/xfree86/common/fourcc.h b/hw/xfree86/common/fourcc.h -index e6126b7fe..a19e6869e 100644 ---- a/hw/xfree86/common/fourcc.h -+++ b/hw/xfree86/common/fourcc.h -@@ -156,4 +156,24 @@ - XvTopToBottom \ - } - -+#define FOURCC_NV12 0x3231564e -+#define XVIMAGE_NV12 \ -+ { \ -+ FOURCC_NV12, \ -+ XvYUV, \ -+ LSBFirst, \ -+ {'N','V','1','2', \ -+ 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \ -+ 12, \ -+ XvPlanar, \ -+ 2, \ -+ 0, 0, 0, 0, \ -+ 8, 8, 8, \ -+ 1, 2, 2, \ -+ 1, 2, 2, \ -+ {'Y','U','V', \ -+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \ -+ XvTopToBottom \ -+ } -+ - #endif /* _XF86_FOURCC_H_ */ --- -2.17.1 - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0002-glamor-add-support-for-GL_RG.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0002-glamor-add-support-for-GL_RG.patch deleted file mode 100644 index 78988373..00000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0002-glamor-add-support-for-GL_RG.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 7f46b31e3d80ca769f68a4ffb201d0fc4801ea93 Mon Sep 17 00:00:00 2001 -From: Julien Isorce <julien.isorce@gmail.com> -Date: Thu, 6 Sep 2018 15:38:14 -0700 -Subject: [PATCH 2/8] glamor: add support for GL_RG - -Allow to upload the CbCr plane of an NV12 image into a GL texture. - -Upstream-Status: Backport -Signed-off-by: Julien Isorce <jisorce@oblong.com> -Tested-by: Olivier Fourdan <ofourdan@redhat.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> ---- - glamor/glamor.c | 2 ++ - glamor/glamor.h | 1 + - glamor/glamor_priv.h | 4 +++- - glamor/glamor_transfer.c | 10 ++++++++-- - glamor/glamor_utils.h | 4 ++++ - 5 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/glamor/glamor.c b/glamor/glamor.c -index abefef614..3e9cf284c 100644 ---- a/glamor/glamor.c -+++ b/glamor/glamor.c -@@ -222,6 +222,8 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth, - - pixmap_priv = glamor_get_pixmap_private(pixmap); - -+ pixmap_priv->is_cbcr = (usage == GLAMOR_CREATE_FORMAT_CBCR); -+ - format = gl_iformat_for_pixmap(pixmap); - - pitch = (((w * pixmap->drawable.bitsPerPixel + 7) / 8) + 3) & ~3; -diff --git a/glamor/glamor.h b/glamor/glamor.h -index be04bf858..e5992aa56 100644 ---- a/glamor/glamor.h -+++ b/glamor/glamor.h -@@ -129,6 +129,7 @@ extern _X_EXPORT Bool glamor_destroy_pixmap(PixmapPtr pixmap); - #define GLAMOR_CREATE_FBO_NO_FBO 0x103 - #define GLAMOR_CREATE_NO_LARGE 0x105 - #define GLAMOR_CREATE_PIXMAP_NO_TEXTURE 0x106 -+#define GLAMOR_CREATE_FORMAT_CBCR 0x107 - - /* @glamor_egl_exchange_buffers: Exchange the underlying buffers(KHR image,fbo). - * -diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h -index 4353a99f1..a14aaf624 100644 ---- a/glamor/glamor_priv.h -+++ b/glamor/glamor_priv.h -@@ -380,6 +380,8 @@ typedef struct glamor_pixmap_private { - * names. - */ - glamor_pixmap_fbo **fbo_array; -+ -+ Bool is_cbcr; - } glamor_pixmap_private; - - extern DevPrivateKeyRec glamor_pixmap_private_key; -@@ -902,7 +904,7 @@ int glamor_xv_put_image(glamor_port_private *port_priv, - Bool sync, - RegionPtr clipBoxes); - void glamor_xv_core_init(ScreenPtr screen); --void glamor_xv_render(glamor_port_private *port_priv); -+void glamor_xv_render(glamor_port_private *port_priv, int id); - - #include "glamor_utils.h" - -diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c -index ebb5101d1..421ed3a5f 100644 ---- a/glamor/glamor_transfer.c -+++ b/glamor/glamor_transfer.c -@@ -27,6 +27,7 @@ - void - glamor_format_for_pixmap(PixmapPtr pixmap, GLenum *format, GLenum *type) - { -+ glamor_pixmap_private *priv = glamor_get_pixmap_private(pixmap); - switch (pixmap->drawable.depth) { - case 24: - case 32: -@@ -38,8 +39,13 @@ glamor_format_for_pixmap(PixmapPtr pixmap, GLenum *format, GLenum *type) - *type = GL_UNSIGNED_INT_2_10_10_10_REV; - break; - case 16: -- *format = GL_RGB; -- *type = GL_UNSIGNED_SHORT_5_6_5; -+ if (priv->is_cbcr) { -+ *format = priv->fbo->format; -+ *type = GL_UNSIGNED_BYTE; -+ } else { -+ *format = GL_RGB; -+ *type = GL_UNSIGNED_SHORT_5_6_5; -+ } - break; - case 15: - *format = GL_BGRA; -diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h -index 0d5674d63..1890c1fe5 100644 ---- a/glamor/glamor_utils.h -+++ b/glamor/glamor_utils.h -@@ -613,10 +613,14 @@ gl_iformat_for_pixmap(PixmapPtr pixmap) - { - glamor_screen_private *glamor_priv = - glamor_get_screen_private((pixmap)->drawable.pScreen); -+ glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap); - - if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP && - ((pixmap)->drawable.depth == 1 || (pixmap)->drawable.depth == 8)) { - return glamor_priv->one_channel_format; -+ } else if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP && -+ (pixmap)->drawable.depth == 16 && pixmap_priv->is_cbcr) { -+ return GL_RG; - } else if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP && - (pixmap)->drawable.depth == 30) { - return GL_RGB10_A2; --- -2.17.1 - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch deleted file mode 100644 index beed6cb4..00000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001 -From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com> -Date: Mon, 30 Jan 2017 16:32:06 -0600 -Subject: [PATCH] Remove check for useSIGIO option - -Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO -option. - -As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO -and OsReleaseSIGIO. - -No longer the check for useSIGIO is needed - -Upstream-Status: Pending - -Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com> ---- - hw/xfree86/os-support/shared/sigio.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c -index 884a71c..be76498 100644 ---- a/hw/xfree86/os-support/shared/sigio.c -+++ b/hw/xfree86/os-support/shared/sigio.c -@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure) - int i; - int installed = FALSE; - -- if (!xf86Info.useSIGIO) -- return 0; -- - for (i = 0; i < MAX_FUNCS; i++) { - if (!xf86SigIOFuncs[i].f) { - if (xf86IsPipe(fd)) -@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd) - int max; - int ret; - -- if (!xf86Info.useSIGIO) -- return 0; -- - max = 0; - ret = 0; - for (i = 0; i < MAX_FUNCS; i++) { --- -2.7.4 - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0003-glamor-add-support-for-NV12-in-Xv.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0003-glamor-add-support-for-NV12-in-Xv.patch deleted file mode 100644 index 855d1938..00000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0003-glamor-add-support-for-NV12-in-Xv.patch +++ /dev/null @@ -1,322 +0,0 @@ -From 17a3528162304f1586329aabd606d3498bfe48a5 Mon Sep 17 00:00:00 2001 -From: Julien Isorce <julien.isorce@gmail.com> -Date: Tue, 11 Sep 2018 10:28:33 -0700 -Subject: [PATCH 3/8] glamor: add support for NV12 in Xv - -Useful when video decoders only output NV12. Currently -glamor Xv only supports I420 and YV12. - -Note that Intel's sna supports I420, YV12, YUY2, UYVY, NV12. - -Test: xvinfo | grep NV12 -Test: gst-launch-1.0 videotestsrc ! video/x-raw, format=NV12 ! xvimagesink - -v2: Combine the two texture2Ds on u_sampler. - -Upstream-Status: Backport -Signed-off-by: Julien Isorce <jisorce@oblong.com> -Tested-by: Olivier Fourdan <ofourdan@redhat.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> ---- - glamor/glamor_xv.c | 180 ++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 155 insertions(+), 25 deletions(-) - -diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c -index 62fc4fff5..6fef6ed0d 100644 ---- a/glamor/glamor_xv.c -+++ b/glamor/glamor_xv.c -@@ -59,8 +59,40 @@ typedef struct tagREF_TRANSFORM { - #define RTFContrast(a) (1.0 + ((a)*1.0)/1000.0) - #define RTFHue(a) (((a)*3.1416)/1000.0) - --static const glamor_facet glamor_facet_xv_planar = { -- .name = "xv_planar", -+static const glamor_facet glamor_facet_xv_planar_2 = { -+ .name = "xv_planar_2", -+ -+ .version = 120, -+ -+ .source_name = "v_texcoord0", -+ .vs_vars = ("attribute vec2 position;\n" -+ "attribute vec2 v_texcoord0;\n" -+ "varying vec2 tcs;\n"), -+ .vs_exec = (GLAMOR_POS(gl_Position, position) -+ " tcs = v_texcoord0;\n"), -+ -+ .fs_vars = ("uniform sampler2D y_sampler;\n" -+ "uniform sampler2D u_sampler;\n" -+ "uniform vec4 offsetyco;\n" -+ "uniform vec4 ucogamma;\n" -+ "uniform vec4 vco;\n" -+ "varying vec2 tcs;\n"), -+ .fs_exec = ( -+ " float sample;\n" -+ " vec2 sample_uv;\n" -+ " vec4 temp1;\n" -+ " sample = texture2D(y_sampler, tcs).w;\n" -+ " temp1.xyz = offsetyco.www * vec3(sample) + offsetyco.xyz;\n" -+ " sample_uv = texture2D(u_sampler, tcs).xy;\n" -+ " temp1.xyz = ucogamma.xyz * vec3(sample_uv.x) + temp1.xyz;\n" -+ " temp1.xyz = clamp(vco.xyz * vec3(sample_uv.y) + temp1.xyz, 0.0, 1.0);\n" -+ " temp1.w = 1.0;\n" -+ " gl_FragColor = temp1;\n" -+ ), -+}; -+ -+static const glamor_facet glamor_facet_xv_planar_3 = { -+ .name = "xv_planar_3", - - .version = 120, - -@@ -110,26 +142,50 @@ Atom glamorBrightness, glamorContrast, glamorSaturation, glamorHue, - XvImageRec glamor_xv_images[] = { - XVIMAGE_YV12, - XVIMAGE_I420, -+ XVIMAGE_NV12 - }; - int glamor_xv_num_images = ARRAY_SIZE(glamor_xv_images); - - static void --glamor_init_xv_shader(ScreenPtr screen) -+glamor_init_xv_shader(ScreenPtr screen, int id) - { - glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); - GLint sampler_loc; -+ const glamor_facet *glamor_facet_xv_planar = NULL; -+ -+ switch (id) { -+ case FOURCC_YV12: -+ case FOURCC_I420: -+ glamor_facet_xv_planar = &glamor_facet_xv_planar_3; -+ break; -+ case FOURCC_NV12: -+ glamor_facet_xv_planar = &glamor_facet_xv_planar_2; -+ break; -+ default: -+ break; -+ } - - glamor_build_program(screen, - &glamor_priv->xv_prog, -- &glamor_facet_xv_planar, NULL, NULL, NULL); -+ glamor_facet_xv_planar, NULL, NULL, NULL); - - glUseProgram(glamor_priv->xv_prog.prog); - sampler_loc = glGetUniformLocation(glamor_priv->xv_prog.prog, "y_sampler"); - glUniform1i(sampler_loc, 0); - sampler_loc = glGetUniformLocation(glamor_priv->xv_prog.prog, "u_sampler"); - glUniform1i(sampler_loc, 1); -- sampler_loc = glGetUniformLocation(glamor_priv->xv_prog.prog, "v_sampler"); -- glUniform1i(sampler_loc, 2); -+ -+ switch (id) { -+ case FOURCC_YV12: -+ case FOURCC_I420: -+ sampler_loc = glGetUniformLocation(glamor_priv->xv_prog.prog, "v_sampler"); -+ glUniform1i(sampler_loc, 2); -+ break; -+ case FOURCC_NV12: -+ break; -+ default: -+ break; -+ } - - } - -@@ -227,6 +283,21 @@ glamor_xv_query_image_attributes(int id, - offsets[2] = size; - size += tmp; - break; -+ case FOURCC_NV12: -+ *w = ALIGN(*w, 2); -+ *h = ALIGN(*h, 2); -+ size = ALIGN(*w, 4); -+ if (pitches) -+ pitches[0] = size; -+ size *= *h; -+ if (offsets) -+ offsets[1] = offsets[2] = size; -+ tmp = ALIGN(*w, 4); -+ if (pitches) -+ pitches[1] = pitches[2] = tmp; -+ tmp *= (*h >> 1); -+ size += tmp; -+ break; - } - return size; - } -@@ -240,7 +311,7 @@ static REF_TRANSFORM trans[2] = { - }; - - void --glamor_xv_render(glamor_port_private *port_priv) -+glamor_xv_render(glamor_port_private *port_priv, int id) - { - ScreenPtr screen = port_priv->pPixmap->drawable.pScreen; - glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); -@@ -264,7 +335,7 @@ glamor_xv_render(glamor_port_private *port_priv) - int dst_box_index; - - if (!glamor_priv->xv_prog.prog) -- glamor_init_xv_shader(screen); -+ glamor_init_xv_shader(screen, id); - - cont = RTFContrast(port_priv->contrast); - bright = RTFBrightness(port_priv->brightness); -@@ -293,6 +364,8 @@ glamor_xv_render(glamor_port_private *port_priv) - glamor_get_pixmap_private(port_priv->src_pix[i]); - pixmap_priv_get_scale(src_pixmap_priv[i], &src_xscale[i], - &src_yscale[i]); -+ } else { -+ src_pixmap_priv[i] = NULL; - } - } - glamor_make_current(glamor_priv); -@@ -319,12 +392,21 @@ glamor_xv_render(glamor_port_private *port_priv) - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - -- glActiveTexture(GL_TEXTURE2); -- glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[2]->fbo->tex); -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); -- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); -+ switch (id) { -+ case FOURCC_YV12: -+ case FOURCC_I420: -+ glActiveTexture(GL_TEXTURE2); -+ glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[2]->fbo->tex); -+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); -+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); -+ break; -+ case FOURCC_NV12: -+ break; -+ default: -+ break; -+ } - - glEnableVertexAttribArray(GLAMOR_VERTEX_POS); - glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); -@@ -336,7 +418,7 @@ glamor_xv_render(glamor_port_private *port_priv) - /* Set up a single primitive covering the area being drawn. We'll - * clip it to port_priv->clip using GL scissors instead of just - * emitting a GL_QUAD per box, because this way we hopefully avoid -- * diagonal tearing between the two trangles used to rasterize a -+ * diagonal tearing between the two triangles used to rasterize a - * GL_QUAD. - */ - i = 0; -@@ -417,6 +499,7 @@ glamor_xv_put_image(glamor_port_private *port_priv, - RegionPtr clipBoxes) - { - ScreenPtr pScreen = pDrawable->pScreen; -+ glamor_screen_private *glamor_priv = glamor_get_screen_private(pScreen); - int srcPitch, srcPitch2; - int top, nlines; - int s2offset, s3offset, tmp; -@@ -425,9 +508,16 @@ glamor_xv_put_image(glamor_port_private *port_priv, - s2offset = s3offset = srcPitch2 = 0; - - if (!port_priv->src_pix[0] || -- (width != port_priv->src_pix_w || height != port_priv->src_pix_h)) { -+ (width != port_priv->src_pix_w || height != port_priv->src_pix_h) || |