X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_h3-salvator-x-nogfx.inc;h=455a368e68ee816b9c5494af846423aa5e53a7ad;hb=7db156af5dcdb17cb8c30c51b7d4cf0a755abd65;hp=3bc9f95c27ff19c74acdbc9c864cbb4e41a04d3d;hpb=ad4b257624ee9827dac00f108fb65978157f06ac;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
index 3bc9f95c2..455a368e6 100644
--- a/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
@@ -2,13 +2,24 @@ require conf/include/agl_rcar-nogfx.inc
 SOC_FAMILY = "r8a7795"
 BOARD_NAME = "h3-salvator-x"
 
-DTB_SUFFIX = "r8a7795-salvator-xs"
+DTB_SUFFIX = "r8a77951-salvator-xs"
 
 # Mask graphic Pkgs
 BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm"
 # Mask MMP recipes
 BBMASK += "kernel-module-uvcs-drv|omx-user-module"
 
+# Work around use of obsolete Weston backend-fbdev in meta-rcar-gen3
+# when building without the proprietary driver stack.  Masking out the
+# weston_%.bbappend seems the simplest approach for now, as forcing
+# USE_GLES = "1" to disable the adding of -Dbackend-default="fbdev" to
+# EXTRA_OEMESON triggers adding "libgbm" to DEPENDS, which breaks due
+# to that being a component specific to the proprietary stack we are
+# explicitly disabling.  If the "libgbm" usage in the bbappend was
+# instead "virtual/libgbm" as is now used in poky, it might be possible
+# to just tweak PREFERRED_PROVIDER_virtual/libgbm = "mesa".
+BBMASK += "meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend"
+
 # do use software rendering to display the compositor
 # used for images w/o binary-only driver
 WESTON_USE_PIXMAN = "1"