From 05b85ac8ed45c910a31f0641f2cc57a8cf4a8f41 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Wed, 27 Jan 2021 23:01:15 +0100 Subject: [PATCH] tizen: rpi: adjust commands to the optional usb boot Properly set and use $bootdev instead of mmc to support optional usb boot in the future. Signed-off-by: Marek Szyprowski Change-Id: Ib09bf36ade9062634f11538607768f65c2f6fc80 --- tizen/bootscript/tizen-boot-rpi3.scr | 19 ++++++++++++++++--- tizen/bootscript/tizen-boot-rpi4.scr | 18 +++++++++++++++--- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/tizen/bootscript/tizen-boot-rpi3.scr b/tizen/bootscript/tizen-boot-rpi3.scr index f6ada1c04f..0cbe8a8a83 100644 --- a/tizen/bootscript/tizen-boot-rpi3.scr +++ b/tizen/bootscript/tizen-boot-rpi3.scr @@ -1,5 +1,12 @@ # U-boot script for tizen RPI3 +if test "${target}" = "mmc0"; then; + setenv bootdev mmc +fi +if test "${target}" = "usb0"; then; + setenv bootdev usb +fi + if test -e $bootdev $mmcbootdev:$mmcinformpart $rebootparamfile; then; ext4load $bootdev $mmcbootdev:$mmcinformpart $rebootparam_addr $rebootparamfile; if itest.l *${rebootparam_addr} == ${upgrade_val}; then; @@ -32,7 +39,12 @@ fi if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then; setenv rootdev ram0 else - setenv rootdev mmcblk${mmcrootdev}p${mmcrootpart} + if test "${bootdev}" = "mmc"; then; + setenv rootdev mmcblk${mmcrootdev}p${mmcrootpart} + fi + if test "${bootdev}" = "usb"; then; + setenv rootdev sda${mmcrootpart} + fi setenv bootmode normal fi @@ -65,10 +77,11 @@ echo "Searching for kernel in"; for prefix in $boot_prefixes; do if load $bootdev $mmcbootdev:$mmcbootpart $tizen_kernel_addr_r $prefix$kernel; then; echo ${bootmode} "boot"; load $bootdev $mmcbootdev:$mmcbootpart $fdt_addr $fdtfile; - if test -e mmc $mmcrootdev:$ramdiskpart sbin/init; then; + if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then; echo "Loading Ramdisk from partition"${ramdiskpart}; - mmc read $ramdisk_addr_r $ramdisk_start $ramdisk_size; + $bootdev read $ramdisk_addr_r $ramdisk_start $ramdisk_size; fi + if test "$kernel" = "zImage"; then; bootz $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr; else diff --git a/tizen/bootscript/tizen-boot-rpi4.scr b/tizen/bootscript/tizen-boot-rpi4.scr index a914eedd9a..1ee425d241 100644 --- a/tizen/bootscript/tizen-boot-rpi4.scr +++ b/tizen/bootscript/tizen-boot-rpi4.scr @@ -1,5 +1,12 @@ # U-boot script for tizen RPI4 +if test "${target}" = "mmc0"; then; + setenv bootdev mmc +fi +if test "${target}" = "usb0"; then; + setenv bootdev usb +fi + if test -e $bootdev $mmcbootdev:$mmcinformpart $rebootparamfile; then; ext4load $bootdev $mmcbootdev:$mmcinformpart $rebootparam_addr $rebootparamfile; if itest.l *${rebootparam_addr} == ${upgrade_val}; then; @@ -32,7 +39,12 @@ fi if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then; setenv rootdev ram0 else - setenv rootdev mmcblk${mmcrootdev}p${mmcrootpart} + if test "${bootdev}" = "mmc"; then; + setenv rootdev mmcblk${mmcrootdev}p${mmcrootpart} + fi + if test "${bootdev}" = "usb"; then; + setenv rootdev sda${mmcrootpart} + fi setenv bootmode normal fi @@ -61,9 +73,9 @@ echo "Searching for kernel in"; for prefix in $boot_prefixes; do if load $bootdev $mmcbootdev:$mmcbootpart $tizen_kernel_addr_r $prefix$kernel; then; echo ${bootmode} "boot"; load $bootdev $mmcbootdev:$mmcbootpart $fdt_addr $fdtfile; - if test -e mmc $mmcrootdev:$ramdiskpart sbin/init; then; + if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then; echo "Loading Ramdisk from partition"${ramdiskpart}; - mmc read $ramdisk_addr_r $ramdisk_start $ramdisk_size; + $bootdev read $ramdisk_addr_r $ramdisk_start $ramdisk_size; fi if test "$kernel" = "zImage"; then; -- 2.34.1