diff options
Diffstat (limited to 'meta-agl-bsp/meta-boundary/recipes-bsp/u-boot')
2 files changed, 0 insertions, 79 deletions
diff --git a/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary/0001-6x_bootscript-Make-bootscript-compatible-with-WIC-an.patch b/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary/0001-6x_bootscript-Make-bootscript-compatible-with-WIC-an.patch deleted file mode 100644 index 9eba21a88..000000000 --- a/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary/0001-6x_bootscript-Make-bootscript-compatible-with-WIC-an.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f1c5c08ea5606b358b30b459c74aa932796ded3c Mon Sep 17 00:00:00 2001 -From: Mihail Grigorov <michael.grigorov@konsulko.com> -Date: Wed, 10 Jan 2018 10:30:14 +0200 -Subject: [PATCH] 6x_bootscript: Make bootscript compatible with WIC and SDCARD - images - -a) Get partition 2 UUID, -in case of error, points the boot directory to /boot -otherwise / - -b) Modify DTB/hdmi to use 1920x1080 - -Signed-off-by: Mihail Grigorov <michael.grigorov@konsulko.com> ---- - .../nitrogen6x/6x_bootscript-yocto-3.14.txt | 21 +++++++++++++++++---- - 1 file changed, 17 insertions(+), 4 deletions(-) - -diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt -index f6bf2f5289..250310e37f 100644 ---- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt -+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt -@@ -48,6 +48,17 @@ if itest.s "x" == "x${dtbname}" ; then - fi - fi - -+setenv cmd_hdmi 'fdt set fb_hdmi status okay;fdt set fb_hdmi mode_str 1920x1080M@60;' -+ -+setenv p2uuid 'x' -+part uuid ${dtype} ${disk}:2 p2uuid -+ -+if itest.s ${p2uuid} == 'x'; then -+ bpart=1; -+else -+ bpart=2; -+fi -+ - if itest.s x${bootpart} == x ; then - bootpart=1 - fi -@@ -58,7 +69,11 @@ fi - setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${cpu} board=${board} - - if itest.s x == x${bootdir} ; then -- bootdir=/ -+ bootdir=/; -+fi -+ -+if itest.s ${bpart} == '1'; then -+ bootdir=/boot/; - fi - - if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname} ; then -@@ -116,8 +131,6 @@ if itest.s "x" == "x${cmd_xxx_present}" ; then - echo "!!!!!!!!!!!!!!!!" - fi - --bpart=2 -- - if test "sata" = "${dtype}" ; then - setenv bootargs "${bootargs} root=/dev/sda${bpart}" ; - elif test "usb" = "${dtype}" ; then -@@ -167,7 +180,7 @@ if itest.s "x" != "x${show_env}" ; then - printenv - fi - --if load ${dtype} ${disk}:${bootpart} ${a_zImage} /zImage ; then -+if load ${dtype} ${disk}:${bootpart} ${a_zImage} ${bootdir}/zImage ; then - bootz ${a_zImage} - ${a_fdt} - fi - echo "Error loading kernel image" --- -2.11.0 - diff --git a/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_git.bbappend b/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_git.bbappend deleted file mode 100644 index ca9cb4f94..000000000 --- a/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_git.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI += " \ - file://0001-6x_bootscript-Make-bootscript-compatible-with-WIC-an.patch \ -" - |