Support meta-ti 2019.04 release

* The libgbm recipe has disappeared. "virtual/libgbm" is now provided by
  ti-sgx-ddk-um.

* Update ti-sgx-ddk-km and adapt the AGL toolchain support to fit with
  the upstream Makefile changes.

Change-Id: I2744868b466306cf2c1cb458a6889ab2043f9421
Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk>

9 files changed, 35 insertions, 33 deletions

diff --git a/meta-agl-bsp/conf/include/agl_bbe.inc b/meta-agl-bsp/conf/include/agl_bbe.inc
index 57adb2de5..5dc817099 100644
--- a/meta-agl-bsp/conf/include/agl_bbe.inc
+++ b/meta-agl-bsp/conf/include/agl_bbe.inc
@@ -22,11 +22,8 @@ DEPENDS_remove = "virtual/libgl"
 PREFERRED_PROVIDER_virtual/libgles1 = ""
 PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/egl      = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm   = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/mesa     = "mesa-gl"
-PREFERRED_PROVIDER_libgbm           = "libgbm"
-
-#Preferred versions
-PREFERRED_VERSION_libgbm            = "10.0.0"
 
 #-------------------------------------------------
 ## Multimedia section ##
diff --git a/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl-bsp/conf/include/agl_beaglebone.inc
index cd8b263aa..1917ff45d 100644
--- a/meta-agl-bsp/conf/include/agl_beaglebone.inc
+++ b/meta-agl-bsp/conf/include/agl_beaglebone.inc
@@ -17,11 +17,8 @@ DEPENDS_remove = "virtual/libgl"
 PREFERRED_PROVIDER_virtual/libgles1 = ""
 PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/egl      = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm   = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/mesa     = "mesa-gl"
-PREFERRED_PROVIDER_libgbm           = "libgbm"
-
-#Preferred versions
-PREFERRED_VERSION_libgbm            = "10.0.0"
 
 #-------------------------------------------------
 ## Multimedia section ##
diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
index b961ba14a..2e7741a52 100644
--- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
+++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
@@ -14,11 +14,8 @@ DEPENDS_remove = "virtual/libgl"
 PREFERRED_PROVIDER_virtual/libgles1 = ""
 PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/egl      = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm   = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/mesa     = "mesa-gl"
-PREFERRED_PROVIDER_libgbm           = "libgbm"
-
-#Preferred versions
-PREFERRED_VERSION_libgbm            = "10.0.0"
 
 #-------------------------------------------------
 ## Multimedia section ##
diff --git a/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_%.bbappend b/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_%.bbappend
index 5d27bb8ed..718d6f86a 100644
--- a/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_%.bbappend
+++ b/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_%.bbappend
@@ -1,6 +1,6 @@
 # When configured for fbdev compositor, make it the default
 PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
-PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
+PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/libgbm mtdev"
 
 PR_append = ".agl_arago_23"
 
diff --git a/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/0001-Add-support-for-AGL-toolchain.patch b/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/0001-Add-support-for-AGL-toolchain.patch
new file mode 100644
index 000000000..93aff157a
--- /dev/null
+++ b/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/0001-Add-support-for-AGL-toolchain.patch
@@ -0,0 +1,30 @@
+From 11131a5e778d19c06eefbcf61447c6efbcee0613 Mon Sep 17 00:00:00 2001
+From: Paul Barker <paul.barker@sancloud.co.uk>
+Date: Mon, 18 Nov 2019 08:47:41 +0000
+Subject: [PATCH] Add support for AGL toolchain
+
+We can use the pre-existing config for arm-linux-gnueabihf, we just need
+to make sure our toolchain is matched against this and not
+arm-linux-gnueabi.
+
+Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk>
+---
+ eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
+index 2ba3e5e..03e86c5 100644
+--- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
++++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
+@@ -68,7 +68,7 @@ define calculate-compiler-preferred-target
+   ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),)
+    $(1)_compiler_preferred_target := aarch64-linux-gnu
+   endif
+-  ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
++  ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi arm-agl-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
+    $(1)_compiler_preferred_target := arm-linux-gnueabihf
+   endif
+   ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
+-- 
+2.17.1
+
diff --git a/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/add-AGL-toolchain-config.patch b/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/add-AGL-toolchain-config.patch
deleted file mode 100644
index 9fdd95b4c..000000000
--- a/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/add-AGL-toolchain-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-agl-linux-gnueabi.mk b/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-agl-linux-gnueabi.mk
-new file mode 100644
-index 0000000..2abaa9f
---- /dev/null
-+++ b/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-agl-linux-gnueabi.mk
-@@ -0,0 +1,6 @@
-+# 32-bit ARM hard float compiler
-+ifeq ($(MULTIARCH),1)
-+ TARGET_SECONDARY_ARCH := target_armhf
-+else
-+ TARGET_PRIMARY_ARCH   := target_armhf
-+endif
diff --git a/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend b/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend
index 182f6cac2..6390e660e 100644
--- a/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend
+++ b/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend
@@ -1,4 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI += "file://add-AGL-toolchain-config.patch"
-SRCREV = "16961a3f4524b653fba99d949d6972c77c7d2701"
+SRC_URI += "file://0001-Add-support-for-AGL-toolchain.patch"
diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend
deleted file mode 100644
index 7a16fbfe6..000000000
--- a/meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hotfix for rpm metadata clash with ti-sgx-ddk-um-dev
-DIRFILES = "1"
diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend
index fe93f1a6b..21142df59 100644
--- a/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend
+++ b/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend
@@ -16,7 +16,3 @@ do_install_append() {
 	install -d ${D}/etc/ti-sgx
 	install -m 0755 ${D}/etc/init.d/rc.pvr ${D}/etc/ti-sgx
 }
-
-
-# Fix for rpm metadata clash with libgbm-dev
-DIRFILES = "1"