meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary/0001-6x_bootscript-Make-bootscript-compatible-with-WIC-an.patch

   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
   5  images
   6
   7 a) Get partition 2 UUID,
   8 in case of error, points the boot directory to /boot
   9 otherwise /
  10
  11 b) Modify DTB/hdmi to use 1920x1080
  12
  13 Signed-off-by: Mihail Grigorov <michael.grigorov@konsulko.com>
  14 ---
  15  .../nitrogen6x/6x_bootscript-yocto-3.14.txt         | 21 +++++++++++++++++----
  16  1 file changed, 17 insertions(+), 4 deletions(-)
  17
  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
  23         fi
  24  fi
  25
  26 +setenv cmd_hdmi 'fdt set fb_hdmi status okay;fdt set fb_hdmi mode_str 1920x1080M@60;'
  27 +
  28 +setenv p2uuid 'x'
  29 +part uuid ${dtype} ${disk}:2 p2uuid
  30 +
  31 +if itest.s ${p2uuid} == 'x'; then
  32 +       bpart=1;
  33 +else
  34 +       bpart=2;
  35 +fi
  36 +
  37  if itest.s x${bootpart} == x ; then
  38         bootpart=1
  39  fi
  40 @@ -58,7 +69,11 @@ fi
  41  setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${cpu} board=${board}
  42
  43  if itest.s x == x${bootdir} ; then
  44 -       bootdir=/
  45 +       bootdir=/;
  46 +fi
  47 +
  48 +if itest.s ${bpart} == '1'; then
  49 +       bootdir=/boot/;
  50  fi
  51
  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 "!!!!!!!!!!!!!!!!"
  55  fi
  56
  57 -bpart=2
  58 -
  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
  63         printenv
  64  fi
  65
  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}
  69  fi
  70  echo "Error loading kernel image"
  71 --
  72 2.11.0
  73