diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-14 14:55:08 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-02-01 06:58:28 +0000 |
commit | 866106a38dae09dbba01d6a9d77bc80189f94ad8 (patch) | |
tree | 043b512df5417f74f5810803aafad34ef313ffe1 /meta-fsl-extras | |
parent | e2e0faabe64b922df8865ca1df23768ebc3b1fcf (diff) | |
download | meta-boot2qt-866106a38dae09dbba01d6a9d77bc80189f94ad8.tar.gz |
yocto: upgrade to yocto 2.6 (thud)
Initial upgrade commit from yocto 2.5.2 (sumo) -> 2.6 (thud).
System & some group 1 devices related meta layers, appends & patches updated:
* poky, meta-openembedded & meta-mingw updated to thud branch
- layer.conf files updated to support thud where applicable
- obsolete gstreamer-plugins-bad BBMASK + bbappend overide removed
- ostree build issues fixed with upstream submodule patch
* meta-freescale & meta-freescale-3rdparty updated to thud branch
* meta-toradex-bsp-common & meta-toradex-nxp update to latest tagged release (2.8b5) in toradex/rocko branch
- to fix build issue a systemd patch taken from meta-toradex-bsp-common toradex/master-next branch (thud compatible)
- mask gstreamer recipes from toradex layer and use older versions for
libav and plugins-ugly, so that they match the imx version of gstreamer.
* meta-raspberry update to latest in master branch (where thud layer compatibility is set)
* meta-tegra update to latest in thud branch
- vulkan disabled from jetsons since NVIDIA's Vulkan support is for X only
Task-number: QTBUG-72413
Change-Id: Ida277b66840babc23e877161a26f1ae1b3c68fda
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-fsl-extras')
5 files changed, 123 insertions, 51 deletions
diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf index 74e2652..4ddfd49 100644 --- a/meta-fsl-extras/conf/layer.conf +++ b/meta-fsl-extras/conf/layer.conf | |||
@@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_fsl" | |||
39 | BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/" | 39 | BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/" |
40 | BBFILE_PRIORITY_b2qt_fsl = "20" | 40 | BBFILE_PRIORITY_b2qt_fsl = "20" |
41 | 41 | ||
42 | LAYERSERIES_COMPAT_b2qt_fsl = "sumo" | 42 | LAYERSERIES_COMPAT_b2qt_fsl = "thud" |
diff --git a/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb new file mode 100644 index 0000000..6d03807 --- /dev/null +++ b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2019 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 | require recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.2.bb | ||
31 | |||
32 | FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:" | ||
33 | |||
34 | SRC_URI[md5sum] = "943045b9e937ffc5c6cfa0bd5c44230d" | ||
35 | SRC_URI[sha256sum] = "fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89" | ||
diff --git a/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb new file mode 100644 index 0000000..aee9367 --- /dev/null +++ b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2019 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 | require recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.2.bb | ||
31 | |||
32 | FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:" | ||
33 | |||
34 | SRC_URI[md5sum] = "bcb1f8d9339176aee2b5da2a9cb2df88" | ||
35 | SRC_URI[sha256sum] = "3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1" | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch index 2e5382f..df1429b 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch | |||
@@ -1,59 +1,63 @@ | |||
1 | From 1abe757120dd19518fd09d2013f518fba46c4d06 Mon Sep 17 00:00:00 2001 | 1 | From 74ffd57e80fd3f4e2d2d0b60e42a3b570aeb9c97 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Mon, 15 May 2017 15:31:36 +0300 | 3 | Date: Mon, 15 May 2017 15:31:36 +0300 |
4 | Subject: [PATCH] Make sdboot default on all boards | 4 | Subject: [PATCH] Make sdboot default on all boards |
5 | 5 | ||
6 | ... and remove console=tty1 from kernel args | 6 | ... and remove console=tty1 from kernel args |
7 | --- | 7 | --- |
8 | include/configs/apalis_imx6.h | 3 ++- | 8 | include/configs/apalis_imx6.h | 5 +++-- |
9 | include/configs/colibri_imx6.h | 3 ++- | 9 | include/configs/colibri_imx6.h | 5 +++-- |
10 | include/configs/colibri_imx7.h | 2 +- | 10 | include/configs/colibri_imx7.h | 2 +- |
11 | include/configs/colibri_vf.h | 2 +- | 11 | include/configs/colibri_vf.h | 2 +- |
12 | 4 files changed, 6 insertions(+), 4 deletions(-) | 12 | 4 files changed, 8 insertions(+), 6 deletions(-) |
13 | 13 | ||
14 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h | 14 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h |
15 | index 71dfeb56f5..8dcb5cc5e4 100644 | 15 | index fa40c629c3..ad0284de8a 100644 |
16 | --- a/include/configs/apalis_imx6.h | 16 | --- a/include/configs/apalis_imx6.h |
17 | +++ b/include/configs/apalis_imx6.h | 17 | +++ b/include/configs/apalis_imx6.h |
18 | @@ -256,7 +256,8 @@ | 18 | @@ -177,8 +177,9 @@ |
19 | #ifdef CONFIG_TDX_EASY_INSTALLER | ||
20 | #define CONFIG_BOOTCOMMAND "run distro_bootcmd" | ||
21 | #else | ||
22 | -#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \ | ||
23 | - "run distro_bootcmd; usb start; " \ | ||
24 | +#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \ | ||
25 | + "run emmcboot; echo; echo emmcboot failed; " \ | ||
26 | + "run distro_bootcmd; usb start; " \ | ||
27 | "setenv stdout serial,vga; setenv stdin serial,usbkbd" | ||
19 | #endif | 28 | #endif |
20 | #define CONFIG_EXTRA_ENV_SETTINGS \ | 29 | |
21 | BOOTENV \ | ||
22 | - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ | ||
23 | + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ | ||
24 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ | ||
25 | "run distro_bootcmd ; " \ | ||
26 | "usb start ;" \ | ||
27 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | ||
28 | diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h | 30 | diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h |
29 | index f1fd5b422e..ae0f3c9bfa 100644 | 31 | index fda171bd9e..df49efc9ef 100644 |
30 | --- a/include/configs/colibri_imx6.h | 32 | --- a/include/configs/colibri_imx6.h |
31 | +++ b/include/configs/colibri_imx6.h | 33 | +++ b/include/configs/colibri_imx6.h |
32 | @@ -231,7 +231,8 @@ | 34 | @@ -157,8 +157,9 @@ |
33 | #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" | 35 | #ifdef CONFIG_TDX_EASY_INSTALLER |
34 | #define CONFIG_EXTRA_ENV_SETTINGS \ | 36 | #define CONFIG_BOOTCOMMAND "run distro_bootcmd" |
35 | BOOTENV \ | 37 | #else |
36 | - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ | 38 | -#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \ |
37 | + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ | 39 | - "run distro_bootcmd; usb start; " \ |
38 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ | 40 | +#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \ |
39 | "run distro_bootcmd ; " \ | 41 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ |
40 | "usb start ;" \ | 42 | + "run distro_bootcmd; usb start; " \ |
41 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | 43 | "setenv stdout serial,vga; setenv stdin serial,usbkbd" |
44 | #endif | ||
45 | |||
42 | diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h | 46 | diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h |
43 | index ea04762b49..47e8bd266d 100644 | 47 | index 6c91951878..4200512fea 100644 |
44 | --- a/include/configs/colibri_imx7.h | 48 | --- a/include/configs/colibri_imx7.h |
45 | +++ b/include/configs/colibri_imx7.h | 49 | +++ b/include/configs/colibri_imx7.h |
46 | @@ -104,7 +104,7 @@ | 50 | @@ -128,7 +128,7 @@ |
47 | "ubi read ${fdt_addr_r} dtb && " \ | 51 | #define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \ |
48 | "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ | 52 | "run bootcmd_mmc0; run ubiboot; run distro_bootcmd" |
49 | 53 | #else | |
50 | -#define CONFIG_BOOTCOMMAND "run ubiboot; " \ | 54 | -#define CONFIG_BOOTCOMMAND "run ubiboot; " \ |
51 | +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ | 55 | +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ |
52 | "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" | 56 | "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd" |
57 | #endif | ||
53 | 58 | ||
54 | #define BOOTENV_RUN_NET_USB_START "" | ||
55 | diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h | 59 | diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h |
56 | index db610d53f1..a2c942cafe 100644 | 60 | index 0579bfdc4e..65a5dada5f 100644 |
57 | --- a/include/configs/colibri_vf.h | 61 | --- a/include/configs/colibri_vf.h |
58 | +++ b/include/configs/colibri_vf.h | 62 | +++ b/include/configs/colibri_vf.h |
59 | @@ -155,7 +155,7 @@ | 63 | @@ -155,7 +155,7 @@ |
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch index d2e82a7..8d28abe 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ccbaab75abc8d5f5cbadc6a0285dd496a45252cf Mon Sep 17 00:00:00 2001 | 1 | From 166dae45bcfcd92cd2802db785a30072f65c0900 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Thu, 12 Oct 2017 11:02:54 +0300 | 3 | Date: Thu, 12 Oct 2017 11:02:54 +0300 |
4 | Subject: [PATCH] apalis-imx6: Ixora v1.0 support | 4 | Subject: [PATCH] apalis-imx6: Ixora v1.0 support |
@@ -7,29 +7,27 @@ Add sddrive variable that can be changed to boot from different mmc card | |||
7 | slot when using different versions of ixora carrier board. | 7 | slot when using different versions of ixora carrier board. |
8 | Default to drive 1, which is correct for Ixora v1.1. | 8 | Default to drive 1, which is correct for Ixora v1.1. |
9 | --- | 9 | --- |
10 | include/configs/apalis_imx6.h | 9 +++++---- | 10 | include/configs/apalis_imx6.h | 10 ++++++---- |
11 | 1 file changed, 5 insertions(+), 4 deletions(-) | 11 | 1 file changed, 6 insertions(+), 4 deletions(-) |
12 | 12 | ||
13 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h | 13 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h |
14 | index 3351a18e4c..7aabb1334b 100644 | 14 | index 3f224e54b8..9e1b5a0f75 100644 |
15 | --- a/include/configs/apalis_imx6.h | 15 | --- a/include/configs/apalis_imx6.h |
16 | +++ b/include/configs/apalis_imx6.h | 16 | +++ b/include/configs/apalis_imx6.h |
17 | @@ -226,15 +226,16 @@ | 17 | @@ -238,12 +238,14 @@ |
18 | "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | 18 | "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" |
19 | 19 | ||
20 | #define SD_BOOTCMD \ | 20 | #define SD_BOOTCMD \ |
21 | - "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \ | 21 | - "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \ |
22 | + "sddrive=1\0" \ | 22 | - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ |
23 | + "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 " \ | 23 | + "sddrive=1\0" \ |
24 | "rootwait\0" \ | 24 | + "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 rootwait\0" \ |
25 | - "sdboot=run setup; " \ | 25 | + "sdboot=run setup; run sdsetup; " \ |
26 | + "sdboot=run setup; run sdsetup; " \ | 26 | + "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ |
27 | "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ | 27 | "${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \ |
28 | "${vidargs}; echo Booting from SD card; " \ | 28 | - "run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \ |
29 | - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ | 29 | + "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} ${boot_file} " \ |
30 | + "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} " \ | 30 | "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \ |
31 | "${boot_file} && run fdt_fixup && " \ | ||
32 | "bootz ${kernel_addr_r} ${dtbparam}\0" \ | ||
33 | - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ | 31 | - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ |
34 | + "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \ | 32 | + "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \ |
35 | "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | 33 | "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" |