diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-03 13:43:33 +0200 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-03 13:43:45 +0200 |
| commit | 9267402ba44b7a68f871a6161736732e78d6c04d (patch) | |
| tree | db194934f710eb905d36dbd4ef7406680c15342c /recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch | |
| parent | 43102d40e3d72d8ec26e243a3cf8584dd4336cfe (diff) | |
| parent | 4caaf27fd9b82092b0e4f378806be348b9aa61fe (diff) | |
| download | meta-boot2qt-9267402ba44b7a68f871a6161736732e78d6c04d.tar.gz | |
Merge branch 'dev' into stable
Change-Id: If10d6f6512c79e1ede5a308a100e7f43b757a3ab
Diffstat (limited to 'recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch')
| -rw-r--r-- | recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch | 25 |
1 files changed, 13 insertions, 12 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..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 @@ | |||
| 1 | From 6b894707404a1aeb3072d4b3bfc486ff9ad37ac4 Mon Sep 17 00:00:00 2001 | 1 | From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001 |
| 2 | From: Samuli Piippo <samuli.piippo@digia.com> | 2 | From: Samuli Piippo <samuli.piippo@digia.com> |
| 3 | Date: Tue, 9 Jul 2013 15:31:30 +0300 | 3 | Date: Fri, 10 Jan 2014 12:37:20 +0200 |
| 4 | Subject: [PATCH] nitrogen6x: disable console cursor blinking | 4 | Subject: [PATCH] nitrogen6x: disable console cursor blinking |
| 5 | 5 | ||
| 6 | --- | 6 | --- |
| 7 | board/boundary/nitrogen6x/6x_bootscript.txt | 2 +- | 7 | board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 2 +- |
| 8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 8 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 9 | 9 | ||
| 10 | diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt | 10 | diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt |
| 11 | index 1d766ca..80b91ea 100644 | 11 | index d933fa0..2d7c575 100644 |
| 12 | --- a/board/boundary/nitrogen6x/6x_bootscript.txt | 12 | --- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt |
| 13 | +++ b/board/boundary/nitrogen6x/6x_bootscript.txt | 13 | +++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt |
| 14 | @@ -53,6 +53,6 @@ done | 14 | @@ -56,7 +56,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 | -- |
| 23 | 1.7.10.4 | 24 | 1.7.10.4 |
| 24 | 25 | ||