diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-13 14:06:53 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-18 06:46:25 +0000 |
commit | 746ebaa87f5f2bf8722b4d5e84822e065daa4266 (patch) | |
tree | 5403c2fca36c14f5dc8b1844f2a41d63be3bcb2a /meta-ti-extras | |
parent | ac3620551872d8196505425648eaef9ee0bb771f (diff) | |
download | meta-boot2qt-746ebaa87f5f2bf8722b4d5e84822e065daa4266.tar.gz |
Revert "BBB: use new kernel"
This reverts commit 2848919526f575d9eaaccf19d4bfaa4a0f4043c2.
New kernel is missing cape manager and HDMI output does not work.
Change-Id: I5acf277c8ec96cec253a1c9cd2cbfef547baf81e
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'meta-ti-extras')
5 files changed, 0 insertions, 106 deletions
diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend index ee30872..49f8f58 100644 --- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend +++ b/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend | |||
@@ -25,7 +25,3 @@ SRC_URI += "\ | |||
25 | " | 25 | " |
26 | KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg" | 26 | KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg" |
27 | KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb" | 27 | KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb" |
28 | |||
29 | KERNEL_GIT_URI = "git://github.com/beagleboard/linux" | ||
30 | BRANCH = "3.14" | ||
31 | SRCREV = "b36a2d5ca4e2859c92fac09ccedf4e42d620dda7" | ||
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Rename-omap_dss_device-output-to-src.patch b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Rename-omap_dss_device-output-to-src.patch deleted file mode 100644 index 6b0b4c7..0000000 --- a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Rename-omap_dss_device-output-to-src.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 643c4eb9f6e09f3b674990285da7fb1174d6f450 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | ||
3 | Date: Thu, 17 Mar 2016 11:58:40 +0200 | ||
4 | Subject: [PATCH] Rename omap_dss_device output to src | ||
5 | |||
6 | --- | ||
7 | services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c | 2 +- | ||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c b/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c | ||
11 | index 17bf181..ebacc51 100644 | ||
12 | --- a/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c | ||
13 | +++ b/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c | ||
14 | @@ -177,7 +177,7 @@ MODULE_SUPPORTED_DEVICE(DEVNAME); | ||
15 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)) | ||
16 | #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->manager : NULL | ||
17 | #else | ||
18 | -#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->output->manager : NULL | ||
19 | +#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->src->manager : NULL | ||
20 | #endif | ||
21 | |||
22 | #define WAIT_FOR_VSYNC(man) ((man)->wait_for_vsync) | ||
23 | -- | ||
24 | 1.9.1 | ||
25 | |||
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_5.01.01.02.bbappend b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_5.01.01.02.bbappend deleted file mode 100644 index 0fad030..0000000 --- a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_5.01.01.02.bbappend +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | ############################################################################## | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: http://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:COMM$ | ||
9 | ## | ||
10 | ## Commercial License Usage | ||
11 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
12 | ## accordance with the commercial license agreement provided with the | ||
13 | ## Software or, alternatively, in accordance with the terms contained in | ||
14 | ## a written agreement between you and The Qt Company. For licensing terms | ||
15 | ## and conditions see http://www.qt.io/terms-conditions. For further | ||
16 | ## information use the contact form at http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## $QT_END_LICENSE$ | ||
19 | ## | ||
20 | ############################################################################## | ||
21 | |||
22 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
23 | SRC_URI += "file://0001-Rename-omap_dss_device-output-to-src.patch" | ||
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-uenv-script.bb b/meta-ti-extras/recipes/u-boot/u-boot-uenv-script.bb deleted file mode 100644 index 5695561..0000000 --- a/meta-ti-extras/recipes/u-boot/u-boot-uenv-script.bb +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | ############################################################################## | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: http://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:COMM$ | ||
9 | ## | ||
10 | ## Commercial License Usage | ||
11 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
12 | ## accordance with the commercial license agreement provided with the | ||
13 | ## Software or, alternatively, in accordance with the terms contained in | ||
14 | ## a written agreement between you and The Qt Company. For licensing terms | ||
15 | ## and conditions see http://www.qt.io/terms-conditions. For further | ||
16 | ## information use the contact form at http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## $QT_END_LICENSE$ | ||
19 | ## | ||
20 | ############################################################################## | ||
21 | |||
22 | DESCRIPTION = "U-Boot script to start up BeagleBone Black" | ||
23 | LICENSE = "CLOSED" | ||
24 | PR = "r0" | ||
25 | |||
26 | COMPATIBLE_MACHINE = "(beaglebone)" | ||
27 | PV = "20140225" | ||
28 | |||
29 | SRC_URI = "file://uEnv.txt" | ||
30 | |||
31 | inherit deploy | ||
32 | |||
33 | do_deploy () { | ||
34 | install -d ${DEPLOYDIR} | ||
35 | install ${WORKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv-${MACHINE}-${PV}-${PR}.txt | ||
36 | |||
37 | cd ${DEPLOYDIR} | ||
38 | rm -f uEnv-${MACHINE}.txt | ||
39 | ln -sf uEnv-${MACHINE}-${PV}-${PR}.txt uEnv-${MACHINE}.txt | ||
40 | } | ||
41 | |||
42 | addtask deploy after do_install before do_build | ||
43 | |||
44 | do_compile[noexec] = "1" | ||
45 | do_install[noexec] = "1" | ||
46 | do_populate_sysroot[noexec] = "1" | ||
47 | |||
48 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt b/meta-ti-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt deleted file mode 100644 index d41ef60..0000000 --- a/meta-ti-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | optargs=consoleblank=0 vt.global_cursor_default=0 quiet | ||
2 | # extra options to support older u-boot (2013) | ||
3 | bootfile=zImage | ||
4 | loadaddr=0x80200000 | ||
5 | loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile} | ||
6 | mmcboot=echo Booting from mmc ...; run mmcargs; bootz ${loadaddr} - ${fdtaddr} | ||