diff options
-rw-r--r-- | EULA | 156 | ||||
-rw-r--r-- | classes/fsl-eula-unpack.bbclass | 4 | ||||
-rw-r--r-- | recipes-bsp/imx-kobs/imx-kobs_git.bb | 6 | ||||
-rw-r--r-- | recipes-bsp/imx-uuc/imx-uuc_git.bb | 6 | ||||
-rw-r--r-- | recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb (renamed from recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb) | 10 | ||||
-rw-r--r-- | recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb (renamed from recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb) | 17 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb | 2 | ||||
-rw-r--r-- | recipes-extended/jailhouse/jailhouse-imx_git.bb | 44 | ||||
-rw-r--r-- | recipes-extended/jailhouse/jailhouse/0001-tools-scripts-update-shebang-to-python3.patch | 69 | ||||
-rw-r--r-- | recipes-fsl/mcore-demos/README | 10 | ||||
-rw-r--r-- | recipes-fsl/mcore-demos/imx-m33-demos_2.14.2.bb | 12 | ||||
-rw-r--r-- | recipes-graphics/cairo/cairo_%.bbappend | 3 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_6.1.bb | 23 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-lts_6.1.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx-headers_6.1.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx_6.1.bb | 6 |
16 files changed, 168 insertions, 208 deletions
@@ -1,12 +1,12 @@ | |||
1 | LA_OPT_NXP_Software_License v48 July 2023 | 1 | LA_OPT_NXP_Software_License v49 September 2023 |
2 | IMPORTANT. Read the following NXP Software License Agreement (“Agreement”) | 2 | IMPORTANT. Read the following NXP Software License Agreement ("Agreement") |
3 | completely. By selecting the “I Accept” button at the end of this page, or | 3 | completely. By selecting the "I Accept" button at the end of this page, or by |
4 | by downloading, installing, or using the Licensed Software, you indicate that | 4 | downloading, installing, or using the Licensed Software, you indicate that you |
5 | you accept the terms of the Agreement, and you acknowledge that you have the | 5 | accept the terms of the Agreement, and you acknowledge that you have the |
6 | authority, for yourself or on behalf of your company, to bind your company to | 6 | authority, for yourself or on behalf of your company, to bind your company to |
7 | these terms. You may then download or install the file. In the event of a | 7 | these terms. You may then download or install the file. In the event of a |
8 | conflict between the terms of this Agreement and any license terms and | 8 | conflict between the terms of this Agreement and any license terms and |
9 | conditions for NXP’s proprietary software embedded anywhere in the Licensed | 9 | conditions for NXP's proprietary software embedded anywhere in the Licensed |
10 | Software file, the terms of this Agreement shall control. If a separate | 10 | Software file, the terms of this Agreement shall control. If a separate |
11 | license agreement for the Licensed Software has been signed by you and NXP, | 11 | license agreement for the Licensed Software has been signed by you and NXP, |
12 | then that agreement shall govern your use of the Licensed Software and shall | 12 | then that agreement shall govern your use of the Licensed Software and shall |
@@ -14,51 +14,51 @@ supersede this Agreement. | |||
14 | 14 | ||
15 | NXP SOFTWARE LICENSE AGREEMENT | 15 | NXP SOFTWARE LICENSE AGREEMENT |
16 | This is a legal agreement between your employer, of which you are an authorized | 16 | This is a legal agreement between your employer, of which you are an authorized |
17 | representative, or, if you have no employer, you as an individual (“you” or | 17 | representative, or, if you have no employer, you as an individual ("you" or |
18 | “Licensee”), and NXP B.V. (“NXP”). It concerns your rights to use the | 18 | "Licensee"), and NXP B.V. ("NXP"). It concerns your rights to use the software |
19 | software provided to you in binary or source code form and any accompanying | 19 | provided to you in binary or source code form and any accompanying written |
20 | written materials (the “Licensed Software”). The Licensed Software may | 20 | materials (the "Licensed Software"). The Licensed Software may include any |
21 | include any updates or error corrections or documentation relating to the | 21 | updates or error corrections or documentation relating to the Licensed Software |
22 | Licensed Software provided to you by NXP under this Agreement. In consideration | 22 | provided to you by NXP under this Agreement. In consideration for NXP allowing |
23 | for NXP allowing you to access the Licensed Software, you are agreeing to be | 23 | you to access the Licensed Software, you are agreeing to be bound by the terms |
24 | bound by the terms of this Agreement. If you do not agree to all of the terms | 24 | of this Agreement. If you do not agree to all of the terms of this Agreement, |
25 | of this Agreement, do not download or install the Licensed Software. If you | 25 | do not download or install the Licensed Software. If you change your mind |
26 | change your mind later, stop using the Licensed Software and delete all copies | 26 | later, stop using the Licensed Software and delete all copies of the Licensed |
27 | of the Licensed Software in your possession or control. Any copies of the | 27 | Software in your possession or control. Any copies of the Licensed Software |
28 | Licensed Software that you have already distributed, where permitted, and do | 28 | that you have already distributed, where permitted, and do not destroy will |
29 | not destroy will continue to be governed by this Agreement. Your prior use will | 29 | continue to be governed by this Agreement. Your prior use will also continue to |
30 | also continue to be governed by this Agreement. | 30 | be governed by this Agreement. |
31 | 1. DEFINITIONS | 31 | 1. DEFINITIONS |
32 | 1.1. “Affiliate” means, with respect to a party, any corporation or | 32 | 1.1. "Affiliate" means, with respect to a party, any corporation or |
33 | other legal entity that now or hereafter Controls, is Controlled by or is under | 33 | other legal entity that now or hereafter Controls, is Controlled by or is under |
34 | common Control with such party; where “Control” means the direct or | 34 | common Control with such party; where "Control" means the direct or indirect |
35 | indirect ownership of greater than fifty percent (50%) of the shares or similar | 35 | ownership of greater than fifty percent (50%) of the shares or similar |
36 | interests entitled to vote for the election of directors or other persons | 36 | interests entitled to vote for the election of directors or other persons |
37 | performing similar functions. An entity is considered an Affiliate only so long | 37 | performing similar functions. An entity is considered an Affiliate only so long |
38 | as such Control exists. | 38 | as such Control exists. |
39 | 1.2 “Authorized System” means either (i) Licensee’s hardware product | 39 | 1.2 "Authorized System" means either (i) Licensee's hardware product which |
40 | which incorporates an NXP Product or (ii) Licensee’s software program which | 40 | incorporates an NXP Product or (ii) Licensee's software program which is used |
41 | is used exclusively in connection with an NXP Product and with which the | 41 | exclusively in connection with an NXP Product and with which the Licensed |
42 | Licensed Software will be integrated. | 42 | Software will be integrated. |
43 | 1.3. “Derivative Work” means a work based upon one or more pre-existing | 43 | 1.3. "Derivative Work" means a work based upon one or more pre-existing |
44 | works. A work consisting of editorial revisions, annotations, elaborations, or | 44 | works. A work consisting of editorial revisions, annotations, elaborations, or |
45 | other modifications which, as a whole, represent an original work of | 45 | other modifications which, as a whole, represent an original work of |
46 | authorship, is a Derivative Work. | 46 | authorship, is a Derivative Work. |
47 | 1.4 “Intellectual Property Rights” means any and all rights under | 47 | 1.4 "Intellectual Property Rights" means any and all rights under statute, |
48 | statute, common law or equity in and under copyrights, trade secrets, and | 48 | common law or equity in and under copyrights, trade secrets, and patents |
49 | patents (including utility models), and analogous rights throughout the world, | 49 | (including utility models), and analogous rights throughout the world, |
50 | including any applications for and the right to apply for, any of the foregoing. | 50 | including any applications for and the right to apply for, any of the foregoing. |
51 | 1.5 “NXP Product” means a hardware product (e.g. a microprocessor, | 51 | 1.5 "NXP Product" means a hardware product (e.g. a microprocessor, |
52 | microcontroller, sensor or digital signal processor) and/or services (e.g. | 52 | microcontroller, sensor or digital signal processor) and/or services (e.g. |
53 | cloud platform services) supplied directly or indirectly from NXP or an NXP | 53 | cloud platform services) supplied directly or indirectly from NXP or an NXP |
54 | Affiliate, unless there is a product specified in the Software Content | 54 | Affiliate, unless there is a product specified in the Software Content |
55 | Register, in which case this definition is limited to such product. | 55 | Register, in which case this definition is limited to such product. |
56 | 1.6 “Software Content Register” means the documentation which may | 56 | 1.6 "Software Content Register" means the documentation which may |
57 | accompany the Licensed Software which identifies the contents of the Licensed | 57 | accompany the Licensed Software which identifies the contents of the Licensed |
58 | Software, including but not limited to identification of any Third Party | 58 | Software, including but not limited to identification of any Third Party |
59 | Software, if any, and may also contain other related information as whether the | 59 | Software, if any, and may also contain other related information as whether the |
60 | license in 2.3 is applicable. | 60 | license in 2.3 is applicable. |
61 | 1.7 “Third Party Software” means, any software included in the Licensed | 61 | 1.7 "Third Party Software" means, any software included in the Licensed |
62 | Software that is not NXP proprietary software, and is not open source software, | 62 | Software that is not NXP proprietary software, and is not open source software, |
63 | and to which different license terms may apply. | 63 | and to which different license terms may apply. |
64 | 2. LICENSE GRANT. | 64 | 2. LICENSE GRANT. |
@@ -96,8 +96,8 @@ Licensed Software (and its Derivative Works prepared under the license in | |||
96 | 2.2(b)) in object code (machine readable format) only as part of, or embedded | 96 | 2.2(b)) in object code (machine readable format) only as part of, or embedded |
97 | within, Authorized Systems and not on a standalone basis solely for use in | 97 | within, Authorized Systems and not on a standalone basis solely for use in |
98 | combination with a NXP Product. Notwithstanding the foregoing, those files | 98 | combination with a NXP Product. Notwithstanding the foregoing, those files |
99 | marked as .h files (“Header files”) may be distributed in source or object | 99 | marked as .h files ("Header files") may be distributed in source or object code |
100 | code form, but only as part of, or embedded within Authorized Systems; and | 100 | form, but only as part of, or embedded within Authorized Systems; and |
101 | (b) to copy and distribute as needed, solely in connection with an | 101 | (b) to copy and distribute as needed, solely in connection with an |
102 | Authorized System and for use in combination with a NXP Product, | 102 | Authorized System and for use in combination with a NXP Product, |
103 | non-confidential NXP information provided as part of the Licensed Software for | 103 | non-confidential NXP information provided as part of the Licensed Software for |
@@ -113,7 +113,7 @@ Appendix A. | |||
113 | 2.2 and Section 2.3, if any, so long as you have an agreement in place with the | 113 | 2.2 and Section 2.3, if any, so long as you have an agreement in place with the |
114 | subcontractor containing confidentiality restrictions no less stringent than | 114 | subcontractor containing confidentiality restrictions no less stringent than |
115 | those contained in this Agreement. You will remain liable for your | 115 | those contained in this Agreement. You will remain liable for your |
116 | subcontractors’ adherence to the terms of this Agreement and for any and all | 116 | subcontractors' adherence to the terms of this Agreement and for any and all |
117 | acts and omissions of such subcontractors with respect to this Agreement and | 117 | acts and omissions of such subcontractors with respect to this Agreement and |
118 | the Licensed Software. | 118 | the Licensed Software. |
119 | 3. LICENSE LIMITATIONS AND RESTRICTIONS. | 119 | 3. LICENSE LIMITATIONS AND RESTRICTIONS. |
@@ -121,7 +121,7 @@ the Licensed Software. | |||
121 | Intellectual Property Rights that would be infringed by the unmodified Licensed | 121 | Intellectual Property Rights that would be infringed by the unmodified Licensed |
122 | Software prior to your preparation of any Derivative Work. | 122 | Software prior to your preparation of any Derivative Work. |
123 | 3.2. The Licensed Software is licensed to you, not sold. Title to | 123 | 3.2. The Licensed Software is licensed to you, not sold. Title to |
124 | Licensed Software delivered hereunder remains vested in NXP or NXP’s licensor | 124 | Licensed Software delivered hereunder remains vested in NXP or NXP's licensor |
125 | and cannot be assigned or transferred. You are expressly forbidden from selling | 125 | and cannot be assigned or transferred. You are expressly forbidden from selling |
126 | or otherwise distributing the Licensed Software, or any portion thereof, except | 126 | or otherwise distributing the Licensed Software, or any portion thereof, except |
127 | as expressly permitted herein. This Agreement does not grant to you any implied | 127 | as expressly permitted herein. This Agreement does not grant to you any implied |
@@ -132,12 +132,12 @@ prohibits such restriction. You must prohibit your subcontractors or customers | |||
132 | (if distribution is permitted) from translating, reverse engineering, | 132 | (if distribution is permitted) from translating, reverse engineering, |
133 | decompiling, or disassembling the Licensed Software except to the extent | 133 | decompiling, or disassembling the Licensed Software except to the extent |
134 | applicable law specifically prohibits such restriction. | 134 | applicable law specifically prohibits such restriction. |
135 | 3.4. You must reproduce any and all of NXP’s (or its third-party | 135 | 3.4. You must reproduce any and all of NXP's (or its third-party |
136 | licensor’s) copyright notices and other proprietary legends on copies of | 136 | licensor's) copyright notices and other proprietary legends on copies of |
137 | Licensed Software. | 137 | Licensed Software. |
138 | 3.5. If you distribute the Licensed Software to the United States | 138 | 3.5. If you distribute the Licensed Software to the United States |
139 | Government, then the Licensed Software is “restricted computer software” | 139 | Government, then the Licensed Software is "restricted computer software" and is |
140 | and is subject to FAR 52.227-19. | 140 | subject to FAR 52.227-19. |
141 | 3.6. You grant to NXP a non-exclusive, non-transferable, irrevocable, | 141 | 3.6. You grant to NXP a non-exclusive, non-transferable, irrevocable, |
142 | perpetual, worldwide, royalty-free, sub-licensable license under your | 142 | perpetual, worldwide, royalty-free, sub-licensable license under your |
143 | Intellectual Property Rights to use without restriction and for any purpose any | 143 | Intellectual Property Rights to use without restriction and for any purpose any |
@@ -218,14 +218,14 @@ any obligation to notify or provide updated versions of the Licensed Software | |||
218 | to you. | 218 | to you. |
219 | 9. NO WARRANTY. To the maximum extent permitted by law, NXP expressly | 219 | 9. NO WARRANTY. To the maximum extent permitted by law, NXP expressly |
220 | disclaims any warranty for the Licensed Software. The Licensed Software is | 220 | disclaims any warranty for the Licensed Software. The Licensed Software is |
221 | provided “AS IS”, without warranty of any kind, either express or implied, | 221 | provided "AS IS", without warranty of any kind, either express or implied, |
222 | including without limitation the implied warranties of merchantability, fitness | 222 | including without limitation the implied warranties of merchantability, fitness |
223 | for a particular purpose, or non-infringement. You assume the entire risk | 223 | for a particular purpose, or non-infringement. You assume the entire risk |
224 | arising out of the use or performance of the licensed software, or any systems | 224 | arising out of the use or performance of the licensed software, or any systems |
225 | you design using the licensed software (if any). | 225 | you design using the licensed software (if any). |
226 | 10. INDEMNITY. You agree to fully defend and indemnify NXP from all | 226 | 10. INDEMNITY. You agree to fully defend and indemnify NXP from all |
227 | claims, liabilities, and costs (including reasonable attorney’s fees) related | 227 | claims, liabilities, and costs (including reasonable attorney's fees) related |
228 | to (1) your use (including your subcontractor’s or distributee’s use, if | 228 | to (1) your use (including your subcontractor's or distributee's use, if |
229 | permitted) of the Licensed Software or (2) your violation of the terms and | 229 | permitted) of the Licensed Software or (2) your violation of the terms and |
230 | conditions of this Agreement. | 230 | conditions of this Agreement. |
231 | 11. LIMITATION OF LIABILITY. EXCLUDING LIABILITY FOR A BREACH OF | 231 | 11. LIMITATION OF LIABILITY. EXCLUDING LIABILITY FOR A BREACH OF |
@@ -235,7 +235,7 @@ IN NO EVENT WILL EITHER PARTY BE LIABLE, WHETHER IN CONTRACT, TORT, OR | |||
235 | OTHERWISE, FOR ANY INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL OR PUNITIVE | 235 | OTHERWISE, FOR ANY INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL OR PUNITIVE |
236 | DAMAGES, INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR ANY LOSS OF USE, LOSS OF | 236 | DAMAGES, INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR ANY LOSS OF USE, LOSS OF |
237 | TIME, INCONVENIENCE, COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR REVENUES, TO | 237 | TIME, INCONVENIENCE, COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR REVENUES, TO |
238 | THE FULL EXTENT SUCH MAY BE DISCLAIMED BY LAW. NXP’S TOTAL LIABILITY FOR ALL | 238 | THE FULL EXTENT SUCH MAY BE DISCLAIMED BY LAW. NXP'S TOTAL LIABILITY FOR ALL |
239 | COSTS, DAMAGES, CLAIMS, OR LOSSES WHATSOEVER ARISING OUT OF OR IN CONNECTION | 239 | COSTS, DAMAGES, CLAIMS, OR LOSSES WHATSOEVER ARISING OUT OF OR IN CONNECTION |
240 | WITH THIS AGREEMENT OR PRODUCT(S) SUPPLIED UNDER THIS AGREEMENT IS LIMITED TO | 240 | WITH THIS AGREEMENT OR PRODUCT(S) SUPPLIED UNDER THIS AGREEMENT IS LIMITED TO |
241 | THE AGGREGATE AMOUNT PAID BY YOU TO NXP IN CONNECTION WITH THE LICENSED | 241 | THE AGGREGATE AMOUNT PAID BY YOU TO NXP IN CONNECTION WITH THE LICENSED |
@@ -243,8 +243,8 @@ SOFTWARE PROVIDED UNDER THIS AGREEMENT TO WHICH LOSSES OR DAMAGES ARE CLAIMED. | |||
243 | 12. EXPORT COMPLIANCE. Each party shall comply with all applicable | 243 | 12. EXPORT COMPLIANCE. Each party shall comply with all applicable |
244 | export and import control laws and regulations including but not limited to the | 244 | export and import control laws and regulations including but not limited to the |
245 | US Export Administration Regulation (including restrictions on certain military | 245 | US Export Administration Regulation (including restrictions on certain military |
246 | end uses and military end users as specified in Section 15 C.F.R. § 744.21 and | 246 | end uses and military end users as specified in Section 15 C.F.R. § 744.21 |
247 | prohibited party lists issued by other federal governments), Catch-all | 247 | and prohibited party lists issued by other federal governments), Catch-all |
248 | regulations and all national and international embargoes. Each party further | 248 | regulations and all national and international embargoes. Each party further |
249 | agrees that it will not knowingly transfer, divert, export or re-export, | 249 | agrees that it will not knowingly transfer, divert, export or re-export, |
250 | directly or indirectly, any product, software, including software source code, | 250 | directly or indirectly, any product, software, including software source code, |
@@ -264,9 +264,9 @@ warranties whatsoever about compliance with government or public entity | |||
264 | acquisition statutes or regulations, including, without limitation, statutes or | 264 | acquisition statutes or regulations, including, without limitation, statutes or |
265 | regulations that may relate to pricing, quality, origin or content. | 265 | regulations that may relate to pricing, quality, origin or content. |
266 | 13.2. The Licensed Software has been developed at private expense and is a | 266 | 13.2. The Licensed Software has been developed at private expense and is a |
267 | “Commercial Item” as defined in 48 C.F.R. Section 2.101, consisting of | 267 | "Commercial Item" as defined in 48 C.F.R. Section 2.101, consisting of |
268 | “Commercial Computer Software”, and/or “Commercial Computer Software | 268 | "Commercial Computer Software", and/or "Commercial Computer Software |
269 | Documentation,” as such terms are used in 48 C.F.R. Section 12.212 (or 48 | 269 | Documentation," as such terms are used in 48 C.F.R. Section 12.212 (or 48 |
270 | C.F.R. Section 227.7202, as applicable) and may only be licensed to or shared | 270 | C.F.R. Section 227.7202, as applicable) and may only be licensed to or shared |
271 | with U.S. Government end users in object code form as part of, or embedded | 271 | with U.S. Government end users in object code form as part of, or embedded |
272 | within, Authorized Systems. Any agreement pursuant to which you share the | 272 | within, Authorized Systems. Any agreement pursuant to which you share the |
@@ -277,19 +277,19 @@ limitations. | |||
277 | software for use in the development of, or for incorporation into, products or | 277 | software for use in the development of, or for incorporation into, products or |
278 | services (a) used in applications requiring fail-safe performance or (b) in | 278 | services (a) used in applications requiring fail-safe performance or (b) in |
279 | which failure could lead to death, personal injury, or severe physical or | 279 | which failure could lead to death, personal injury, or severe physical or |
280 | environmental damage (these products and services are referred to as | 280 | environmental damage (these products and services are referred to as "Critical |
281 | “Critical Applications”). NXP’s goal is to educate customers so that they | 281 | Applications"). NXP's goal is to educate customers so that they can design |
282 | can design their own end-product solutions to meet applicable functional safety | 282 | their own end-product solutions to meet applicable functional safety standards |
283 | standards and requirements. Licensee makes the ultimate design decisions | 283 | and requirements. Licensee makes the ultimate design decisions regarding its |
284 | regarding its products and is solely responsible for compliance with all legal, | 284 | products and is solely responsible for compliance with all legal, regulatory, |
285 | regulatory, safety, and security related requirements concerning its products, | 285 | safety, and security related requirements concerning its products, regardless |
286 | regardless of any information or support that may be provided by NXP. As such, | 286 | of any information or support that may be provided by NXP. As such, Licensee |
287 | Licensee assumes all risk related to use of the Licensed Software in Critical | 287 | assumes all risk related to use of the Licensed Software in Critical |
288 | Applications and NXP SHALL NOT BE LIABLE FOR ANY SUCH USE IN CRITICAL | 288 | Applications and NXP SHALL NOT BE LIABLE FOR ANY SUCH USE IN CRITICAL |
289 | APPLICATIONS BY LICENSEE. Accordingly, Licensee will indemnify and hold NXP | 289 | APPLICATIONS BY LICENSEE. Accordingly, Licensee will indemnify and hold NXP |
290 | harmless from any claims, liabilities, damages and associated costs and | 290 | harmless from any claims, liabilities, damages and associated costs and |
291 | expenses (including attorneys’ fees) that NXP may incur related to | 291 | expenses (including attorneys' fees) that NXP may incur related to Licensee's |
292 | Licensee’s incorporation of the Licensed Software in a Critical Application. | 292 | incorporation of the Licensed Software in a Critical Application. |
293 | 15. CHOICE OF LAW; VENUE. This Agreement will be governed by, | 293 | 15. CHOICE OF LAW; VENUE. This Agreement will be governed by, |
294 | construed, and enforced in accordance with the laws of The Netherlands, without | 294 | construed, and enforced in accordance with the laws of The Netherlands, without |
295 | regard to conflicts of laws principles, will apply to all matters relating to | 295 | regard to conflicts of laws principles, will apply to all matters relating to |
@@ -335,7 +335,7 @@ subsequent breach of the same or a different provision. | |||
335 | to your compliance with the limited license rights granted under this Agreement | 335 | to your compliance with the limited license rights granted under this Agreement |
336 | for three years following expiration or termination of this Agreement. NXP will | 336 | for three years following expiration or termination of this Agreement. NXP will |
337 | have the right, either itself or through an independent certified public | 337 | have the right, either itself or through an independent certified public |
338 | accountant to examine and audit, at NXP’s expense, not more than once a year, | 338 | accountant to examine and audit, at NXP's expense, not more than once a year, |
339 | and during normal business hours, all such records that may bear upon your | 339 | and during normal business hours, all such records that may bear upon your |
340 | compliance with the limited license rights granted above. You must make prompt | 340 | compliance with the limited license rights granted above. You must make prompt |
341 | adjustment to compensate for any errors and/or omissions disclosed by such | 341 | adjustment to compensate for any errors and/or omissions disclosed by such |
@@ -365,9 +365,9 @@ or delayed. NXP may assign this Agreement, or any part of this Agreement, in | |||
365 | its sole discretion. | 365 | its sole discretion. |
366 | 25. PRIVACY. By agreeing to this Agreement and/or utilizing the Licensed | 366 | 25. PRIVACY. By agreeing to this Agreement and/or utilizing the Licensed |
367 | Software, Licensee consents to use of certain personal information, including | 367 | Software, Licensee consents to use of certain personal information, including |
368 | but not limited to name, email address, and location, for the purpose of | 368 | but not limited to name, email address, and location, for the purpose of NXP's |
369 | NXP’s internal analysis regarding future software offerings. NXP’s | 369 | internal analysis regarding future software offerings. NXP's complete Privacy |
370 | complete Privacy Statement can be found at: | 370 | Statement can be found at: |
371 | https://www.nxp.com/company/our-company/about-nxp/privacy-statement:PRIVACYPRACT | 371 | https://www.nxp.com/company/our-company/about-nxp/privacy-statement:PRIVACYPRACT |
372 | ICES. | 372 | ICES. |
373 | 373 | ||
@@ -382,18 +382,28 @@ Party Software or specific components of the NXP proprietary software, the | |||
382 | following terms apply to the extent they deviate from the terms in the | 382 | following terms apply to the extent they deviate from the terms in the |
383 | Agreement: | 383 | Agreement: |
384 | 384 | ||
385 | AGGIOS, Inc.: EnergyLab LITE and Seed software are distributed by NXP under | ||
386 | license from AGGIOS, Inc. Your use of AGGIOS software, as the Licensee, is | ||
387 | subject to the following: (i) use of AGGIOS software is limited to object code | ||
388 | and Authorized System only; (ii) Licensee may not sublicense the AGGIOS | ||
389 | software to any third party; (iii) Licensee is only granted an evaluation | ||
390 | license for the Seed software, defined as license to use the Seed software | ||
391 | internally for own evaluation purposes, limited to three (3) months. Further | ||
392 | rights including but not limited to production deployment must be obtained | ||
393 | directly from AGGIOS, Inc. | ||
394 | |||
385 | Airbiquity Inc.: The Airbiquity software may only be used in object code and | 395 | Airbiquity Inc.: The Airbiquity software may only be used in object code and |
386 | Licensee may not sublicense the Airbiquity software to any third party. | 396 | Licensee may not sublicense the Airbiquity software to any third party. |
387 | Licensee’s license to use the Airbiquity software expires on June 30, 2024. | 397 | Licensee's license to use the Airbiquity software expires on June 30, 2024. |
388 | 398 | ||
389 | Amazon: Use of the Amazon software constitutes your acceptance of the terms of | 399 | Amazon: Use of the Amazon software constitutes your acceptance of the terms of |
390 | the Amazon Program Materials License Agreement (including the AVS Component | 400 | the Amazon Program Materials License Agreement (including the AVS Component |
391 | Schedule, if applicable), located at | 401 | Schedule, if applicable), located at |
392 | https://developer.amazon.com/support/legal/pml. All Amazon software is hereby | 402 | https://developer.amazon.com/support/legal/pml. All Amazon software is hereby |
393 | designated “Amazon confidential”. With the exception of the binary library | 403 | designated "Amazon confidential". With the exception of the binary library of |
394 | of the Amazon Wake Word Engine for “Alexa”, all Amazon software is also | 404 | the Amazon Wake Word Engine for "Alexa", all Amazon software is also hereby |
395 | hereby designated as “Restricted Program Materials”. Amazon is a | 405 | designated as "Restricted Program Materials". Amazon is a third-party |
396 | third-party beneficiary to this Agreement with respect to the Amazon software. | 406 | beneficiary to this Agreement with respect to the Amazon software. |
397 | 407 | ||
398 | Amazon Web Services, Inc.: AWS is an intended third-party beneficiary to this | 408 | Amazon Web Services, Inc.: AWS is an intended third-party beneficiary to this |
399 | Agreement with respect to the Greengrass software. If you have an account with | 409 | Agreement with respect to the Greengrass software. If you have an account with |
@@ -463,7 +473,7 @@ distribution of one copy embedded in a single NXP Product. Your use of Cadence | |||
463 | NatureDSP Libraries whether in source code or in binary is restricted to NXP | 473 | NatureDSP Libraries whether in source code or in binary is restricted to NXP |
464 | SoC based systems or emulation enablement based on NXP SoC. | 474 | SoC based systems or emulation enablement based on NXP SoC. |
465 | 475 | ||
466 | CEVA D.S.P. Ltd. And CEVA Technologies Inc. (“CEVA”): The CEVA-SPF2 linear | 476 | CEVA D.S.P. Ltd. And CEVA Technologies Inc. ("CEVA"): The CEVA-SPF2 linear |
467 | algebra, CEVA-SPF2 Neural Network Libraries, CEVA-SPF2 Core Libraries, | 477 | algebra, CEVA-SPF2 Neural Network Libraries, CEVA-SPF2 Core Libraries, |
468 | CEVA-SPF2 OpenAMP and CEVA-SPF2 STL licensed modules are owned by CEVA and such | 478 | CEVA-SPF2 OpenAMP and CEVA-SPF2 STL licensed modules are owned by CEVA and such |
469 | materials may only be used in connection with an NXP product containing the | 479 | materials may only be used in connection with an NXP product containing the |
@@ -496,8 +506,8 @@ Cypress Semiconductor Corporation: WWD RTOS source code may only be used in | |||
496 | accordance with the Cypress IOT Community License Agreement obtained directly | 506 | accordance with the Cypress IOT Community License Agreement obtained directly |
497 | from Cypress Semiconductor Corporation. | 507 | from Cypress Semiconductor Corporation. |
498 | 508 | ||
499 | Elektrobit Automotive GmbH (“EB”): EB software must be used consistent with | 509 | Elektrobit Automotive GmbH ("EB"): EB software must be used consistent with the |
500 | the EB License Terms and Conditions, Version 1.4 (Dec 2019) found here: | 510 | EB License Terms and Conditions, Version 1.4 (Dec 2019) found here: |
501 | https://www.elektrobit.com/legal-notice/ . Licensee is only granted an | 511 | https://www.elektrobit.com/legal-notice/ . Licensee is only granted an |
502 | evaluation license for the EB software, defined as license to use the EB | 512 | evaluation license for the EB software, defined as license to use the EB |
503 | software internally for own evaluation purposes, limited to three (3) months. | 513 | software internally for own evaluation purposes, limited to three (3) months. |
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index e41679e6..56d2844c 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass | |||
@@ -57,6 +57,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V45 = "63a38e9f392d8813d6f1f4d0 | |||
57 | FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V46 = "673fa34349fa40f59e0713cb0ac22b1f" | 57 | FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V46 = "673fa34349fa40f59e0713cb0ac22b1f" |
58 | FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V47 = "9135422c7a38dac21bf1f858b6ef3bac" | 58 | FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V47 = "9135422c7a38dac21bf1f858b6ef3bac" |
59 | FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48 = "db4762b09b6bda63da103963e6e081de" | 59 | FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48 = "db4762b09b6bda63da103963e6e081de" |
60 | FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49 = "2827219e81f28aba7c6a569f7c437fa7" | ||
60 | 61 | ||
61 | FSL_EULA_FILE_MD5SUMS = " \ | 62 | FSL_EULA_FILE_MD5SUMS = " \ |
62 | ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \ | 63 | ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \ |
@@ -110,11 +111,12 @@ FSL_EULA_FILE_MD5SUMS = " \ | |||
110 | ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V46} \ | 111 | ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V46} \ |
111 | ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V47} \ | 112 | ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V47} \ |
112 | ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48} \ | 113 | ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48} \ |
114 | ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49} \ | ||
113 | " | 115 | " |
114 | 116 | ||
115 | # The checksum for the EULA in the layer | 117 | # The checksum for the EULA in the layer |
116 | FSL_EULA_FILE_MD5SUM ?= \ | 118 | FSL_EULA_FILE_MD5SUM ?= \ |
117 | "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V48}" | 119 | "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V49}" |
118 | 120 | ||
119 | LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}" | 121 | LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}" |
120 | LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE" | 122 | LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE" |
diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb index c8880d49..bdb02475 100644 --- a/recipes-bsp/imx-kobs/imx-kobs_git.bb +++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb | |||
@@ -1,17 +1,17 @@ | |||
1 | # Copyright (C) 2013-2016 Freescale Semiconductor | 1 | # Copyright (C) 2013-2016 Freescale Semiconductor |
2 | # Copyright (C) 2017-2019 NXP | 2 | # Copyright (C) 2017-2019,2024 NXP |
3 | # Copyright 2018 (C) O.S. Systems Software LTDA. | 3 | # Copyright 2018 (C) O.S. Systems Software LTDA. |
4 | 4 | ||
5 | SUMMARY = "Nand boot write source" | 5 | SUMMARY = "Nand boot write source" |
6 | SECTION = "base" | 6 | SECTION = "base" |
7 | LICENSE = "GPL-2.0-only" | 7 | LICENSE = "GPL-2.0-only" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" |
9 | 9 | ||
10 | PV = "5.5+git${SRCPV}" | 10 | PV = "5.5+git${SRCPV}" |
11 | SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https;branch=master \ |
12 | file://0001-Add-missing-includes-as-pointed-out-by-musl.patch \ | 12 | file://0001-Add-missing-includes-as-pointed-out-by-musl.patch \ |
13 | " | 13 | " |
14 | SRCREV = "269fdffcf97238684de9f28977a73677282e061f" | 14 | SRCREV = "ff13a99a22aa73cca0e09a33c2ebb6a94ad698da" |
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | inherit autotools pkgconfig | 17 | inherit autotools pkgconfig |
diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb index 4b4915e5..49fc1558 100644 --- a/recipes-bsp/imx-uuc/imx-uuc_git.bb +++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb | |||
@@ -1,10 +1,10 @@ | |||
1 | # Copyright (C) 2016 Freescale Semiconductor | 1 | # Copyright (C) 2016 Freescale Semiconductor |
2 | # Copyright (C) 2017-2019 NXP | 2 | # Copyright (C) 2017-2019,2024 NXP |
3 | SUMMARY = "A Daemon wait for NXP mfgtools host's command" | 3 | SUMMARY = "A Daemon wait for NXP mfgtools host's command" |
4 | SECTION = "base" | 4 | SECTION = "base" |
5 | DEPENDS = "virtual/kernel dosfstools-native" | 5 | DEPENDS = "virtual/kernel dosfstools-native" |
6 | LICENSE = "GPL-2.0-only" | 6 | LICENSE = "GPL-2.0-only" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
8 | 8 | ||
9 | inherit autotools-brokensep | 9 | inherit autotools-brokensep |
10 | 10 | ||
@@ -12,7 +12,7 @@ PR = "r1" | |||
12 | PV = "0.5.1+git${SRCPV}" | 12 | PV = "0.5.1+git${SRCPV}" |
13 | 13 | ||
14 | SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master" | 14 | SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master" |
15 | SRCREV = "61f258fb6f10f690633eb068a8d4aaaba5e5e8a2" | 15 | SRCREV = "9b4adc0cde346fbae743dc21fcf5115488307b83" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb index ee839cd9..0ab44074 100644 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb | |||
@@ -2,20 +2,16 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "Basler camera binary drivers" | 3 | DESCRIPTION = "Basler camera binary drivers" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" |
6 | 6 | ||
7 | inherit fsl-eula-unpack | 7 | inherit fsl-eula-unpack |
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" | 9 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "cb5e5a4d1efd1d845464ac9a8c6383b8" | 11 | SRC_URI[md5sum] = "31d716e1f40c248556e5a8e6b467ba71" |
12 | SRC_URI[sha256sum] = "6fe10f5118d18a7cb1dd40e713343ce788ad3766104ad2471ee49aed7b55833a" | 12 | SRC_URI[sha256sum] = "ad3e98ee0c10f2b3e74af8923f44b8d5908e42eedbca12a702e35cee9328d8cf" |
13 | 13 | ||
14 | do_install() { | 14 | do_install() { |
15 | # provided by the isp-imx package, do not install them here additionally | ||
16 | rm -f ${S}/opt/imx8-isp/bin/dewarp_config/sensor_dwe_os08a20_1080P_config.json | ||
17 | rm -f ${S}/opt/imx8-isp/bin/dewarp_config/sensor_dwe_os08a20_4K_config.json | ||
18 | |||
19 | dest_dir=${D}/opt/imx8-isp/bin | 15 | dest_dir=${D}/opt/imx8-isp/bin |
20 | install -d ${D}/${libdir} | 16 | install -d ${D}/${libdir} |
21 | install -d $dest_dir | 17 | install -d $dest_dir |
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb index 39d7d770..9e0f0265 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb | |||
@@ -2,16 +2,15 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "i.MX Verisilicon Software ISP" | 3 | DESCRIPTION = "i.MX Verisilicon Software ISP" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" |
6 | DEPENDS = "boost libdrm virtual/libg2d libtinyxml2" | 6 | DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 patchelf-native" |
7 | 7 | ||
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
9 | ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ | 9 | ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ |
10 | file://0001-cpp-netlib-parsers.ipp-add-missing-include.patch \ | 10 | file://0001-cpp-netlib-parsers.ipp-add-missing-include.patch \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRC_URI[md5sum] = "693e76b20985de607208c21d996019f8" | 13 | SRC_URI[sha256sum] = "34b23f5b9f0856a8f5722e339a7ad4ccf4d99614788598306ff8b20093c1e846" |
14 | SRC_URI[sha256sum] = "c2f450502390442926920d6457bbf24378c0338a445be180130ec6b1b12d1056" | ||
15 | 14 | ||
16 | inherit fsl-eula-unpack cmake systemd use-imx-headers | 15 | inherit fsl-eula-unpack cmake systemd use-imx-headers |
17 | 16 | ||
@@ -30,6 +29,7 @@ EXTRA_OECMAKE += " \ | |||
30 | -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \ | 29 | -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \ |
31 | -DCMAKE_BUILD_TYPE=release \ | 30 | -DCMAKE_BUILD_TYPE=release \ |
32 | -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ | 31 | -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ |
32 | -DCMAKE_INSTALL_LIBDIR=${libdir} \ | ||
33 | -DISP_VERSION=ISP8000NANO_V1802 \ | 33 | -DISP_VERSION=ISP8000NANO_V1802 \ |
34 | -DPLATFORM=ARM64 \ | 34 | -DPLATFORM=ARM64 \ |
35 | -DAPPMODE=V4L2 \ | 35 | -DAPPMODE=V4L2 \ |
@@ -47,7 +47,16 @@ EXTRA_OECMAKE += " \ | |||
47 | -Wno-dev \ | 47 | -Wno-dev \ |
48 | " | 48 | " |
49 | 49 | ||
50 | do_configure:prepend () { | ||
51 | # FIXME: Should be rebuild. | ||
52 | patchelf --replace-needed libtinyxml2.so.9 libtinyxml2.so.10 ${S}/units/cam_device/proprietories/lib/libcam_device.so | ||
53 | patchelf --replace-needed libtinyxml2.so.9 libtinyxml2.so.10 ${S}/mediacontrol/lib/arm-64/fpga/libcam_device.so | ||
54 | } | ||
55 | |||
50 | do_install() { | 56 | do_install() { |
57 | # FIXME: provided by the basler-camera package, do not install them here additionally | ||
58 | rm -f ${S}/dewarp/dewarp_config//daA3840_30mc*.json | ||
59 | |||
51 | install -d ${D}/${libdir} | 60 | install -d ${D}/${libdir} |
52 | install -d ${D}/${includedir} | 61 | install -d ${D}/${includedir} |
53 | install -d ${D}/opt/imx8-isp/bin | 62 | install -d ${D}/opt/imx8-isp/bin |
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 6c174210..c46eae33 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb | |||
@@ -23,7 +23,7 @@ PV:append = "+fslgit" | |||
23 | LOCALVERSION = "+fsl" | 23 | LOCALVERSION = "+fsl" |
24 | 24 | ||
25 | INHIBIT_DEFAULT_DEPS = "1" | 25 | INHIBIT_DEFAULT_DEPS = "1" |
26 | DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python3-native" | 26 | DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python3-native python3-setuptools-native" |
27 | DEPENDS:append:qoriq-arm64 = " dtc-native" | 27 | DEPENDS:append:qoriq-arm64 = " dtc-native" |
28 | DEPENDS:append:qoriq-arm = " dtc-native" | 28 | DEPENDS:append:qoriq-arm = " dtc-native" |
29 | DEPENDS:append:qoriq-ppc = " boot-format-native" | 29 | DEPENDS:append:qoriq-ppc = " boot-format-native" |
diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb index 7eba3a43..9c03436c 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb | |||
@@ -16,10 +16,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ | |||
16 | PROVIDES = "jailhouse" | 16 | PROVIDES = "jailhouse" |
17 | RPROVIDES:${PN} += "jailhouse" | 17 | RPROVIDES:${PN} += "jailhouse" |
18 | 18 | ||
19 | SRCBRANCH = "lf-6.1.22_2.0.0" | 19 | SRCBRANCH = "lf-6.1.36_2.1.0" |
20 | SRCREV = "e090abc70bb395f705f85659ad92bdafbe407628" | 20 | SRCREV = "d3484c68313c2c837eb213ca1aa373e491fbc55f" |
21 | 21 | ||
22 | SRC_URI = "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https;branch=${SRCBRANCH}" | 22 | IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" |
23 | SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH}" | ||
23 | 24 | ||
24 | DEPENDS = " \ | 25 | DEPENDS = " \ |
25 | make-native \ | 26 | make-native \ |
@@ -28,7 +29,7 @@ DEPENDS = " \ | |||
28 | dtc-native \ | 29 | dtc-native \ |
29 | " | 30 | " |
30 | 31 | ||
31 | inherit module python3native bash-completion deploy setuptools3 | 32 | inherit module bash-completion deploy setuptools3 |
32 | 33 | ||
33 | S = "${WORKDIR}/git" | 34 | S = "${WORKDIR}/git" |
34 | B = "${S}" | 35 | B = "${S}" |
@@ -41,7 +42,18 @@ INMATES_DIR ?= "${JH_DATADIR}/inmates" | |||
41 | 42 | ||
42 | TUNE_CCARGS:remove:mx93-nxp-bsp = "-mcpu=cortex-a55" | 43 | TUNE_CCARGS:remove:mx93-nxp-bsp = "-mcpu=cortex-a55" |
43 | 44 | ||
44 | do_configure() { | 45 | EXTRA_OEMAKE += 'V=1' |
46 | EXTRA_OEMAKE += 'PYTHON=python3' | ||
47 | EXTRA_OEMAKE += 'LDFLAGS=""' | ||
48 | EXTRA_OEMAKE += 'CC="${CC}"' | ||
49 | EXTRA_OEMAKE += 'ARCH=${JH_ARCH}' | ||
50 | EXTRA_OEMAKE += 'CROSS_COMPILE=${TARGET_PREFIX}' | ||
51 | EXTRA_OEMAKE += 'KDIR=${STAGING_KERNEL_BUILDDIR}' | ||
52 | EXTRA_OEMAKE += 'MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}"' | ||
53 | EXTRA_OEMAKE += 'INSTALL_MOD_PATH=${D}${root_prefix}' | ||
54 | EXTRA_OEMAKE += 'firmwaredir=${nonarch_base_libdir}/firmware' | ||
55 | |||
56 | do_configure:prepend() { | ||
45 | if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; | 57 | if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; |
46 | then | 58 | then |
47 | cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/${ARCH}/ | 59 | cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/${ARCH}/ |
@@ -49,25 +61,12 @@ do_configure() { | |||
49 | } | 61 | } |
50 | 62 | ||
51 | do_compile:prepend() { | 63 | do_compile:prepend() { |
52 | unset LDFLAGS | 64 | # explicity call make to build the kernel module and tools |
53 | oe_runmake V=1 CC="${CC}" \ | 65 | oe_runmake |
54 | ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \ | ||
55 | KDIR=${STAGING_KERNEL_BUILDDIR} | ||
56 | } | 66 | } |
57 | 67 | ||
58 | do_install:prepend() { | 68 | do_install:append() { |
59 | oe_runmake \ | 69 | oe_runmake DESTDIR=${D} install |
60 | PYTHON=python3 \ | ||
61 | V=1 \ | ||
62 | LDFLAGS="" \ | ||
63 | CC="${CC}" \ | ||
64 | ARCH=${JH_ARCH} \ | ||
65 | CROSS_COMPILE=${TARGET_PREFIX} \ | ||
66 | KDIR=${STAGING_KERNEL_BUILDDIR} \ | ||
67 | MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \ | ||
68 | INSTALL_MOD_PATH=${D}${root_prefix} \ | ||
69 | firmwaredir=${nonarch_base_libdir}/firmware \ | ||
70 | DESTDIR=${D} install | ||
71 | 70 | ||
72 | install -d ${D}${CELL_DIR} | 71 | install -d ${D}${CELL_DIR} |
73 | install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/ | 72 | install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/ |
@@ -93,6 +92,7 @@ FILES:${PN}:remove = "${libdir}/*" | |||
93 | FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}" | 92 | FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}" |
94 | 93 | ||
95 | RDEPENDS:${PN} += " \ | 94 | RDEPENDS:${PN} += " \ |
95 | pyjailhouse \ | ||
96 | python3-curses \ | 96 | python3-curses \ |
97 | python3-datetime \ | 97 | python3-datetime \ |
98 | python3-mmap \ | 98 | python3-mmap \ |
diff --git a/recipes-extended/jailhouse/jailhouse/0001-tools-scripts-update-shebang-to-python3.patch b/recipes-extended/jailhouse/jailhouse/0001-tools-scripts-update-shebang-to-python3.patch deleted file mode 100644 index df2f37ad..00000000 --- a/recipes-extended/jailhouse/jailhouse/0001-tools-scripts-update-shebang-to-python3.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | From f07cd0e5f32a00a4091fa964d0dae0cd46c17554 Mon Sep 17 00:00:00 2001 | ||
2 | From: Cristinel Panfir <cristinel.panfir@nxp.com> | ||
3 | Date: Sat, 23 May 2020 08:51:31 +0000 | ||
4 | Subject: [PATCH] tools/scripts: update shebang to python3 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Cristinel Panfir <cristinel.panfir@nxp.com> | ||
9 | --- | ||
10 | scripts/arm64-parsedump.py | 2 +- | ||
11 | tools/jailhouse-cell-linux | 2 +- | ||
12 | tools/jailhouse-cell-stats | 2 +- | ||
13 | tools/jailhouse-config-create | 2 +- | ||
14 | tools/jailhouse-hardware-check | 2 +- | ||
15 | 5 files changed, 5 insertions(+), 5 deletions(-) | ||
16 | |||
17 | diff --git a/scripts/arm64-parsedump.py b/scripts/arm64-parsedump.py | ||
18 | index 9519eb5..c695706 100755 | ||
19 | --- a/scripts/arm64-parsedump.py | ||
20 | +++ b/scripts/arm64-parsedump.py | ||
21 | @@ -1,4 +1,4 @@ | ||
22 | -#!/usr/bin/env python | ||
23 | +#!/usr/bin/env python3 | ||
24 | |||
25 | # Jailhouse, a Linux-based partitioning hypervisor | ||
26 | # | ||
27 | diff --git a/tools/jailhouse-cell-linux b/tools/jailhouse-cell-linux | ||
28 | index 215932a..bcbb902 100755 | ||
29 | --- a/tools/jailhouse-cell-linux | ||
30 | +++ b/tools/jailhouse-cell-linux | ||
31 | @@ -1,4 +1,4 @@ | ||
32 | -#!/usr/bin/env python | ||
33 | +#!/usr/bin/env python3 | ||
34 | |||
35 | # Jailhouse, a Linux-based partitioning hypervisor | ||
36 | # | ||
37 | diff --git a/tools/jailhouse-cell-stats b/tools/jailhouse-cell-stats | ||
38 | index 2f7e966..4c5289f 100755 | ||
39 | --- a/tools/jailhouse-cell-stats | ||
40 | +++ b/tools/jailhouse-cell-stats | ||
41 | @@ -1,4 +1,4 @@ | ||
42 | -#!/usr/bin/env python | ||
43 | +#!/usr/bin/env python3 | ||
44 | |||
45 | # Jailhouse, a Linux-based partitioning hypervisor | ||
46 | # | ||
47 | diff --git a/tools/jailhouse-config-create b/tools/jailhouse-config-create | ||
48 | index 55601a6..9869b94 100755 | ||
49 | --- a/tools/jailhouse-config-create | ||
50 | +++ b/tools/jailhouse-config-create | ||
51 | @@ -1,4 +1,4 @@ | ||
52 | -#!/usr/bin/env python | ||
53 | +#!/usr/bin/env python3 | ||
54 | # | ||
55 | # Jailhouse, a Linux-based partitioning hypervisor | ||
56 | # | ||
57 | diff --git a/tools/jailhouse-hardware-check b/tools/jailhouse-hardware-check | ||
58 | index b86756a..0c8fb42 100755 | ||
59 | --- a/tools/jailhouse-hardware-check | ||
60 | +++ b/tools/jailhouse-hardware-check | ||
61 | @@ -1,4 +1,4 @@ | ||
62 | -#!/usr/bin/env python | ||
63 | +#!/usr/bin/env python3 | ||
64 | |||
65 | # Jailhouse, a Linux-based partitioning hypervisor | ||
66 | # | ||
67 | -- | ||
68 | 2.7.4 | ||
69 | |||
diff --git a/recipes-fsl/mcore-demos/README b/recipes-fsl/mcore-demos/README index d3770e8b..59053f59 100644 --- a/recipes-fsl/mcore-demos/README +++ b/recipes-fsl/mcore-demos/README | |||
@@ -1,11 +1,13 @@ | |||
1 | The M4 demo app version of each SoCs are followed: | 1 | The M4 demo app version of each SoCs are followed: |
2 | * 2.13.0 -- i.MX 7ULP, 8MQ, 8MM | 2 | * 2.14.0 -- i.MX 7ULP, 8MQ |
3 | * 2.14.1 -- i.MX 8MM | ||
3 | * 2.9.0 -- i.MX 8DXL, 8QM, 8QXP | 4 | * 2.9.0 -- i.MX 8DXL, 8QM, 8QXP |
4 | * 1.0.1 -- i.MX 7D | 5 | * 1.0.1 -- i.MX 7D |
5 | 6 | ||
6 | The M7 demo app version of each SoCs are followed: | 7 | The M7 demo app version of each SoCs are followed: |
7 | * 2.13.0 -- i.MX 8MNULite, 8MN | 8 | * 2.14.0 -- i.MX 8MNULite, 8MN |
8 | * 2.13.1 -- i.MX 8MP | 9 | * 2.14.1 -- i.MX 8MP |
9 | 10 | ||
10 | The M33 demo app version of each SoCs are followed: | 11 | The M33 demo app version of each SoCs are followed: |
11 | * 2.14.0 -- i.MX 8ULP,i.MX 93 | 12 | * 2.14.1 -- i.MX 8ULP |
13 | * 2.14.2 -- i.MX 93 | ||
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_2.14.2.bb b/recipes-fsl/mcore-demos/imx-m33-demos_2.14.2.bb new file mode 100644 index 00000000..6ee72cbb --- /dev/null +++ b/recipes-fsl/mcore-demos/imx-m33-demos_2.14.2.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | # Copyright 2023 NXP | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | require imx-mcore-demos.inc | ||
5 | |||
6 | LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | ||
7 | |||
8 | |||
9 | SRC_URI[imx93.md5sum] = "3f420c28fdc159ecd5148a931a5ff02c" | ||
10 | SRC_URI[imx93.sha256sum] = "31f6e8b08edb677614e65b11bbcc796218691fe746b84ec2503b8a5060d69ef2" | ||
11 | |||
12 | COMPATIBLE_MACHINE = "(mx93-nxp-bsp)" | ||
diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend index c61e9a58..bf8c38fc 100644 --- a/recipes-graphics/cairo/cairo_%.bbappend +++ b/recipes-graphics/cairo/cairo_%.bbappend | |||
@@ -1,6 +1,3 @@ | |||
1 | PACKAGECONFIG:append:imxgpu3d = " egl glesv2" | ||
2 | PACKAGECONFIG:remove:imxgpu3d = "opengl" | ||
3 | |||
4 | # links with imx-gpu libs which are pre-built for glibc | 1 | # links with imx-gpu libs which are pre-built for glibc |
5 | # gcompat will address it during runtime | 2 | # gcompat will address it during runtime |
6 | LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" | 3 | LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" |
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb index 403c2c6f..6e3838be 100644 --- a/recipes-kernel/linux/linux-fslc-imx_6.1.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb | |||
@@ -28,22 +28,23 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
28 | # ------------------------------------------------------------------------------ | 28 | # ------------------------------------------------------------------------------ |
29 | # 1. Stable (tag or SHA(s)) | 29 | # 1. Stable (tag or SHA(s)) |
30 | # ------------------------------------------------------------------------------ | 30 | # ------------------------------------------------------------------------------ |
31 | # tag: v6.1.57 | 31 | # tag: v6.1.70 |
32 | # | 32 | # |
33 | # ------------------------------------------------------------------------------ | 33 | # ------------------------------------------------------------------------------ |
34 | # 2. NXP-specific (tag or SHA(s)) | 34 | # 2. NXP-specific (tag or SHA(s)) |
35 | # ------------------------------------------------------------------------------ | 35 | # ------------------------------------------------------------------------------ |
36 | # tag: lf-6.1.36-2.1.0 | 36 | # tag: lf-6.1.55-2.2.0 |
37 | # | 37 | # |
38 | # ------------------------------------------------------------------------------ | 38 | # ------------------------------------------------------------------------------ |
39 | # 3. Critical patches (SHA(s)) | 39 | # 3. Critical patches (SHA(s)) |
40 | # ------------------------------------------------------------------------------ | 40 | # ------------------------------------------------------------------------------ |
41 | # - d9e9cb8ce9bc7 hx280enc_vc8000e: fix misplaced #endif | 41 | # - 77a660738af5 Revert "net: stmmac: fix FPE events losing" |
42 | # - 3f1f2ea729550 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS | 42 | # - d9e9cb8ce9bc hx280enc_vc8000e: fix misplaced #endif |
43 | # - b73c6797ee427 ARM: imx_v7_defconfig: Remove KERNEL_LZO config | 43 | # - 3f1f2ea72955 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS |
44 | # - ec33c7fc43bef touchscreen: Kconfig: add I2C dependency for CT36X | 44 | # - b73c6797ee42 ARM: imx_v7_defconfig: Remove KERNEL_LZO config |
45 | # - 6c41233a2cfbe pwm: pwm-adp5585: fix get_state callback prototype | 45 | # - ec33c7fc43be touchscreen: Kconfig: add I2C dependency for CT36X |
46 | # - 9c7540ecb891f pwm: pwm-rpmsg-imx: fix get_state callback prototype | 46 | # - 6c41233a2cfb pwm: pwm-adp5585: fix get_state callback prototype |
47 | # - 9c7540ecb891 pwm: pwm-rpmsg-imx: fix get_state callback prototype | ||
47 | # | 48 | # |
48 | # NOTE to upgraders: | 49 | # NOTE to upgraders: |
49 | # This recipe should NOT collect individual patches, they should be applied to | 50 | # This recipe should NOT collect individual patches, they should be applied to |
@@ -55,16 +56,16 @@ require linux-imx.inc | |||
55 | 56 | ||
56 | KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" | 57 | KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" |
57 | 58 | ||
58 | KBRANCH = "6.1-2.1.x-imx" | 59 | KBRANCH = "6.1-2.2.x-imx" |
59 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" | 60 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" |
60 | SRCREV = "241e2f51bd87beb652196d1db92f0387c1209bfb" | 61 | SRCREV = "32a344619c750cdcbe31bed754adc1b30d362e45" |
61 | 62 | ||
62 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 63 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
63 | # required by kernel-yocto.bbclass. | 64 | # required by kernel-yocto.bbclass. |
64 | # | 65 | # |
65 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 66 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
66 | # should be updated once patchlevel is merged. | 67 | # should be updated once patchlevel is merged. |
67 | LINUX_VERSION = "6.1.57" | 68 | LINUX_VERSION = "6.1.70" |
68 | 69 | ||
69 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" | 70 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" |
70 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" | 71 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" |
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.1.bb b/recipes-kernel/linux/linux-fslc-lts_6.1.bb index c211bb44..8e1bab4b 100644 --- a/recipes-kernel/linux/linux-fslc-lts_6.1.bb +++ b/recipes-kernel/linux/linux-fslc-lts_6.1.bb | |||
@@ -21,10 +21,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol= | |||
21 | # | 21 | # |
22 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 22 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
23 | # should be updated once patchlevel is merged. | 23 | # should be updated once patchlevel is merged. |
24 | LINUX_VERSION = "6.1.60" | 24 | LINUX_VERSION = "6.1.72" |
25 | 25 | ||
26 | KBRANCH = "6.1.x+fslc" | 26 | KBRANCH = "6.1.x+fslc" |
27 | SRCREV = "62808a9f302b57493a3c8251a7e83e1dbfb75c88" | 27 | SRCREV = "b80c9dede70132da3ae7feb949fe0803aad3db24" |
28 | 28 | ||
29 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" | 29 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" |
30 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" | 30 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" |
diff --git a/recipes-kernel/linux/linux-imx-headers_6.1.bb b/recipes-kernel/linux/linux-imx-headers_6.1.bb index 570e0f4e..e2e63efc 100644 --- a/recipes-kernel/linux/linux-imx-headers_6.1.bb +++ b/recipes-kernel/linux/linux-imx-headers_6.1.bb | |||
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | |||
9 | 9 | ||
10 | SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" | 10 | SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" |
11 | SRCBRANCH = "lf-6.1.y" | 11 | SRCBRANCH = "lf-6.1.y" |
12 | LOCALVERSION = "-6.1.36-2.1.0" | 12 | LOCALVERSION = "-6.1.55-2.2.0" |
13 | SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3" | 13 | SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb index 9e5fa2b0..6b93a1d0 100644 --- a/recipes-kernel/linux/linux-imx_6.1.bb +++ b/recipes-kernel/linux/linux-imx_6.1.bb | |||
@@ -15,15 +15,15 @@ require recipes-kernel/linux/linux-imx.inc | |||
15 | KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" | 15 | KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" |
16 | 16 | ||
17 | SRCBRANCH = "lf-6.1.y" | 17 | SRCBRANCH = "lf-6.1.y" |
18 | LOCALVERSION = "-6.1.36-2.1.0" | 18 | LOCALVERSION = "-6.1.55-2.2.0" |
19 | SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3" | 19 | SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e" |
20 | 20 | ||
21 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 21 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
22 | # required by kernel-yocto.bbclass. | 22 | # required by kernel-yocto.bbclass. |
23 | # | 23 | # |
24 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 24 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
25 | # should be updated once patchlevel is merged. | 25 | # should be updated once patchlevel is merged. |
26 | LINUX_VERSION = "6.1.36" | 26 | LINUX_VERSION = "6.1.55" |
27 | 27 | ||
28 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" | 28 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" |
29 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" | 29 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" |