From bf6cec5995aa8501128298674b37a510d7730006 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Tue, 12 Nov 2019 14:35:18 +0900 Subject: [PATCH] rpi: tizen-boot: rpi4-32b; sync boot script with rpi3-32b Sync boot script with rpi3-32b. It's fixed wrong statement and condition check. Change-Id: I3179f1fa9909443bbe8b1711232396f042228877 Signed-off-by: Jaehoon Chung --- board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr b/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr index b752e67..67331b9 100644 --- a/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr +++ b/board/raspberrypi/rpi/tizen-boot-rpi4-32b.scr @@ -5,7 +5,7 @@ if test -e $bootdev $mmcbootdev:$mmcinformpart $rebootparamfile; then; if itest.l *${rebootparam_addr} == ${upgrade_val}; then; setenv ramdiskpart 8 setenv ramdisksize c00000 - bootmode=fota + setenv bootmode fota elif itest.l *${rebootparam_addr} == ${recovery_val}; then; setenv ramdiskpart 8 setenv ramdisksize c00000 @@ -19,6 +19,19 @@ if test -e $bootdev $mmcbootdev:$mmcinformpart $rebootparamfile; then; fi fi +# This is for jumping to flash mode on u-boot. +if test "${bootmode}" = "download"; then; + setenv ramdiskpart 8 + setenv ramdisksize c00000 + setenv bootmode flash +fi + +if test "${bootmode}" = "flash"; then; + if test -n "${ipaddr}"; then; + ip_opt=\"ip=${ipaddr}::${gateway}:${netmask}\" + fi +fi + # boot from ram0 if there is sbin if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then; setenv rootdev ram0 @@ -40,7 +53,7 @@ setenv fdtfile \"bcm2711-rpi-4-b.dtb\" setenv boot_prefixes \"/\" # To use comdline for using serial console. /* Normal mode */ -setenv bootargs \"${tizen_bootarg} root=/dev/${rootdev} rw bootmode=${bootmode} rootwait ${console} ${opts}\" +setenv bootargs \"${tizen_bootarg} root=/dev/${rootdev} rw bootmode=${bootmode} rootwait ${console} ${opts} ${ip_opt}\" # Find the ramdisk offset and block count part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start -- 2.7.4