From 0da87c37407946cee104ecc982a6c8fe4693ebe5 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 7 Feb 2023 14:37:04 +0100 Subject: [PATCH] meta-digi: get rid of accel-video machine feature accel-video was being used only for including or not gstreamer in the different DEY images. But then we had exceptions to include gstreamer for machines that do not define accel-video, so just follow what the ccmp15 does, and use a generic 'gstreamer' distro feature to add 'dey-gstreamer' support to the images. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccimx6.inc | 2 +- meta-digi-arm/conf/machine/include/ccimx8m.inc | 2 +- meta-digi-arm/conf/machine/include/ccimx8x.inc | 2 +- meta-digi-arm/conf/machine/include/imx-digi-base.inc | 3 +++ .../recipes-core/images/core-image-base.bbappend | 2 +- .../recipes-core/images/dey-image-graphical.inc | 9 +-------- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 52622f123..39b6d8656 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -37,7 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \ ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)} \ " -MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth pci" +MACHINE_FEATURES += "accel-graphics wifi bluetooth pci" # TrustFence TRUSTFENCE_SIGN_MODE = "HAB" diff --git a/meta-digi-arm/conf/machine/include/ccimx8m.inc b/meta-digi-arm/conf/machine/include/ccimx8m.inc index f0c2b6591..f02b9d3ed 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8m.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8m.inc @@ -51,7 +51,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \ ${WIRELESS_MODULE} \ " -MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip mca optee" +MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip mca optee" # AARCH64 doesn't support self-extracting zImage KERNEL_IMAGETYPE = "Image.gz" diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 32bdc68ee..6158874a3 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -68,7 +68,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \ ${WIRELESS_MODULE} \ " -MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip pci mca" +MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip pci mca" # AARCH64 doesn't support self-extracting zImage KERNEL_IMAGETYPE = "Image.gz" 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 75f6d67d1..93089abb2 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -269,6 +269,9 @@ KERNEL_IMAGETYPE ?= "zImage" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" +# Add a generic gstreamer distro feature for all IMX platforms +DISTRO_FEATURES:append = " gstreamer" + # U-Boot 2017.X requires a specific dtc version. PREFERRED_VERSION_dtc-native:ccimx6 ?= "1.4.5" PREFERRED_VERSION_nativesdk-dtc:ccimx6 ?= "1.4.5" diff --git a/meta-digi-dey/recipes-core/images/core-image-base.bbappend b/meta-digi-dey/recipes-core/images/core-image-base.bbappend index b53ccd60b..6c80f4633 100644 --- a/meta-digi-dey/recipes-core/images/core-image-base.bbappend +++ b/meta-digi-dey/recipes-core/images/core-image-base.bbappend @@ -6,7 +6,7 @@ IMAGE_FEATURES += " \ dey-network \ eclipse-debug \ ssh-server-dropbear \ - ${@bb.utils.contains('MACHINE_FEATURES', 'accel-video', 'dey-gstreamer', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer', 'dey-gstreamer', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'alsa', 'dey-audio', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'dey-wireless', '', d)} \ diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc index 24061843a..de593a3ea 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc +++ b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc @@ -20,22 +20,15 @@ IMAGE_FEATURES += " \ dey-${GRAPHICAL_CORE} \ eclipse-debug \ ssh-server-dropbear \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer', 'dey-gstreamer', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', \ '', d), d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'accel-video', 'dey-gstreamer', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'alsa', 'dey-audio', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'dey-wireless', '', d)} \ " -# Separately add 'dey-gstreamer' to ccimx6ulsbc platform. -# This platform does not have 'accel-video' but we want gstreamer for using -# it with video/camera -IMAGE_FEATURES:append:ccimx6ulsbc = " dey-gstreamer" - -IMAGE_FEATURES:append:ccmp15 = " ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer', 'dey-gstreamer', '', d)}" - # SDK features (for toolchains generated from an image with populate_sdk) SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs"