Merge pull request #1922 from nxp-upstream/imx-base

imx-base.inc: Simplify libdrm, wayland-protocols overrides
Freescale · Sep 5, 2024 · bf73414 · bf73414
2 parents 480e2ca + ec2f9a8
commit bf73414
Showing 1 changed file with 2 additions and 8 deletions.
diff --git 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"
 PREFERRED_VERSION_weston:mx7-nxp-bsp      ??= "10.0.5.imx"
 PREFERRED_VERSION_weston:imx-mainline-bsp   = ""
 
-PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp  ??= "1.32.imx"
-PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp  ??= "1.32.imx"
-PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp  ??= "1.32.imx"
-PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp  ??= "1.32.imx"
+PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp  ??= "1.32.imx"
 
 PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx"
 
 # Use i.MX libdrm Version
-PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.116.imx"
-PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.116.imx"
-PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.116.imx"
-PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.116.imx"
+PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx"
 
 PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.261.1.imx"
 PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.261.1.imx"