From c23246d7bfeec65dc69eb381adc38916df486ad2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 2 Sep 2016 11:58:28 +0300 Subject: 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 --- conf/bblayers.conf.bbb.sample | 54 ------------------------------------- conf/bblayers.conf.sample | 11 +++----- conf/distro/include/am335x-evm.conf | 15 ++--------- conf/distro/include/beaglebone.conf | 25 +++-------------- conf/distro/include/ti.inc | 13 +++++++++ 5 files changed, 21 insertions(+), 97 deletions(-) delete mode 100644 conf/bblayers.conf.bbb.sample (limited to 'conf') diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample deleted file mode 100644 index 2a3ce11..0000000 --- a/conf/bblayers.conf.bbb.sample +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -POKY_BBLAYERS_CONF_VERSION = "2" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" - -BBLAYERS ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-poky \ - ${BSPDIR}/sources/meta-beagleboard/common-bsp \ - ${BSPDIR}/sources/meta-ti \ - ${BSPDIR}/sources/meta-fsl-arm \ - ${BSPDIR}/sources/meta-openembedded/meta-oe \ - ${BSPDIR}/sources/meta-openembedded/meta-python \ - ${BSPDIR}/sources/meta-openembedded/meta-networking \ - ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ - ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ - ${BSPDIR}/sources/meta-boot2qt \ - ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \ - ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \ - ${BSPDIR}/sources/meta-mingw \ - ${BSPDIR}/sources/meta-qt5 \ - " diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 95b4e3f..381c488 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -38,17 +38,12 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ ${BSPDIR}/sources/poky/meta-poky \ - ${BSPDIR}/sources/meta-fsl-arm \ - ${BSPDIR}/sources/meta-fsl-arm-extra \ - ${BSPDIR}/sources/meta-beagleboard/common-bsp \ - ${BSPDIR}/sources/meta-ti \ - ${BSPDIR}/sources/meta-raspberrypi \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ + ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ ${BSPDIR}/sources/meta-boot2qt \ - ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \ - ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \ - ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " 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 \ + " -- cgit v1.2.3-54-g00ecf