6 files changed, 130 insertions, 12 deletions

diff --git a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
index 48d7885..2b1c656 100644
--- a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
+++ b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-am335x-evm-disable-console-cursor-blinking.patch \
diff --git a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend
index 787ac42..f6fbde1 100644
--- a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend
+++ b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-beagle-change-default-kernel-args.patch \
diff --git a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
index 3c65a20..d97921c 100644
--- a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
+++ b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
@@ -1,24 +1,25 @@
-From 6b894707404a1aeb3072d4b3bfc486ff9ad37ac4 Mon Sep 17 00:00:00 2001
+From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Tue, 9 Jul 2013 15:31:30 +0300
+Date: Fri, 10 Jan 2014 12:37:20 +0200
 Subject: [PATCH] nitrogen6x: disable console cursor blinking
 
 ---
- board/boundary/nitrogen6x/6x_bootscript.txt |    2 +-
+ board/boundary/nitrogen6x/6x_bootscript-yocto.txt |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt
-index 1d766ca..80b91ea 100644
---- a/board/boundary/nitrogen6x/6x_bootscript.txt
-+++ b/board/boundary/nitrogen6x/6x_bootscript.txt
-@@ -53,6 +53,6 @@ done
+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 rootwait"
  
--setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 ;
-+setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 vt.global_cursor_default=0 ;
- ${fs}load mmc ${disk}:1 10800000 uImage && bootm 10800000 ; echo "Error loading kernel image"
- 
+ if itest.s x$bootpart == x ; then
+        bootpart=1
 -- 
 1.7.10.4
 
diff --git a/recipes/u-boot/u-boot-script-boundary_git.bbappend b/recipes/u-boot/u-boot-script-boundary_git.bbappend
index c845717..083b2fd 100644
--- a/recipes/u-boot/u-boot-script-boundary_git.bbappend
+++ b/recipes/u-boot/u-boot-script-boundary_git.bbappend
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-nitrogen6x-disable-console-cursor-blinking.patch \
diff --git a/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch b/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch
new file mode 100644
index 0000000..25dd9e4
--- /dev/null
+++ b/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch
@@ -0,0 +1,25 @@
+From bde714b9bfeafe46abc1078c09f6efac0e7b6478 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@digia.com>
+Date: Wed, 22 Jan 2014 11:30:59 +0200
+Subject: [PATCH] BBB: disable console cursor blinking
+
+---
+ include/configs/am335x_evm.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index d53f17d..1b3d2a4 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -59,6 +59,8 @@
+        "ramrootfstype=ext2\0" \
+        "mmcargs=setenv bootargs console=${console} " \
+                "${optargs} " \
++               "consoleblank=0 " \
++               "vt.global_cursor_default=0 " \
+                "root=${mmcroot} " \
+                "rootfstype=${mmcrootfstype}\0" \
+        "spiroot=/dev/mtdblock4 rw\0" \
+-- 
+1.8.3.2
+
diff --git a/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
new file mode 100644
index 0000000..bad928b
--- /dev/null
+++ b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += " \
+        file://0001-BBB-disable-console-cursor-blinking.patch \
+        "