1 From f1c5c08ea5606b358b30b459c74aa932796ded3c Mon Sep 17 00:00:00 2001
2 From: Mihail Grigorov <michael.grigorov@konsulko.com>
3 Date: Wed, 10 Jan 2018 10:30:14 +0200
4 Subject: [PATCH] 6x_bootscript: Make bootscript compatible with WIC and SDCARD
7 a) Get partition 2 UUID,
8 in case of error, points the boot directory to /boot
11 b) Modify DTB/hdmi to use 1920x1080
13 Signed-off-by: Mihail Grigorov <michael.grigorov@konsulko.com>
15 .../nitrogen6x/6x_bootscript-yocto-3.14.txt | 21 +++++++++++++++++----
16 1 file changed, 17 insertions(+), 4 deletions(-)
18 diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
19 index f6bf2f5289..250310e37f 100644
20 --- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
21 +++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
22 @@ -48,6 +48,17 @@ if itest.s "x" == "x${dtbname}" ; then
26 +setenv cmd_hdmi 'fdt set fb_hdmi status okay;fdt set fb_hdmi mode_str 1920x1080M@60;'
29 +part uuid ${dtype} ${disk}:2 p2uuid
31 +if itest.s ${p2uuid} == 'x'; then
37 if itest.s x${bootpart} == x ; then
41 setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${cpu} board=${board}
43 if itest.s x == x${bootdir} ; then
48 +if itest.s ${bpart} == '1'; then
52 if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname} ; then
53 @@ -116,8 +131,6 @@ if itest.s "x" == "x${cmd_xxx_present}" ; then
54 echo "!!!!!!!!!!!!!!!!"
59 if test "sata" = "${dtype}" ; then
60 setenv bootargs "${bootargs} root=/dev/sda${bpart}" ;
61 elif test "usb" = "${dtype}" ; then
62 @@ -167,7 +180,7 @@ if itest.s "x" != "x${show_env}" ; then
66 -if load ${dtype} ${disk}:${bootpart} ${a_zImage} /zImage ; then
67 +if load ${dtype} ${disk}:${bootpart} ${a_zImage} ${bootdir}/zImage ; then
68 bootz ${a_zImage} - ${a_fdt}
70 echo "Error loading kernel image"