1 From 785f028c550e50904ca4bc7f399a21e8b5f6910c Mon Sep 17 00:00:00 2001
2 From: Mihail Grigorov <michael.grigorov@konsulko.com>
3 Date: Mon, 23 Oct 2017 14:26:12 +0300
4 Subject: [PATCH] 6x_bootscript: Make bootscript compatible with WIC and SDCARD
8 in case of error, points the boot directory to /boot
11 Signed-off-by: Mihail Grigorov <michael.grigorov@konsulko.com>
13 .../boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt | 19 +++++++++++++++----
14 1 file changed, 15 insertions(+), 4 deletions(-)
16 diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
17 index f6bf2f5289..9b5946692d 100644
18 --- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
19 +++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
20 @@ -48,6 +48,15 @@ if itest.s "x" == "x${dtbname}" ; then
25 +part uuid ${dtype} ${disk}:2 p2uuid
27 +if itest.s ${p2uuid} == 'x'; then
33 if itest.s x${bootpart} == x ; then
37 setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${cpu} board=${board}
39 if itest.s x == x${bootdir} ; then
44 +if itest.s ${bpart} == '1'; then
48 if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname} ; then
49 @@ -116,8 +129,6 @@ if itest.s "x" == "x${cmd_xxx_present}" ; then
50 echo "!!!!!!!!!!!!!!!!"
55 if test "sata" = "${dtype}" ; then
56 setenv bootargs "${bootargs} root=/dev/sda${bpart}" ;
57 elif test "usb" = "${dtype}" ; then
58 @@ -167,7 +178,7 @@ if itest.s "x" != "x${show_env}" ; then
62 -if load ${dtype} ${disk}:${bootpart} ${a_zImage} /zImage ; then
63 +if load ${dtype} ${disk}:${bootpart} ${a_zImage} ${bootdir}/zImage ; then
64 bootz ${a_zImage} - ${a_fdt}
66 echo "Error loading kernel image"