summaryrefslogtreecommitdiffstats
path: root/recipes/u-boot/u-boot-script-boundary
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2013-12-17 09:23:44 +0200
committerSamuli Piippo <samuli.piippo@digia.com>2014-01-30 12:11:38 +0200
commit706fc1ceecaaefe5e6fd80db15bb3e8a98e3561d (patch)
tree1e30c495eda1f0600943aacfa680d86b54f198f1 /recipes/u-boot/u-boot-script-boundary
parent41ca1a1f916b5af27fff5f51148c35f5510eb265 (diff)
downloadmeta-boot2qt-706fc1ceecaaefe5e6fd80db15bb3e8a98e3561d.tar.gz
Move to yocto 1.5 dora branch
Remove recipe appends that are fixed upstream and make changes needed for 1.5 branch. Tested and verified with nitrogen6x. Change-Id: I7b8ca04f2f4523fa5113bbe43767e3e90f243cd9 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Diffstat (limited to 'recipes/u-boot/u-boot-script-boundary')
-rw-r--r--recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch17
1 files changed, 9 insertions, 8 deletions
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..9caee44 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,6 +1,6 @@
1From 6b894707404a1aeb3072d4b3bfc486ff9ad37ac4 Mon Sep 17 00:00:00 2001 1From d01717f74b5c8d62e93d29d03df0c49b67645d32 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com> 2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Tue, 9 Jul 2013 15:31:30 +0300 3Date: Mon, 16 Dec 2013 15:42:45 +0200
4Subject: [PATCH] nitrogen6x: disable console cursor blinking 4Subject: [PATCH] nitrogen6x: disable console cursor blinking
5 5
6--- 6---
@@ -8,17 +8,18 @@ Subject: [PATCH] nitrogen6x: disable console cursor blinking
8 1 file changed, 1 insertion(+), 1 deletion(-) 8 1 file changed, 1 insertion(+), 1 deletion(-)
9 9
10diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt 10diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt
11index 1d766ca..80b91ea 100644 11index 9533713..2985af2 100644
12--- a/board/boundary/nitrogen6x/6x_bootscript.txt 12--- a/board/boundary/nitrogen6x/6x_bootscript.txt
13+++ b/board/boundary/nitrogen6x/6x_bootscript.txt 13+++ b/board/boundary/nitrogen6x/6x_bootscript.txt
14@@ -53,6 +53,6 @@ done 14@@ -52,7 +52,7 @@ while test "4" -ne $nextcon ; do
15 done
15 16
16 setenv bootargs $bootargs $fbmem 17 setenv bootargs $bootargs $fbmem
18-setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait"
19+setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 rootwait"
17 20
18-setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 ; 21 if itest.s x$bootpart == x ; then
19+setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 vt.global_cursor_default=0 ; 22 bootpart=1
20 ${fs}load mmc ${disk}:1 10800000 uImage && bootm 10800000 ; echo "Error loading kernel image"
21
22-- 23--
231.7.10.4 241.7.10.4
24 25