diff options
32 files changed, 12 insertions, 397 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 1f07d46..a1f0efb 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env | |||
@@ -107,7 +107,7 @@ get_groups() { | |||
107 | PROJECT_GROUPS="external" | 107 | PROJECT_GROUPS="external" |
108 | ;; | 108 | ;; |
109 | apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) | 109 | apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) |
110 | PROJECT_GROUPS="toradex" | 110 | PROJECT_GROUPS="fsl" |
111 | ;; | 111 | ;; |
112 | imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd) | 112 | imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd) |
113 | PROJECT_GROUPS="fsl" | 113 | PROJECT_GROUPS="fsl" |
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 6bd83c8..95b4e3f 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample | |||
@@ -43,14 +43,12 @@ BBLAYERS ?= " \ | |||
43 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ | 43 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ |
44 | ${BSPDIR}/sources/meta-ti \ | 44 | ${BSPDIR}/sources/meta-ti \ |
45 | ${BSPDIR}/sources/meta-raspberrypi \ | 45 | ${BSPDIR}/sources/meta-raspberrypi \ |
46 | ${BSPDIR}/sources/meta-toradex \ | ||
47 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 46 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
48 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ | 47 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ |
49 | ${BSPDIR}/sources/meta-boot2qt \ | 48 | ${BSPDIR}/sources/meta-boot2qt \ |
50 | ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \ | 49 | ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \ |
51 | ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \ | 50 | ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \ |
52 | ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \ | 51 | ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \ |
53 | ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \ | ||
54 | ${BSPDIR}/sources/meta-mingw \ | 52 | ${BSPDIR}/sources/meta-mingw \ |
55 | ${BSPDIR}/sources/meta-qt5 \ | 53 | ${BSPDIR}/sources/meta-qt5 \ |
56 | " | 54 | " |
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample deleted file mode 100644 index 9472025..0000000 --- a/conf/bblayers.conf.toradex.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 | ||
32 | POKY_BBLAYERS_CONF_VERSION = "2" | ||
33 | |||
34 | BBPATH = "${TOPDIR}" | ||
35 | BBFILES ?= "" | ||
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | ||
37 | |||
38 | BBLAYERS ?= " \ | ||
39 | ${BSPDIR}/sources/poky/meta \ | ||
40 | ${BSPDIR}/sources/poky/meta-poky \ | ||
41 | ${BSPDIR}/sources/meta-toradex \ | ||
42 | ${BSPDIR}/sources/meta-fsl-arm \ | ||
43 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | ||
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-fsl-extras \ | ||
51 | ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \ | ||
52 | ${BSPDIR}/sources/meta-mingw \ | ||
53 | ${BSPDIR}/sources/meta-qt5 \ | ||
54 | " | ||
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index fdc211d..58bcdba 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf | |||
@@ -27,7 +27,6 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/toradex.inc | ||
31 | include conf/distro/include/imx6.inc | 30 | include conf/distro/include/imx6.inc |
32 | include conf/distro/include/imx6-egl.inc | 31 | include conf/distro/include/imx6-egl.inc |
33 | 32 | ||
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 6427ee9..eabaf91 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf | |||
@@ -27,7 +27,6 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/toradex.inc | ||
31 | include conf/distro/include/imx6.inc | 30 | include conf/distro/include/imx6.inc |
32 | include conf/distro/include/imx6-egl.inc | 31 | include conf/distro/include/imx6-egl.inc |
33 | 32 | ||
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 722da17..193e6aa 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf | |||
@@ -20,8 +20,6 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | include conf/distro/include/toradex.inc | ||
24 | |||
25 | DEPLOY_CONF_NAME = "Toradex Colibri iMX7" | 23 | DEPLOY_CONF_NAME = "Toradex Colibri iMX7" |
26 | 24 | ||
27 | IMAGE_FSTYPES += "ext3 sdcard" | 25 | IMAGE_FSTYPES += "ext3 sdcard" |
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index db970fd..e4fdd93 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
@@ -27,14 +27,6 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/toradex.inc | ||
31 | |||
32 | BBMASK += "\ | ||
33 | meta-fsl-arm-extra/recipes-kernel/kernel-module-mcc-toradex \ | ||
34 | meta-fsl-arm-extra/recipes-kernel/kernel-modules/kernel-module-mcc_2.1.01.bb \ | ||
35 | meta-fsl-arm-extra/recipes-bsp/mqxboot \ | ||
36 | " | ||
37 | |||
38 | DEPLOY_CONF_NAME = "Toradex Colibri VF" | 30 | DEPLOY_CONF_NAME = "Toradex Colibri VF" |
39 | 31 | ||
40 | IMAGE_FSTYPES += "ext3 sdcard" | 32 | IMAGE_FSTYPES += "ext3 sdcard" |
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc deleted file mode 100644 index 54df01a..0000000 --- a/conf/distro/include/toradex.inc +++ /dev/null | |||
@@ -1,56 +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 | BBMASK += "\ | ||
31 | meta-toradex/recipes-mozilla \ | ||
32 | meta-toradex/recipes-browser \ | ||
33 | meta-toradex/recipes-lxde \ | ||
34 | meta-toradex/recipes-connectivity \ | ||
35 | meta-toradex/recipes-gnome \ | ||
36 | meta-toradex/recipes/trdx-config \ | ||
37 | meta-toradex/recipes-multimedia/webm \ | ||
38 | meta-toradex/recipes-qt \ | ||
39 | meta-toradex/recipes-core/psplash \ | ||
40 | meta-toradex/recipes-support/florence \ | ||
41 | meta-toradex/recipes-core/systemd \ | ||
42 | meta-toradex/recipes-efl \ | ||
43 | meta-toradex/recipes-core/dropbear \ | ||
44 | meta-toradex/recipes-support/icu \ | ||
45 | meta-toradex/recipes-support/i2c-tools \ | ||
46 | meta-toradex/recipes-benchmark \ | ||
47 | meta-toradex/recipes-core/udev \ | ||
48 | meta-toradex/recipes-support/gnutls \ | ||
49 | meta-toradex/recipes-graphics/gpu-viv-bin-mx6q \ | ||
50 | meta-toradex/recipes-multimedia/gstreamer \ | ||
51 | meta-toradex/recipes-fsl/packagegroups \ | ||
52 | meta-toradex/recipes-core/glibc \ | ||
53 | meta-toradex/recipes-sato/webkit \ | ||
54 | meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5 \ | ||
55 | meta-toradex/recipes-bsp/binary-drivers/opencv4tegra \ | ||
56 | " | ||
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend index b696b19..b696b19 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend | |||
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend index 77ce484..77ce484 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb index bb209ad..bb209ad 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr index ee87e85..ee87e85 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr index 207c7db..207c7db 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr index 3e05a85..3e05a85 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr index 0c16652..0c16652 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr index be8ec8d..be8ec8d 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr index e0770a0..e0770a0 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch index b7c7d63..5a456c5 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch | |||
@@ -1,19 +1,18 @@ | |||
1 | From 94531a3ecaea073316b9e4c341085ce5e277bd9f Mon Sep 17 00:00:00 2001 | 1 | From 4569a8b4997340aae34365f2f896b842f8cc114b Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@digia.com> | 2 | From: Samuli Piippo <samuli.piippo@digia.com> |
3 | Date: Mon, 27 Oct 2014 14:53:25 +0200 | 3 | Date: Mon, 27 Oct 2014 14:53:25 +0200 |
4 | Subject: [PATCH] Update default args for apalis imx6 | 4 | Subject: [PATCH] Update default args for apalis imx6 |
5 | 5 | ||
6 | Boot from sd card by default, disable kernel logs from tty1, and | 6 | Boot from sd card by default |
7 | disable cursor blinking. | ||
8 | --- | 7 | --- |
9 | include/configs/apalis_imx6.h | 15 ++++++++------- | 8 | include/configs/apalis_imx6.h | 13 +++++++------ |
10 | 1 file changed, 8 insertions(+), 7 deletions(-) | 9 | 1 file changed, 7 insertions(+), 6 deletions(-) |
11 | 10 | ||
12 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h | 11 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h |
13 | index e7d0d20..a1d425d 100644 | 12 | index 3ea4a5c..53d9a0c 100644 |
14 | --- a/include/configs/apalis_imx6.h | 13 | --- a/include/configs/apalis_imx6.h |
15 | +++ b/include/configs/apalis_imx6.h | 14 | +++ b/include/configs/apalis_imx6.h |
16 | @@ -251,14 +251,14 @@ | 15 | @@ -252,14 +252,14 @@ |
17 | "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | 16 | "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" |
18 | 17 | ||
19 | #define SD_BOOTCMD \ | 18 | #define SD_BOOTCMD \ |
@@ -33,7 +32,7 @@ index e7d0d20..a1d425d 100644 | |||
33 | "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | 32 | "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" |
34 | 33 | ||
35 | #define USB_BOOTCMD \ | 34 | #define USB_BOOTCMD \ |
36 | @@ -278,7 +278,8 @@ | 35 | @@ -279,7 +279,8 @@ |
37 | #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" | 36 | #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" |
38 | #endif | 37 | #endif |
39 | #define CONFIG_EXTRA_ENV_SETTINGS \ | 38 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
@@ -43,15 +42,6 @@ index e7d0d20..a1d425d 100644 | |||
43 | "run nfsboot ; echo ; echo nfsboot failed ; " \ | 42 | "run nfsboot ; echo ; echo nfsboot failed ; " \ |
44 | "usb start ;" \ | 43 | "usb start ;" \ |
45 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | 44 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ |
46 | @@ -299,7 +300,7 @@ | ||
47 | "|| setenv drive 2; load ${interface} ${drive}:1 " \ | ||
48 | "${kernel_addr_r} flash_blk.img\0" \ | ||
49 | "setup=setenv setupargs fec_mac=${ethaddr} " \ | ||
50 | - "consoleblank=0 no_console_suspend=1 console=tty1 " \ | ||
51 | + "consoleblank=0 no_console_suspend=1 vt.global_cursor_default=0 " \ | ||
52 | "console=${console},${baudrate}n8\0 " \ | ||
53 | "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \ | ||
54 | " source ${kernel_addr_r}\0" \ | ||
55 | -- | 45 | -- |
56 | 1.9.1 | 46 | 1.9.1 |
57 | 47 | ||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch index 501ad33..501ad33 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch index b54a4ae..b54a4ae 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch index 25476dd..25476dd 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend index bdae0b8..cb94605 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend | |||
@@ -31,6 +31,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
31 | SRC_URI += " \ | 31 | SRC_URI += " \ |
32 | file://0001-colibri-vf-remove-console-from-tty1.patch \ | 32 | file://0001-colibri-vf-remove-console-from-tty1.patch \ |
33 | file://0002-colibri-vf-fix-mmc-boot.patch \ | 33 | file://0002-colibri-vf-fix-mmc-boot.patch \ |
34 | file://0001-Update-default-args-for-apalis-imx6.patch \ | ||
34 | file://0001-colibri-imx7-fix-update-u-boot.patch \ | 35 | file://0001-colibri-imx7-fix-update-u-boot.patch \ |
35 | " | 36 | " |
36 | 37 | ||
diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf deleted file mode 100644 index 06eb3c7..0000000 --- a/meta-toradex-extras/conf/layer.conf +++ /dev/null | |||
@@ -1,40 +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 | # We have a conf and classes directory, append to BBPATH | ||
31 | BBPATH .= ":${LAYERDIR}" | ||
32 | |||
33 | # We have a recipes directory, add to BBFILES | ||
34 | BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ | ||
35 | ${LAYERDIR}/recipes*/*/*.bbappend \ | ||
36 | " | ||
37 | |||
38 | BBFILE_COLLECTIONS += "b2qt_toradex" | ||
39 | BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/" | ||
40 | BBFILE_PRIORITY_b2qt_toradex = "20" | ||
diff --git a/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab b/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab deleted file mode 100644 index 12e0489..0000000 --- a/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | # stock fstab - you probably want to override this with a machine specific one | ||
2 | |||
3 | /dev/root / auto defaults 1 1 | ||
4 | proc /proc proc defaults 0 0 | ||
5 | debugfs /sys/kernel/debug debugfs defaults 0 0 | ||
6 | devpts /dev/pts devpts mode=0620,gid=5 0 0 | ||
7 | usbfs /proc/bus/usb usbfs noauto | ||
8 | tmpfs /var/volatile tmpfs defaults 0 0 | ||
9 | tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 | ||
10 | tmpfs /dev/shm tmpfs mode=0777 0 0 | ||
11 | tmpfs /media/ram tmpfs defaults 0 0 | ||
12 | |||
13 | # uncomment this if your device has a SD/MMC/Transflash slot | ||
14 | #/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 | ||
15 | |||
diff --git a/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend b/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend deleted file mode 100644 index dbeb030..0000000 --- a/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend +++ /dev/null | |||
@@ -1,30 +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 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch deleted file mode 100644 index 43edec3..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 30c67656c09f49608bbadb75e365d1d3da36cc70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andy Nichols <andy.nichols@theqtcompany.com> | ||
3 | Date: Wed, 18 Feb 2015 14:28:14 +0100 | ||
4 | Subject: [PATCH] Allow builds with GCC 4.8 | ||
5 | |||
6 | --- | ||
7 | arch/arm/kernel/asm-offsets.c | 4 ---- | ||
8 | 1 file changed, 4 deletions(-) | ||
9 | |||
10 | diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c | ||
11 | index 2d2d608..6f8e79c 100644 | ||
12 | --- a/arch/arm/kernel/asm-offsets.c | ||
13 | +++ b/arch/arm/kernel/asm-offsets.c | ||
14 | @@ -49,10 +49,6 @@ | ||
15 | #error Your compiler is too buggy; it is known to miscompile kernels. | ||
16 | #error Known good compilers: 3.3, 4.x | ||
17 | #endif | ||
18 | -#if GCC_VERSION >= 40800 && GCC_VERSION < 40803 | ||
19 | -#error Your compiler is too buggy; it is known to miscompile kernels | ||
20 | -#error and result in filesystem corruption and oopses. | ||
21 | -#endif | ||
22 | #endif | ||
23 | |||
24 | int main(void) | ||
25 | -- | ||
26 | 1.9.1 | ||
27 | |||
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch deleted file mode 100644 index d92ac62..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From d57edef022af184015a8ccd87fa9021024513d55 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andy Nichols <andy.nichols@theqtcompany.com> | ||
3 | Date: Fri, 6 Mar 2015 10:14:13 +0100 | ||
4 | Subject: [PATCH] Enable Fusion 7 and 10 multi-touch controller | ||
5 | |||
6 | --- | ||
7 | arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- | ||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | ||
11 | index 1f43dbe..9194580 100644 | ||
12 | --- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | ||
13 | +++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | ||
14 | @@ -214,7 +214,7 @@ | ||
15 | gpios = <&gpio0 30 GPIO_ACTIVE_HIGH /* SO-DIMM 28, Pen down interrupt */ | ||
16 | &gpio0 23 GPIO_ACTIVE_LOW /* SO-DIMM 30, Reset interrupt */ | ||
17 | >; | ||
18 | - status = "disabled"; | ||
19 | + status = "okay"; | ||
20 | }; | ||
21 | |||
22 | /* M41T0M6 real time clock on carrier board */ | ||
23 | -- | ||
24 | 2.3.1 | ||
25 | |||
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend deleted file mode 100644 index 5352ed7..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend +++ /dev/null | |||
@@ -1,39 +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 | # kernel image files are not needed in the image | ||
31 | RDEPENDS_kernel-base = "" | ||
32 | |||
33 | config_script () { | ||
34 | # FunctionFS for adb | ||
35 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config | ||
36 | echo "CONFIG_USB_ACM=m" >> ${S}/.config | ||
37 | } | ||
38 | |||
39 | B = "${S}" | ||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch deleted file mode 100644 index 0743128..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 10ebeba59e6fd25352aa44ecd85913126ec45afe Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | ||
3 | Date: Wed, 24 Feb 2016 15:39:52 +0200 | ||
4 | Subject: [PATCH] colibri imx6: enable sdboot by default | ||
5 | |||
6 | remove console from tty1 | ||
7 | --- | ||
8 | include/configs/colibri_imx6.h | 5 +++-- | ||
9 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h | ||
12 | index c545334..eb0dfa9 100644 | ||
13 | --- a/include/configs/colibri_imx6.h | ||
14 | +++ b/include/configs/colibri_imx6.h | ||
15 | @@ -242,7 +242,8 @@ | ||
16 | |||
17 | #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" | ||
18 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
19 | - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ | ||
20 | + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ | ||
21 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ | ||
22 | "run nfsboot ; echo ; echo nfsboot failed ; " \ | ||
23 | "usb start ;" \ | ||
24 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | ||
25 | @@ -261,7 +262,7 @@ | ||
26 | "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \ | ||
27 | "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\0" \ | ||
28 | "setup=setenv setupargs fec_mac=${ethaddr} " \ | ||
29 | - "consoleblank=0 no_console_suspend=1 console=tty1 " \ | ||
30 | + "consoleblank=0 no_console_suspend=1 " \ | ||
31 | "console=${console},${baudrate}n8\0 " \ | ||
32 | "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \ | ||
33 | " source ${kernel_addr_r}\0" \ | ||
34 | -- | ||
35 | 1.9.1 | ||
36 | |||
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend deleted file mode 100644 index 45b5fd3..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend +++ /dev/null | |||
@@ -1,34 +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 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
31 | SRC_URI += " \ | ||
32 | file://0001-Update-default-args-for-apalis-imx6.patch \ | ||
33 | file://0001-colibri-imx6-enable-sdboot-by-default.patch \ | ||
34 | " | ||
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 6c6f727..f6e6f84 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -7,7 +7,6 @@ | |||
7 | <remote fetch="git://git.openembedded.org" name="oe"/> | 7 | <remote fetch="git://git.openembedded.org" name="oe"/> |
8 | <remote fetch="git://github.com/Freescale" name="freescale"/> | 8 | <remote fetch="git://github.com/Freescale" name="freescale"/> |
9 | <remote fetch="git://github.com/beagleboard" name="beagleboard"/> | 9 | <remote fetch="git://github.com/beagleboard" name="beagleboard"/> |
10 | <remote fetch="git://git.toradex.com" name="toradex"/> | ||
11 | <remote fetch="git://github.com/architech-boards" name="architech"/> | 10 | <remote fetch="git://github.com/architech-boards" name="architech"/> |
12 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> | 11 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> |
13 | <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/> | 12 | <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/> |
@@ -36,7 +35,7 @@ | |||
36 | remote="yocto" | 35 | remote="yocto" |
37 | revision="a6b95df4d7ab122f1e5b7632e2273b75f853af4b" | 36 | revision="a6b95df4d7ab122f1e5b7632e2273b75f853af4b" |
38 | path="sources/meta-fsl-arm" | 37 | path="sources/meta-fsl-arm" |
39 | groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/> | 38 | groups="notdefault,external,fsl,architech,ti,bbb,smx6,renesas"/> |
40 | <project name="meta-ti" | 39 | <project name="meta-ti" |
41 | remote="yocto" | 40 | remote="yocto" |
42 | revision="f807c7185321fb407e82c529ddff310dc037f727" | 41 | revision="f807c7185321fb407e82c529ddff310dc037f727" |
@@ -51,17 +50,12 @@ | |||
51 | remote="freescale" | 50 | remote="freescale" |
52 | revision="99649b72f60fda4a2cfb2333791fe0f92997fa9e" | 51 | revision="99649b72f60fda4a2cfb2333791fe0f92997fa9e" |
53 | path="sources/meta-fsl-arm-extra" | 52 | path="sources/meta-fsl-arm-extra" |
54 | groups="notdefault,external,fsl,toradex,architech,smx6"/> | 53 | groups="notdefault,external,fsl,architech,smx6"/> |
55 | <project name="meta-beagleboard" | 54 | <project name="meta-beagleboard" |
56 | remote="beagleboard" | 55 | remote="beagleboard" |
57 | revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60" | 56 | revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60" |
58 | path="sources/meta-beagleboard" | 57 | path="sources/meta-beagleboard" |
59 | groups="notdefault,external,bbb"/> | 58 | groups="notdefault,external,bbb"/> |
60 | <project name="meta-toradex" | ||
61 | remote="toradex" | ||
62 | revision="485643678b2d39d37b1cc9d1aa2200bb934b08de" | ||
63 | path="sources/meta-toradex" | ||
64 | groups="notdefault,external,toradex"/> | ||
65 | <project name="meta-tibidabo" | 59 | <project name="meta-tibidabo" |
66 | remote="architech" | 60 | remote="architech" |
67 | revision="06c6b09e0776507e1230aa98b5ca10d9d3968286" | 61 | revision="06c6b09e0776507e1230aa98b5ca10d9d3968286" |
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 8da1b94..9b40650 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
@@ -57,7 +57,7 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}} | |||
57 | if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then | 57 | if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then |
58 | case ${MACHINE} in | 58 | case ${MACHINE} in |
59 | apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) | 59 | apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) |
60 | LAYERSCONF="bblayers.conf.toradex.sample" | 60 | LAYERSCONF="bblayers.conf.fsl.sample" |
61 | ;; | 61 | ;; |
62 | imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd) | 62 | imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd) |
63 | LAYERSCONF="bblayers.conf.fsl.sample" | 63 | LAYERSCONF="bblayers.conf.fsl.sample" |