diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2024-09-05 11:30:55 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 11:30:55 -0300 |
| commit | 9fa0a4c5b04fd28930cb7017152d42e989969cd6 (patch) | |
| tree | 71b814f88398c8a6cd9eb4d4f768414c44509300 | |
| parent | 4e392aa458a7c088aefa4ec550099174be43e868 (diff) | |
| parent | 887a4e1740cf775d300f79c1e0b422d4eee18baf (diff) | |
| download | meta-freescale-9fa0a4c5b04fd28930cb7017152d42e989969cd6.tar.gz | |
Merge pull request #1923 from Freescale/backport-1922-to-scarthgap
[Backport scarthgap] imx-base.inc: Simplify libdrm, wayland-protocols overrides
| -rw-r--r-- | conf/machine/include/imx-base.inc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index f8f677404..a9219efc9 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -572,18 +572,12 @@ PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" | |||
| 572 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" | 572 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" |
| 573 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" | 573 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" |
| 574 | 574 | ||
| 575 | PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.32.imx" | 575 | PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.32.imx" |
| 576 | PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ??= "1.32.imx" | ||
| 577 | PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.32.imx" | ||
| 578 | PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.32.imx" | ||
| 579 | 576 | ||
| 580 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" | 577 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" |
| 581 | 578 | ||
| 582 | # Use i.MX libdrm Version | 579 | # Use i.MX libdrm Version |
| 583 | PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.116.imx" | 580 | PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx" |
| 584 | PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.116.imx" | ||
| 585 | PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.116.imx" | ||
| 586 | PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.116.imx" | ||
| 587 | 581 | ||
| 588 | PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.261.1.imx" | 582 | PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.261.1.imx" |
| 589 | PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.261.1.imx" | 583 | PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.261.1.imx" |