summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/conf
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2018-03-20 13:52:16 +0100
committerRonan Le Martret <ronan.lemartret@iot.bzh>2018-03-20 13:57:58 +0100
commit5c51374181e9134c1553a989314b54a8be1f4b12 (patch)
tree788a74413882d24f4a516c7022415976d2bfd59b /meta-agl-bsp/conf
parentf76255eb84830a981c2539b2706d8c4ec9134939 (diff)
parenta9e1f1a2581002c30b353105e254705a8da598bc (diff)
Merge branch 'sandbox/ronan/rocko_kf'
Add Kingfisher board support for AGL master * Currently the renesas 3.4 BSP support, for Kingfisher, is provided by Cogent. https://github.com/Cogenh3ulcbtEmbedded/meta-rcar * Add cogent BSP for h3ulcb, m3ulcb, m3ulcb-nogfx * Update BBMASK for gen3 board * Backport Matt Porter fix "preserve drm HDMI connector naming" * ti-bt: add a systemd unit and enable * ulcb: Disable build-in most driver * si-tools: FM configuration improvements Bug-AGL: SPEC-1175 Change-Id: I350a13e474e2dea83abe84c5a4cc0cd3e58fc442 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-agl-bsp/conf')
-rw-r--r--meta-agl-bsp/conf/include/agl_h3ulcb.inc4
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc5
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb.inc2
3 files changed, 2 insertions, 9 deletions
diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
index e2ebd85c6..93ef834ba 100644
--- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@ -21,13 +21,9 @@ 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"
-
MACHINE_FEATURES_append = " multimedia"
DISTRO_FEATURES_append = " use_eva_pkg"
diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
index 726d233b6..c0ebb5f65 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
@@ -1,11 +1,10 @@
SOC_FAMILY = "r8a7796"
# 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 = " sota"
OSTREE_KERNEL = "Image"
diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
index cce7dbd5e..788732495 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@ -21,8 +21,6 @@ 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"