diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-26 10:43:26 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-28 08:57:46 +0000 |
commit | aa863717a1e24a3c08a94726e95493780ccff1f3 (patch) | |
tree | 51ba08637efc4f99b0caeede3032c10ce6db6aa0 /meta-fsl-extras/recipes/u-boot/u-boot-script-boundary | |
parent | 168f62cc6d06b205a3ddcb941570103e7910e14d (diff) | |
download | meta-boot2qt-aa863717a1e24a3c08a94726e95493780ccff1f3.tar.gz |
poky: update to 2.5 branch (sumo)
Update yocto from 2.3.4 (pyro) to 2.5.1 (sumo):
- Update poky, meta-openembedded & meta-mingw to sumo branch
- update image classes (obsolete IMAGE_DEPENDS definitions)
- Update bbappends under meta-boot2qt-distro
- Update meta-*-extras layers bbappends & patches
All recipes related to nitrogen6x are fixed here, but this depends
on follow up commits to work correctly.
Task-number: QTBUG-68681
Change-Id: Ic5802c5c1a3989bed746f96f8cf173743ec755bb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-fsl-extras/recipes/u-boot/u-boot-script-boundary')
-rw-r--r-- | meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch index 7d8e8ec..02a1e33 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3fdf74d6934858d04d9e7df7cd24779bf7d9fdbb Mon Sep 17 00:00:00 2001 | 1 | From 3c3c3284727076f4ae751bfc9cadb222423c9a4b Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | 2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> |
3 | Date: Wed, 13 Jan 2016 08:55:41 +0200 | 3 | Date: Wed, 13 Jan 2016 08:55:41 +0200 |
4 | Subject: [PATCH] Set screen resolution for ft5x06_ts based on selected display | 4 | Subject: [PATCH] Set screen resolution for ft5x06_ts based on selected display |
@@ -8,12 +8,12 @@ Subject: [PATCH] Set screen resolution for ft5x06_ts based on selected display | |||
8 | 1 file changed, 6 insertions(+) | 8 | 1 file changed, 6 insertions(+) |
9 | 9 | ||
10 | diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt | 10 | diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt |
11 | index 7c11f4c..86242b5 100644 | 11 | index f6bf2f5..427d837 100644 |
12 | --- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt | 12 | --- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt |
13 | +++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt | 13 | +++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt |
14 | @@ -105,6 +105,12 @@ else | 14 | @@ -130,6 +130,12 @@ if itest.s "x" != "x${disable_msi}" ; then |
15 | setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bpart}" | 15 | setenv bootargs ${bootargs} pci=nomsi |
16 | fi | 16 | fi; |
17 | 17 | ||
18 | +if test "hannstar" = "${fb_lvds}" || test "hannstar" = "${fb_lvds2}" ; then | 18 | +if test "hannstar" = "${fb_lvds}" || test "hannstar" = "${fb_lvds2}" ; then |
19 | + setenv bootargs ${bootargs} ft5x06_ts.screenres=1024,600 | 19 | + setenv bootargs ${bootargs} ft5x06_ts.screenres=1024,600 |
@@ -24,6 +24,3 @@ index 7c11f4c..86242b5 100644 | |||
24 | if itest.s "x" != "x${disable_giga}" ; then | 24 | if itest.s "x" != "x${disable_giga}" ; then |
25 | setenv bootargs ${bootargs} fec.disable_giga=1 | 25 | setenv bootargs ${bootargs} fec.disable_giga=1 |
26 | fi | 26 | fi |
27 | -- | ||
28 | 1.9.1 | ||
29 | |||