X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_m3ulcb-nogfx.inc;h=28360fcc909d07b67369dae9a4ed0c3895182d49;hb=ae3ab75cd4c84b65b7344470ba9ae1d45df15104;hp=f1f9b87fde748a4292a8fa438775fda415d96907;hpb=4abd447b8d156b3b8bfef80afddffb53259a0a93;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
index f1f9b87fd..28360fcc9 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
@@ -1,16 +1,16 @@
+require conf/include/agl_rcar-nogfx.inc
 SOC_FAMILY = "r8a7796"
+BOARD_NAME = "m3ulcb"
 
-IMAGE_INSTALL_append = " \
-	weston-bin \
-"
+DTB_SUFFIX = "r8a7796-m3ulcb"
 
 # Mask graphic Pkgs
-BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm"
+BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm"
 # Mask MMP recipes
-BBMASK .= "|kernel-module-uvcs-drv|omx-user-module"
+BBMASK += "kernel-module-uvcs-drv|omx-user-module"
 
-BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/"
+DISTRO_FEATURES_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}"
+IMAGE_INSTALL_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}"
 
-OSTREE_KERNEL = "Image"
-IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-r8a7796-m3ulcb.dtb"
-OSTREE_BOOTLOADER ?= "u-boot"
+# Workaround for SPEC-3706 - versioned bbappends and upstream moved on to 1.16.3
+BBMASK += "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-.*1.16.2\.bbappend"