From 01603689e8dd2d3c5be0f41d41b3543452903f03 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Sep 2014 13:04:47 +0300 Subject: Move meta-fsl-arm specific files to separate layer Create new layer for recipes and files that required only when meta-fsl-arm and meta-fsl-arm-extra layers are used. For now, the bblayers.conf template still includes the new layer as well. Change-Id: I01a0019ebaea3e1532f106e076f7608fb7aa86c6 Reviewed-by: Eirik Aavitsland --- ...itrogen6x-disable-console-cursor-blinking.patch | 25 +++++++ .../0002-nitrogen6x-update.patch | 81 ++++++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch (limited to 'meta-fsl-extras/recipes/u-boot/u-boot-script-boundary') diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch new file mode 100644 index 0000000..d97921c --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch @@ -0,0 +1,25 @@ +From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 10 Jan 2014 12:37:20 +0200 +Subject: [PATCH] nitrogen6x: disable console cursor blinking + +--- + 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 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/0002-nitrogen6x-update.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch new file mode 100644 index 0000000..995e418 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch @@ -0,0 +1,81 @@ +From 3d7276b2b27317c5067d2095ea5c3952d11f4390 Mon Sep 17 00:00:00 2001 +From: Rainer Keller +Date: Fri, 5 Sep 2014 14:39:50 +0200 +Subject: [PATCH] Add support for update recovery linux + +--- + board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 61 +++++++++++++++++++++++ + 1 file changed, 61 insertions(+) + +diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt +index 5bc6170..4116ed4 100644 +--- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt ++++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt +@@ -1,3 +1,64 @@ ++# Boot2Qt update part begin ++echo "Boot to Qt" ++if test "x$boot2qt_update_state" = "x" ; then ++ setenv boot2qt_update_state valid ++ saveenv ++fi ++ ++# This is a workaround because environment partition is read-only. ++if fatload mmc 1:1 0x12000000 update/state ; then ++ mw.b 0x13000000 0x76 1 # v ++ mw.b 0x13000001 0x75 1 # u ++ mw.b 0x13000002 0x74 1 # t ++ ++ if cmp.b 0x12000000 0x13000000 1 ; then ++ echo "State: Valid" ++ setenv boot2qt_fat_state valid ++ setenv boot2qt_update_state valid ++ saveenv ++ fi ++ if cmp.b 0x12000000 0x13000001 1 ; then ++ echo "State: Update" ++ setenv boot2qt_fat_state update ++ fi ++ if cmp.b 0x12000000 0x13000002 1 ; then ++ echo "State: Testing" ++ setenv boot2qt_fat_state testing ++ fi ++fi ++ ++if test "x$boot2qt_fat_state" = "xupdate" || test "x$boot2qt_update_state" = "xinvalid" ; then ++ setenv boot2qt_update_state testing ++ saveenv ++ echo "Recovery linux starting..." ++ setenv bootargs "console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 root=/dev/ram0" ++ ++ # Guess dtb name ++ dtbname="imx6"; ++ if itest.s x6S != "x\$cpu" ; then ++ dtbname=\${dtbname}q-; ++ else ++ dtbname=\${dtbname}s-; ++ fi ++ ++ if itest.s x == "x\$board" ; then ++ board=sabrelite ++ fi ++ dtbname=\${dtbname}\${board}.dtb; ++ ++ fatload mmc 1:1 0x10800000 update/uImage ++ fatload mmc 1:1 0x12000000 update/${dtbname} ++ fatload mmc 1:1 0x13000000 update/uRamdisk ++ bootm 0x10800000 0x13000000 0x12000000 ++fi ++ ++if test "x$boot2qt_fat_state" = "xtesting" || test "x$boot2qt_update_state" = "xtesting"; then ++ setenv boot2qt_update_state invalid ++ saveenv ++fi ++ ++# Boot2Qt update part end ++ + # Yocto-specifics + setenv bootpart 2 + setenv bootdir / +-- +1.8.5.5 + -- cgit v1.2.3-54-g00ecf