diff options
author | Samuli Piippo <samuli.piippo@digia.com> | 2014-09-23 13:04:47 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@digia.com> | 2014-09-25 15:22:26 +0300 |
commit | 01603689e8dd2d3c5be0f41d41b3543452903f03 (patch) | |
tree | 47c0d3b74c92d5891da42c48e799317a8672d253 /meta-fsl-extras/recipes/u-boot/u-boot-script-boundary | |
parent | 0dded51636b689237af7fdcda1719790c7fb3aa7 (diff) | |
download | meta-boot2qt-01603689e8dd2d3c5be0f41d41b3543452903f03.tar.gz |
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 <eirik.aavitsland@digia.com>
Diffstat (limited to 'meta-fsl-extras/recipes/u-boot/u-boot-script-boundary')
2 files changed, 106 insertions, 0 deletions
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 @@ | |||
1 | From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@digia.com> | ||
3 | Date: Fri, 10 Jan 2014 12:37:20 +0200 | ||
4 | Subject: [PATCH] nitrogen6x: disable console cursor blinking | ||
5 | |||
6 | --- | ||
7 | board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 2 +- | ||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt | ||
11 | index d933fa0..2d7c575 100644 | ||
12 | --- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt | ||
13 | +++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt | ||
14 | @@ -56,7 +56,7 @@ while test "4" -ne $nextcon ; do | ||
15 | done | ||
16 | |||
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" | ||
20 | |||
21 | if itest.s x$bootpart == x ; then | ||
22 | bootpart=1 | ||
23 | -- | ||
24 | 1.7.10.4 | ||
25 | |||
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 @@ | |||
1 | From 3d7276b2b27317c5067d2095ea5c3952d11f4390 Mon Sep 17 00:00:00 2001 | ||
2 | From: Rainer Keller <rainer.keller@digia.com> | ||
3 | Date: Fri, 5 Sep 2014 14:39:50 +0200 | ||
4 | Subject: [PATCH] Add support for update recovery linux | ||
5 | |||
6 | --- | ||
7 | board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 61 +++++++++++++++++++++++ | ||
8 | 1 file changed, 61 insertions(+) | ||
9 | |||
10 | diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt | ||
11 | index 5bc6170..4116ed4 100644 | ||
12 | --- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt | ||
13 | +++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt | ||
14 | @@ -1,3 +1,64 @@ | ||
15 | +# Boot2Qt update part begin | ||
16 | +echo "Boot to Qt" | ||
17 | +if test "x$boot2qt_update_state" = "x" ; then | ||
18 | + setenv boot2qt_update_state valid | ||
19 | + saveenv | ||
20 | +fi | ||
21 | + | ||
22 | +# This is a workaround because environment partition is read-only. | ||
23 | +if fatload mmc 1:1 0x12000000 update/state ; then | ||
24 | + mw.b 0x13000000 0x76 1 # v | ||
25 | + mw.b 0x13000001 0x75 1 # u | ||
26 | + mw.b 0x13000002 0x74 1 # t | ||
27 | + | ||
28 | + if cmp.b 0x12000000 0x13000000 1 ; then | ||
29 | + echo "State: Valid" | ||
30 | + setenv boot2qt_fat_state valid | ||
31 | + setenv boot2qt_update_state valid | ||
32 | + saveenv | ||
33 | + fi | ||
34 | + if cmp.b 0x12000000 0x13000001 1 ; then | ||
35 | + echo "State: Update" | ||
36 | + setenv boot2qt_fat_state update | ||
37 | + fi | ||
38 | + if cmp.b 0x12000000 0x13000002 1 ; then | ||
39 | + echo "State: Testing" | ||
40 | + setenv boot2qt_fat_state testing | ||
41 | + fi | ||
42 | +fi | ||
43 | + | ||
44 | +if test "x$boot2qt_fat_state" = "xupdate" || test "x$boot2qt_update_state" = "xinvalid" ; then | ||
45 | + setenv boot2qt_update_state testing | ||
46 | + saveenv | ||
47 | + echo "Recovery linux starting..." | ||
48 | + setenv bootargs "console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 root=/dev/ram0" | ||
49 | + | ||
50 | + # Guess dtb name | ||
51 | + dtbname="imx6"; | ||
52 | + if itest.s x6S != "x\$cpu" ; then | ||
53 | + dtbname=\${dtbname}q-; | ||
54 | + else | ||
55 | + dtbname=\${dtbname}s-; | ||
56 | + fi | ||
57 | + | ||
58 | + if itest.s x == "x\$board" ; then | ||
59 | + board=sabrelite | ||
60 | + fi | ||
61 | + dtbname=\${dtbname}\${board}.dtb; | ||
62 | + | ||
63 | + fatload mmc 1:1 0x10800000 update/uImage | ||
64 | + fatload mmc 1:1 0x12000000 update/${dtbname} | ||
65 | + fatload mmc 1:1 0x13000000 update/uRamdisk | ||
66 | + bootm 0x10800000 0x13000000 0x12000000 | ||
67 | +fi | ||
68 | + | ||
69 | +if test "x$boot2qt_fat_state" = "xtesting" || test "x$boot2qt_update_state" = "xtesting"; then | ||
70 | + setenv boot2qt_update_state invalid | ||
71 | + saveenv | ||
72 | +fi | ||
73 | + | ||
74 | +# Boot2Qt update part end | ||
75 | + | ||
76 | # Yocto-specifics | ||
77 | setenv bootpart 2 | ||
78 | setenv bootdir / | ||
79 | -- | ||
80 | 1.8.5.5 | ||
81 | |||