TI: Use latest versions of u-boot and kernel

Remove use of meta-beagleboard and use recipes provided in meta-ti instead.
Beaglebone will not work fully with the linux-ti-staging, follow up commit
will fix that. U-boot changes need to be ported to newer version if still
required.

Change-Id: I3e06b6e310c0d40b9b4b33276802e4817cee0295
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

3 files changed, 18 insertions, 35 deletions

diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 12f8a57..cc4f573 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -39,20 +39,9 @@ BOOTFS_DEPENDS = "u-boot:do_deploy"
 
 DISTRO_FEATURES_remove = "webengine"
 
-PREFERRED_VERSION_linux-ti-staging = "3.14%"
-
-PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
-PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
-
-PREFERRED_VERSION_libgles-omap3 = "5.01.01.02"
-PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02"
-
-MACHINE_EXTRA_INSTALL = "\
-        libgles-omap3 \
-        libgles-omap3-rawdemos \
+MACHINE_EXTRA_INSTALL += "\
         lighttpd \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
-        libgles-omap3-dev \
+MACHINE_EXTRA_INSTALL_SDK += "\
         "
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index da4ed1c..372626f 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -34,34 +34,15 @@ DEPLOY_CONF_NAME = "BeagleBone Black"
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.img:u-boot.img \
     MLO-${MACHINE}:MLO \
-    uEnv-${MACHINE}.txt:uEnv.txt \
     "
-BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy"
-
-EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
+BOOTFS_DEPENDS = "u-boot:do_deploy"
 
 DISTRO_FEATURES_remove = "webengine"
 
-PREFERRED_VERSION_libgles-omap3 = "4.10.00.01"
-PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01"
-
-PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
-PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
-
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
-UBOOT_MACHINE = "am335x_boneblack_config"
-KERNEL_IMAGETYPE = "zImage"
-
-MACHINE_EXTRA_INSTALL = "\
-        libgles-omap3 \
-        libgles-omap3-rawdemos \
+MACHINE_EXTRA_INSTALL += "\
         "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
-        libgles-omap3-dev \
+MACHINE_EXTRA_INSTALL_SDK += "\
         "
 
 ADB_PRODUCTID = "0xD002"
-
-DEFAULTTUNE = "armv7ahf-neon"
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index 2f0d6cb..a97511a 100644
--- a/conf/distro/include/ti.inc
+++ b/conf/distro/include/ti.inc
@@ -34,3 +34,16 @@ IMAGE_CLASSES += "image_types_fsl"
 
 UBOOT_SUFFIX = "img"
 BOOT_SCRIPTS = "${BOOTFS_CONTENT}"
+
+PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
+
+MACHINE_EXTRA_INSTALL += "\
+    ti-sgx-ddk-km \
+    ti-sgx-ddk-um \
+    "
+
+MACHINE_EXTRA_INSTALL_SDK += "\
+    ti-sgx-ddk-um-dev \
+    "