Merge "Merge branch 'sandbox/ronan/rocko_kf'"

diff --combined meta-agl-bsp/conf/include/agl_h3ulcb.inc
index 818d508,93ef834..cb4edb4
--- 1/meta-agl-bsp/conf/include/agl_h3ulcb.inc
--- 2/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@@ -21,13 -21,9 +21,9 @@@ PREFERRED_RPROVIDER_libgbm-dev = "libgb
  
  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"
  
- 
  MACHINE_FEATURES_append = " multimedia"
  
  DISTRO_FEATURES_append = " use_eva_pkg"
@@@ -35,6 -31,8 +31,6 @@@
  #DISTRO_FEATURES_append = " h265dec_lib mpeg2dec_lib"
  DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw"
  
 -DISTRO_FEATURES_BACKFILL_remove = "gobject-introspection-data"
 -
  IMAGE_INSTALL_append_rcar-gen3 = " \
        kernel-devicetree \
        kernel-module-pvrsrvkm \

diff --combined meta-agl-bsp/conf/include/agl_m3ulcb.inc
index 14abd2c,7887324..46c6f1f
--- 1/meta-agl-bsp/conf/include/agl_m3ulcb.inc
--- 2/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@@ -21,8 -21,6 +21,6 @@@ PREFERRED_RPROVIDER_libgbm-dev = "libgb
  
  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"
@@@ -35,6 -33,8 +33,6 @@@ DISTRO_FEATURES_append = " use_eva_pkg
  #DISTRO_FEATURES_append = " h265dec_lib mpeg2dec_lib"
  DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw"
  
 -DISTRO_FEATURES_BACKFILL_remove = "gobject-introspection-data"
 -
  IMAGE_INSTALL_append_rcar-gen3 = " \
        kernel-devicetree \
        kernel-module-pvrsrvkm \