summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-09-02 11:58:28 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-09-12 12:34:57 +0000
commitc23246d7bfeec65dc69eb381adc38916df486ad2 (patch)
tree4d945e4274eae3089b57b2e0cf5f0fc5c8b374d0 /conf
parent0ae680c6463b82dfcd4a7692eb35dc4a9456b2f7 (diff)
downloadmeta-boot2qt-c23246d7bfeec65dc69eb381adc38916df486ad2.tar.gz
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>
Diffstat (limited to 'conf')
-rw-r--r--conf/bblayers.conf.bbb.sample54
-rw-r--r--conf/bblayers.conf.sample11
-rw-r--r--conf/distro/include/am335x-evm.conf15
-rw-r--r--conf/distro/include/beaglebone.conf25
-rw-r--r--conf/distro/include/ti.inc13
5 files changed, 21 insertions, 97 deletions
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 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly
32POKY_BBLAYERS_CONF_VERSION = "2"
33
34BBPATH = "${TOPDIR}"
35BBFILES ?= ""
36BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
37
38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-beagleboard/common-bsp \
42 ${BSPDIR}/sources/meta-ti \
43 ${BSPDIR}/sources/meta-fsl-arm \
44 ${BSPDIR}/sources/meta-openembedded/meta-oe \
45 ${BSPDIR}/sources/meta-openembedded/meta-python \
46 ${BSPDIR}/sources/meta-openembedded/meta-networking \
47 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
48 ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
49 ${BSPDIR}/sources/meta-boot2qt \
50 ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
51 ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
52 ${BSPDIR}/sources/meta-mingw \
53 ${BSPDIR}/sources/meta-qt5 \
54 "
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)) + '/../..'
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-poky \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-fsl-arm \
42 ${BSPDIR}/sources/meta-fsl-arm-extra \
43 ${BSPDIR}/sources/meta-beagleboard/common-bsp \
44 ${BSPDIR}/sources/meta-ti \
45 ${BSPDIR}/sources/meta-raspberrypi \
46 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 41 ${BSPDIR}/sources/meta-openembedded/meta-oe \
42 ${BSPDIR}/sources/meta-openembedded/meta-python \
43 ${BSPDIR}/sources/meta-openembedded/meta-networking \
44 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
47 ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ 45 ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
48 ${BSPDIR}/sources/meta-boot2qt \ 46 ${BSPDIR}/sources/meta-boot2qt \
49 ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
50 ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
51 ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
52 ${BSPDIR}/sources/meta-mingw \ 47 ${BSPDIR}/sources/meta-mingw \
53 ${BSPDIR}/sources/meta-qt5 \ 48 ${BSPDIR}/sources/meta-qt5 \
54 " 49 "
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"
39 39
40DISTRO_FEATURES_remove = "webengine" 40DISTRO_FEATURES_remove = "webengine"
41 41
42PREFERRED_VERSION_linux-ti-staging = "3.14%" 42MACHINE_EXTRA_INSTALL += "\
43
44PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
45PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
46
47PREFERRED_VERSION_libgles-omap3 = "5.01.01.02"
48PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02"
49
50MACHINE_EXTRA_INSTALL = "\
51 libgles-omap3 \
52 libgles-omap3-rawdemos \
53 lighttpd \ 43 lighttpd \
54 " 44 "
55 45
56MACHINE_EXTRA_INSTALL_SDK = "\ 46MACHINE_EXTRA_INSTALL_SDK += "\
57 libgles-omap3-dev \
58 " 47 "
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"
34BOOTFS_CONTENT = "\ 34BOOTFS_CONTENT = "\
35 u-boot-${MACHINE}.img:u-boot.img \ 35 u-boot-${MACHINE}.img:u-boot.img \
36 MLO-${MACHINE}:MLO \ 36 MLO-${MACHINE}:MLO \
37 uEnv-${MACHINE}.txt:uEnv.txt \
38 " 37 "
39BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy" 38BOOTFS_DEPENDS = "u-boot:do_deploy"
40
41EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
42 39
43DISTRO_FEATURES_remove = "webengine" 40DISTRO_FEATURES_remove = "webengine"
44 41
45PREFERRED_VERSION_libgles-omap3 = "4.10.00.01" 42MACHINE_EXTRA_INSTALL += "\
46PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01"
47
48PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
49PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
50
51PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
52EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
53UBOOT_MACHINE = "am335x_boneblack_config"
54KERNEL_IMAGETYPE = "zImage"
55
56MACHINE_EXTRA_INSTALL = "\
57 libgles-omap3 \
58 libgles-omap3-rawdemos \
59 " 43 "
60 44
61MACHINE_EXTRA_INSTALL_SDK = "\ 45MACHINE_EXTRA_INSTALL_SDK += "\
62 libgles-omap3-dev \
63 " 46 "
64 47
65ADB_PRODUCTID = "0xD002" 48ADB_PRODUCTID = "0xD002"
66
67DEFAULTTUNE = "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"
34 34
35UBOOT_SUFFIX = "img" 35UBOOT_SUFFIX = "img"
36BOOT_SCRIPTS = "${BOOTFS_CONTENT}" 36BOOT_SCRIPTS = "${BOOTFS_CONTENT}"
37
38PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
39PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
40PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
41
42MACHINE_EXTRA_INSTALL += "\
43 ti-sgx-ddk-km \
44 ti-sgx-ddk-um \
45 "
46
47MACHINE_EXTRA_INSTALL_SDK += "\
48 ti-sgx-ddk-um-dev \
49 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-24 01:09:29 +0000