Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2023-02-07 14:37:04 +01:00
parent cdda928edb
commit 0da87c3740
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/conf/machine/include/ccimx6.inc
View File

@ -37,7 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)} \ ${@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
TRUSTFENCE_SIGN_MODE = "HAB" TRUSTFENCE_SIGN_MODE = "HAB"

2
meta-digi-arm/conf/machine/include/ccimx8m.inc
View File

@ -51,7 +51,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
${WIRELESS_MODULE} \ ${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 # AARCH64 doesn't support self-extracting zImage
KERNEL_IMAGETYPE = "Image.gz" KERNEL_IMAGETYPE = "Image.gz"

2
meta-digi-arm/conf/machine/include/ccimx8x.inc
View File

@ -68,7 +68,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
${WIRELESS_MODULE} \ ${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 # AARCH64 doesn't support self-extracting zImage
KERNEL_IMAGETYPE = "Image.gz" KERNEL_IMAGETYPE = "Image.gz"

3
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -269,6 +269,9 @@ KERNEL_IMAGETYPE ?= "zImage"
MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" 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. # U-Boot 2017.X requires a specific dtc version.
PREFERRED_VERSION_dtc-native:ccimx6 ?= "1.4.5" PREFERRED_VERSION_dtc-native:ccimx6 ?= "1.4.5"
PREFERRED_VERSION_nativesdk-dtc:ccimx6 ?= "1.4.5" PREFERRED_VERSION_nativesdk-dtc:ccimx6 ?= "1.4.5"

2
meta-digi-dey/recipes-core/images/core-image-base.bbappend
View File

@ -6,7 +6,7 @@ IMAGE_FEATURES += " \
dey-network \ dey-network \
eclipse-debug \ eclipse-debug \
ssh-server-dropbear \ 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', 'alsa', 'dey-audio', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'dey-wireless', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'dey-wireless', '', d)} \

9
meta-digi-dey/recipes-core/images/dey-image-graphical.inc
View File

@ -20,22 +20,15 @@ IMAGE_FEATURES += " \
dey-${GRAPHICAL_CORE} \ dey-${GRAPHICAL_CORE} \
eclipse-debug \ eclipse-debug \
ssh-server-dropbear \ ssh-server-dropbear \
${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer', 'dey-gstreamer', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', \
'', d), d)} \ '', 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', 'alsa', 'dey-audio', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'dey-wireless', '', 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) # SDK features (for toolchains generated from an image with populate_sdk)
SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs" SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs"