Merge remote-tracking branch 'origin/sandbox/sdesneux/thud-upgrade'

Update the core distro to YP 2.6 'thud'.

Bug-AGL: SPEC-1837

Change-Id: I5a753503c4ca15bcb0d4f0f30c4a91e7d50ab024
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

6 files changed, 8 insertions, 17 deletions

diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
index 876d6e9a6..12c0a2797 100644
--- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
+++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
@@ -24,22 +24,11 @@ PREFERRED_VERSION_libgbm            = "10.0.0"
 ## Multimedia section ##
 #-------------------------------------------------
 
-# FIXME
-GSTREAMER_PLUGINS = ""
-DISABLED_ROCKO_GSTREAMER_PLUGINS = " \
-     gstreamer1.0-plugins-bad-meta \
-     gstreamer1.0-plugins-ducati \
-     gstreamer1.0-plugins-vpe \
-"
-
 PACKAGES_MULTIMEDIA   = " \
     ipumm-fw \
     pulseaudio-misc      \
-    ${GSTREAMER_PLUGINS} \
 "
 
-PREFERRED_VERSION_ipumm-fw          = "3.00.13.00"
-
 PREFERRED_PROVIDER_virtual/kernel  = "linux-ti-staging"
 PREFERRED_VERSION_virtual/kernel  = "4.9"
 
diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
index 534d36475..4fab6923e 100644
--- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
+++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
@@ -2,7 +2,7 @@
 #
 IMAGE_INSTALL_append = " \
         libva \
-        va-intel \
+        intel-vaapi-driver \
         gstreamer1.0-vaapi"
 
 AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
@@ -12,5 +12,5 @@ INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz"
 # kernel command line, including to change the screen resolution.
 WKS_FILE = "systemd-intel-corei7-64-bootdisk.wks"
 
-PREFERRED_VERSION_linux-intel ?= "4.14%"
-PREFERRED_VERSION_linux-intel-rt ?= "4.14%"
+PREFERRED_VERSION_linux-intel ?= "4.19%"
+PREFERRED_VERSION_linux-intel-rt ?= "4.19%"
diff --git a/meta-agl-bsp/conf/include/agl_joule.inc b/meta-agl-bsp/conf/include/agl_joule.inc
index a7773b2e9..642fe423c 100644
--- a/meta-agl-bsp/conf/include/agl_joule.inc
+++ b/meta-agl-bsp/conf/include/agl_joule.inc
@@ -3,7 +3,7 @@ INTEL_MACHINE_SUBTYPE = "broxton-m"
 IMAGE_INSTALL_append = " linux-firmware-iwlwifi-8000c linux-firmware-ibt"
 IMAGE_INSTALL_append = " \
         libva \
-        va-intel \
+        intel-vaapi-driver \
         gstreamer1.0-vaapi"
 OSTREE_BOOTLOADER ?= "u-boot"
 
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index 23a37c2da..298cacd56 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@ -17,7 +17,7 @@ MACHINE_FEATURES += "vc4graphics"
 # For libomxil
 #LICENSE_FLAGS_WHITELIST = "commercial"
 
-IMAGE_INSTALL_append = " kernel-modules linux-firmware-raspbian-bcm43430 linux-firmware-raspbian-bcm43455 create-combined-dtb "
+IMAGE_INSTALL_append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux-firmware-rpidistro-bcm43455 create-combined-dtb "
 
 # Psplash causes crash on first boot on RPi
 IMAGE_FEATURES_remove = "splash"
diff --git a/meta-agl-bsp/conf/layer.conf b/meta-agl-bsp/conf/layer.conf
index 7c996cafe..35bf81123 100644
--- a/meta-agl-bsp/conf/layer.conf
+++ b/meta-agl-bsp/conf/layer.conf
@@ -22,3 +22,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "aglbsp"
 BBFILE_PATTERN_aglbsp = "^${LAYERDIR}/"
 BBFILE_PRIORITY_aglbsp = "60"
+
+LAYERSERIES_COMPAT_aglbsp = "thud"
diff --git a/meta-agl-bsp/conf/machine/qemuarm.conf b/meta-agl-bsp/conf/machine/qemuarm.conf
index d47c05208..8d41d6927 100644
--- a/meta-agl-bsp/conf/machine/qemuarm.conf
+++ b/meta-agl-bsp/conf/machine/qemuarm.conf
@@ -15,4 +15,4 @@ QB_MACHINE = "-machine virt"
 
 # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
 QB_OPT_APPEND = "-show-cursor -usb -device virtio-rng-pci"
-PREFERRED_VERSION_linux-yocto ??= "4.12%"
+PREFERRED_VERSION_linux-yocto ??= "4.18%"