From 73344562d60189b56aaa581db78904d06be463c1 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 11 Mar 2020 18:18:53 +0100 Subject: machines: move imx wayland/weston version setting to distro layer Thus they are stored in one place and also apply to i.MX6/i.MX7 machines should one build them for wayland/weston. Related-to: ELB-2303 Signed-off-by: Max Krummenacher --- conf/machine/apalis-imx8.conf | 2 -- conf/machine/apalis-imx8x.conf | 2 -- conf/machine/colibri-imx8x.conf | 2 -- conf/machine/verdin-imx8mm.conf | 3 --- 4 files changed, 9 deletions(-) diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index 1199683..9b4de32 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -57,8 +57,6 @@ MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" IMXBOOT_TARGETS = "flash_b0" PREFERRED_PROVIDER_virtual/libg2d_imxdpu = "imx-dpu-g2d" -PREFERRED_VERSION_wayland-protocols_mx8 = "1.16.imx" -PREFERRED_VERSION_weston_mx8 = "5.0.0.imx" BOARD_TYPE = "apalis" diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf index d2abc60..5c9c1b7 100644 --- a/conf/machine/apalis-imx8x.conf +++ b/conf/machine/apalis-imx8x.conf @@ -53,8 +53,6 @@ MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" IMXBOOT_TARGETS = "flash" PREFERRED_PROVIDER_virtual/libg2d_imxdpu = "imx-dpu-g2d" -PREFERRED_VERSION_wayland-protocols_mx8 = "1.16.imx" -PREFERRED_VERSION_weston_mx8 = "5.0.0.imx" BOARD_TYPE = "apalis" diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index 2686edd..534668d 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -58,8 +58,6 @@ MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" IMXBOOT_TARGETS = "flash" PREFERRED_PROVIDER_virtual/libg2d_imxdpu = "imx-dpu-g2d" -PREFERRED_VERSION_wayland-protocols_mx8 = "1.16.imx" -PREFERRED_VERSION_weston_mx8 = "5.0.0.imx" BOARD_TYPE = "colibri" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index b375852..89c3d2d 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -64,9 +64,6 @@ PREFERRED_VERSION_u-boot-toradex-fw-utils = "2018.03" MACHINE_FIRMWARE_append = " linux-firmware-sd8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" -PREFERRED_VERSION_wayland-protocols_mx8 = "1.16.imx" -PREFERRED_VERSION_weston_mx8 = "5.0.0.imx" - BOARD_TYPE = "verdin" IMAGE_CLASSES_append = " image_type_tezi" -- cgit v1.2.3