nitrogen6x: update u-boot script

Set screen resolution for touch controller (ft5x06) so that touch events
are processed correctly on Qt.
Apply CMA argument to the correct u-boot script

Change-Id: I128f32b64c9bdc987c158a1e193d56cd8001106e
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

4 files changed, 58 insertions, 28 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
new file mode 100644
index 0000000..7d8e8ec
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch
@@ -0,0 +1,29 @@
+From 3fdf74d6934858d04d9e7df7cd24779bf7d9fdbb Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 13 Jan 2016 08:55:41 +0200
+Subject: [PATCH] Set screen resolution for ft5x06_ts based on selected display
+
+---
+ board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
+index 7c11f4c..86242b5 100644
+--- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
++++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
+@@ -105,6 +105,12 @@ else
+        setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bpart}"
+ fi
+ 
++if test "hannstar" = "${fb_lvds}" || test "hannstar" = "${fb_lvds2}"  ; then
++    setenv bootargs ${bootargs} ft5x06_ts.screenres=1024,600
++elif test "hannstar7" = "${fb_lvds}" || test "hannstar7" = "${fb_lvds2}"  ; then
++    setenv bootargs ${bootargs} ft5x06_ts.screenres=1280,800
++fi
++
+ if itest.s "x" != "x${disable_giga}" ; then
+        setenv bootargs ${bootargs} fec.disable_giga=1
+ fi
+-- 
+1.9.1
+
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-update-bootargs.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-update-bootargs.patch
deleted file mode 100644
index f42b213..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-update-bootargs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001
-From: Yoann Lopes <yoann.lopes@theqtcompany.com>
-Date: Wed, 10 Jun 2015 16:36:10 +0100
-Subject: [PATCH] nitrogen6x: update bootargs.
-
-- disable console cursor blinking
-- set CMA reserved size to 384MB
----
- board/boundary/nitrogen6x/6x_bootscript-yocto.txt |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-index d933fa0..2d7c575 100644
---- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-@@ -56,7 +56,7 @@ while test "4" -ne $nextcon ; do
- done
- 
- setenv bootargs $bootargs $fbmem
--setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait"
-+setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 cma=384M rootwait"
- 
- if itest.s x$bootpart == x ; then
-        bootpart=1
--- 
-1.7.10.4
-
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-set-CMA-reserved-size-to-384MB.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-set-CMA-reserved-size-to-384MB.patch
new file mode 100644
index 0000000..d648340
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-set-CMA-reserved-size-to-384MB.patch
@@ -0,0 +1,27 @@
+From 3bb661da09e2a57ef452d388d69b8d01044136f1 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 13 Jan 2016 09:26:33 +0200
+Subject: [PATCH] set CMA reserved size to 384MB
+
+Increased from 256MB (the default) to 384MB. Without this, HW-accelerated
+video decoding cannot work for high resolution videos.
+---
+ board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
+index 86242b5..da4ea05 100644
+--- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
++++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
+@@ -92,7 +92,7 @@ if itest.s "x" == "x${cmd_xxx_present}" ; then
+        echo "!!!!!!!!!!!!!!!!"
+ fi
+ 
+-setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc"
++setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M cma=384M consoleblank=0 rootwait fixrtc"
+ 
+ 
+ bpart=2
+-- 
+1.9.1
+
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
index a6cee2b..d2294ba 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
@@ -22,5 +22,6 @@
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
-        file://0001-nitrogen6x-update-bootargs.patch \
+        file://0001-set-CMA-reserved-size-to-384MB.patch \
+        file://0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch \
         "