From 706fc1ceecaaefe5e6fd80db15bb3e8a98e3561d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 17 Dec 2013 09:23:44 +0200 Subject: 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 --- ...001-nitrogen6x-disable-console-cursor-blinking.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.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..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 @@ -From 6b894707404a1aeb3072d4b3bfc486ff9ad37ac4 Mon Sep 17 00:00:00 2001 +From d01717f74b5c8d62e93d29d03df0c49b67645d32 Mon Sep 17 00:00:00 2001 From: Samuli Piippo -Date: Tue, 9 Jul 2013 15:31:30 +0300 +Date: Mon, 16 Dec 2013 15:42:45 +0200 Subject: [PATCH] nitrogen6x: disable console cursor blinking --- @@ -8,17 +8,18 @@ Subject: [PATCH] nitrogen6x: disable console cursor blinking 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 +index 9533713..2985af2 100644 --- a/board/boundary/nitrogen6x/6x_bootscript.txt +++ b/board/boundary/nitrogen6x/6x_bootscript.txt -@@ -53,6 +53,6 @@ done +@@ -52,7 +52,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 -- cgit v1.2.3-54-g00ecf