aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-03-21 14:32:11 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2017-03-21 14:32:11 +0000
commite938bb19b70526dbd9d947bc7b75d322aa308769 (patch)
tree823ba9b1e43c398abd38c3969f73717feebef525
parente3a1d932aae88ae60aee8dea67d45c07eebaef80 (diff)
parent401a158e6a8a95e722de72cfc96f1a3293b4abbc (diff)
Merge "[rcar-gen3] Update h3 m3 to renesas rcar gen3 BSP v2.16.0 (branch:morty)"
-rw-r--r--meta-agl-bsp/conf/include/agl_h3ulcb.inc12
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb.inc10
-rw-r--r--templates/machine/h3ulcb/50_bblayers.conf.inc2
-rw-r--r--templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc2
-rw-r--r--templates/machine/m3ulcb/50_bblayers.conf.inc2
6 files changed, 15 insertions, 15 deletions
diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
index 05e06d17b..a35f7ef16 100644
--- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@ -22,11 +22,11 @@ BBMASK = "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer"
# Add for gstreamer plugins ugly
LICENSE_FLAGS_WHITELIST = "commercial"
-PREFERRED_VERSION_gstreamer1.0-libav = "1.4.5"
-PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.4.5"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.4.5"
-PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.4.5"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.4.5"
+PREFERRED_VERSION_gstreamer1.0-libav = "1.6.3"
+PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.6.3"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.6.3"
+PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.6.3"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.6.3"
PREFERRED_VERSION_gstreamer1.0-plugins-vspfilter = "1.0%"
MACHINE_FEATURES_append = " multimedia"
@@ -44,4 +44,4 @@ IMAGE_INSTALL_append_rcar-gen3 = " \
kernel-module-vspm-if \
omx-user-module \
weston-bin \
-"
+" \ No newline at end of file
diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
index c2e7ad23f..8985a2738 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
@@ -7,5 +7,5 @@ IMAGE_INSTALL_append = " \
# Mask graphic Pkgs
BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm"
# Mask MMP recipes
-BBMASK .= "|kernel-module-uvcs|omx-user-module"
+BBMASK .= "|kernel-module-uvcs-drv|omx-user-module"
diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
index 5852b6f06..bae0e2643 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@ -22,11 +22,11 @@ BBMASK = "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer"
# Add for gstreamer plugins ugly
LICENSE_FLAGS_WHITELIST = "commercial"
-PREFERRED_VERSION_gstreamer1.0-libav = "1.4.5"
-PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.4.5"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.4.5"
-PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.4.5"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.4.5"
+PREFERRED_VERSION_gstreamer1.0-libav = "1.6.3"
+PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.6.3"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.6.3"
+PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.6.3"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.6.3"
PREFERRED_VERSION_gstreamer1.0-plugins-vspfilter = "1.0%"
MACHINE_FEATURES_append = " multimedia"
diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index f797e9753..b58989c6f 100644
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/meta-rcar/meta-rcar-gen3 \
+ ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
"
diff --git a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index f797e9753..b58989c6f 100644
--- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,3 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/meta-rcar/meta-rcar-gen3 \
+ ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
"
diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index f797e9753..b58989c6f 100644
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/meta-rcar/meta-rcar-gen3 \
+ ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
"