From: ronan <ronan.lemartret@gmail.com>
Date: Tue, 13 Feb 2018 13:53:45 +0000 (+0100)
Subject: Update ulcb conf file
X-Git-Tag: 5.99.1~75^2
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=c9ce37905acd879db107eafe309678053073e086;p=AGL%2Fmeta-agl.git

Update ulcb conf file

Change-Id: I2c68a132e315a61117a6d6709bafbff58dff8847
Signed-off-by: ronan <ronan.lemartret@gmail.com>
---

diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
index f384bcbe3..e2ebd85c6 100644
--- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@ -1,5 +1,8 @@
 SOC_FAMILY = "r8a7795"
 
+# Enable AGL virtualization features
+MACHINE_FEATURES_append = " agl-egvirt"
+
 # for Wayland/Weston weston-laucher
 DISTRO_FEATURES_append = " pam"
 
@@ -16,21 +19,14 @@ PREFERRED_PROVIDER_virtual/mesa = "mesa"
 PREFERRED_PROVIDER_libgbm = "libgbm"
 PREFERRED_RPROVIDER_libgbm-dev = "libgbm"
 
+PREFERRED_RPROVIDER_libomxil = "omx-user-module"
+
 # Mask the gstreamer recipe for MMP
 BBMASK = "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer"
 
 # Add for gstreamer plugins ugly
 LICENSE_FLAGS_WHITELIST = "commercial"
 
-PREFERRED_VERSION_gstreamer1.0 = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-libav = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-vspfilter = "1.0%"
-
-PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.2.0"
 
 MACHINE_FEATURES_append = " multimedia"
 
@@ -50,7 +46,6 @@ IMAGE_INSTALL_append_rcar-gen3 = " \
 	omx-user-module \
 "
 
-BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/"
 OSTREE_BOOTLOADER ?= "u-boot"
 
 WKS_FILE = "singlepart-noloader.wks"
diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
index 7644e0b69..cce7dbd5e 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@ -27,15 +27,6 @@ BBMASK = "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer"
 # Add for gstreamer plugins ugly
 LICENSE_FLAGS_WHITELIST = "commercial"
 
-PREFERRED_VERSION_gstreamer1.0 = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-libav = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-vspfilter = "1.0%"
-
-PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.2.0"
 
 MACHINE_FEATURES_append = " multimedia"
 
@@ -55,8 +46,6 @@ IMAGE_INSTALL_append_rcar-gen3 = " \
 	omx-user-module \
 "
 
-BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/"
-
 DISTRO_FEATURES_append = " sota"
 OSTREE_KERNEL = "Image"
 IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-r8a7796-m3ulcb.dtb"