meta-agl-bsp: Add overrides to rcar3 BSP changes

The various configuration changes done by the include files for the
rcar3 machines in meta-agl-bsp prove problematic when using a rcar3
machine in a multiconfig configuration with different machines in
other configs.  This can potentially be avoided in the future with
a significant rework of the local.conf generation in aglsetup.sh,
but for now, too avoid issues, add rcar-gen3 or h3ulcb overrides to
the variable changes in those files.  That ensures that the changes
will only apply to the specific machine being targeted.

So far this has only been tested with the h3ulcb, it is likely that
more fixes are required for other rcar3 machines, as well as the
machines from other BSPs.

Bug-AGL: SPEC-4618

Change-Id: Ifa6735337e673a92c56d5457b97d09a5b86cc0e1
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28185
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

3 files changed, 24 insertions, 26 deletions

diff --git a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
index 476eb9c22..c62b9d095 100644
--- a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
@@ -4,7 +4,7 @@ OSTREE_KERNEL = "Image"
 IMAGE_BOOT_FILES:sota = "renesas-ota-bootfiles/* ${DTB_SUFFIX}.dtb"
 OSTREE_BOOTLOADER ?= "u-boot"
 
-WKS_FILE = "singlepart-noloader.wks"
+WKS_FILE:rcar-gen3 = "singlepart-noloader.wks"
 
 RENESAS_DATADIR = "/usr"
 
diff --git a/meta-agl-bsp/conf/include/agl_rcar.inc b/meta-agl-bsp/conf/include/agl_rcar.inc
index 1059b2861..da0819d71 100644
--- a/meta-agl-bsp/conf/include/agl_rcar.inc
+++ b/meta-agl-bsp/conf/include/agl_rcar.inc
@@ -1,39 +1,37 @@
 require conf/include/agl_rcar-nogfx.inc
 
 # Enable AGL virtualization features
-MACHINE_FEATURES:append = " agl-egvirt"
+MACHINE_FEATURES:append:rcar-gen3 = " agl-egvirt"
 
 # Enable Gfx Pkgs
-MACHINE_FEATURES:append = " gsx"
-BB_MULTI_PROVIDER_ALLOWED += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
+MACHINE_FEATURES:append:rcar-gen3 = " gsx"
+BB_MULTI_PROVIDER_ALLOWED:append:rcar-gen3 = " virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
 
 # for Wayland/Weston
-PREFERRED_PROVIDER_virtual/libgles1 = ""
-PREFERRED_PROVIDER_virtual/libgles2 = "virtual-gles-user-module"
-PREFERRED_PROVIDER_virtual/egl = "virtual-gles-user-module"
-PREFERRED_PROVIDER_virtual/libgl = ""
-PREFERRED_PROVIDER_virtual/mesa = "mesa"
+PREFERRED_PROVIDER_virtual/libgles1:rcar-gen3 = ""
+PREFERRED_PROVIDER_virtual/libgles2:rcar-gen3 = "virtual-gles-user-module"
+PREFERRED_PROVIDER_virtual/egl:rcar-gen3 = "virtual-gles-user-module"
+PREFERRED_PROVIDER_virtual/libgl:rcar-gen3 = ""
+PREFERRED_PROVIDER_virtual/mesa:rcar-gen3 = "mesa"
 
+PREFERRED_PROVIDER_libgbm:rcar-gen3 = "libgbm"
+PREFERRED_PROVIDER_virtual/libgbm:rcar-gen3 = "libgbm"
+PREFERRED_RPROVIDER_libgbm-dev:rcar-gen3 = "libgbm"
 
 
-PREFERRED_PROVIDER_libgbm = "libgbm"
-PREFERRED_PROVIDER_virtual/libgbm = "libgbm"
-PREFERRED_RPROVIDER_libgbm-dev = "libgbm"
-
-
-PREFERRED_RPROVIDER_libomxil = "omx-user-module"
-PREFERRED_PROVIDER_virtual/libomxil = "omx-user-module"
-VIRTUAL-RUNTIME_libomxil = "omx-user-module"
+PREFERRED_RPROVIDER_libomxil:rcar-gen3 = "omx-user-module"
+PREFERRED_PROVIDER_virtual/libomxil:rcar-gen3 = "omx-user-module"
+VIRTUAL-RUNTIME_libomxil:rcar-gen3 = "omx-user-module"
 
 # Add for gstreamer plugins ugly
-LICENSE_FLAGS_ACCEPTED = "commercial"
+LICENSE_FLAGS_ACCEPTED:rcar-gen3 = "commercial"
 
-MACHINE_FEATURES:append = " multimedia"
+MACHINE_FEATURES:append:rcar-gen3 = " multimedia"
 
-DISTRO_FEATURES:append = " use_eva_pkg"
+DISTRO_FEATURES:append:rcar-gen3 = " use_eva_pkg"
 
-#DISTRO_FEATURES:append = " h265dec_lib mpeg2dec_lib"
-DISTRO_FEATURES:append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw"
+#DISTRO_FEATURES:append:rcar-gen3 = " h265dec_lib mpeg2dec_lib"
+DISTRO_FEATURES:append:rcar-gen3 = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw"
 
 # Mask out meta-renesas-rcar-gen3's tweaks to weston-init, as they do
 # not seem necessary for anything in AGL, and the addition of
diff --git a/meta-agl-bsp/conf/include/agl_refhw-h3.inc b/meta-agl-bsp/conf/include/agl_refhw-h3.inc
index 68c0007bd..6eee8149f 100644
--- a/meta-agl-bsp/conf/include/agl_refhw-h3.inc
+++ b/meta-agl-bsp/conf/include/agl_refhw-h3.inc
@@ -1,11 +1,11 @@
-AGL_FEATURES:append = " agl-refhw-h3"
+AGL_FEATURES:append:h3ulcb = " agl-refhw-h3"
 
 # Reference hardware has USB3
-MACHINE_FEATURES:append = " usb3"
+MACHINE_FEATURES:append:h3ulcb = " usb3"
 
-KERNEL_DEVICETREE:append = " renesas/r8a77951-agl-refhw.dtb"
+KERNEL_DEVICETREE:append:h3ulcb = " renesas/r8a77951-agl-refhw.dtb"
 
-UBOOT_CONFIG:append = " agl-refhw"
+UBOOT_CONFIG:append:h3ulcb = " agl-refhw"
 UBOOT_CONFIG[agl-refhw] = "rcar3_salvator-x_defconfig"
 
 MACHINE_EXTRA_RRECOMMENDS:append:h3ulcb = " \