From 31a6056dcf383d28d4aabcacaad1455dac7d3f61 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Thu, 20 Jan 2022 11:55:16 +0100 Subject: [PATCH] conf: move PREFERRED_VERSION for NXP platforms into imx-digi basic configuration Signed-off-by: Mike Engel --- meta-digi-arm/conf/machine/include/imx-digi-base.inc | 9 +++++++++ meta-digi-dey/conf/distro/dey.conf | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index 596bf2f42..26c7ed6d4 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -140,3 +140,12 @@ PREFERRED_VERSION_dtc-native_ccimx6 ?= "1.4.5" PREFERRED_VERSION_nativesdk-dtc_ccimx6 ?= "1.4.5" DEY_BUILD_PLATFORM = "NXP" + +# Use NXP's forks of packages when possible +PREFERRED_VERSION_weston ?= "9.0.0.imx" +PREFERRED_VERSION_wayland-protocols = "1.22.imx" +PREFERRED_VERSION_libdrm ?= "2.4.107.imx" +PREFERRED_VERSION_opencv ?= "4.5.2.imx" +PREFERRED_VERSION_optee-client = "3.15.0.imx" +PREFERRED_VERSION_optee-os = "3.15.0.imx" +PREFERRED_VERSION_optee-test = "3.15.0.imx" diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index f0bfa362d..e68bbc41a 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -48,15 +48,6 @@ FEATURE_PACKAGES_dey-wireless = "packagegroup-dey-wireless" # 5.56 version should be used, which is provided by the poky layer. PREFERRED_VERSION_bluez5 ?= "5.56" -# Use NXP's forks of packages when possible -PREFERRED_VERSION_weston ?= "9.0.0.imx" -PREFERRED_VERSION_wayland-protocols = "1.22.imx" -PREFERRED_VERSION_libdrm ?= "2.4.107.imx" -PREFERRED_VERSION_opencv ?= "4.5.2.imx" -PREFERRED_VERSION_optee-client = "3.15.0.imx" -PREFERRED_VERSION_optee-os = "3.15.0.imx" -PREFERRED_VERSION_optee-test = "3.15.0.imx" - # Set the PREFERRED_PROVIDER for jpeg functionality based on the MACHINE # architecture. For armv7a devices libjpeg-turbo should be used to take # advantage of the SIMD instructions.