tizen: bootscript: Use set bootmode also for cpio initramfs

[platform/kernel/u-boot.git] / tizen / bootscript / tizen-boot-rpi4.scr

diff --git a/tizen/bootscript/tizen-boot-rpi4.scr b/tizen/bootscript/tizen-boot-rpi4.scr
index b609554..6d0f6a4 100644 (file)
--- a/tizen/bootscript/tizen-boot-rpi4.scr
+++ b/tizen/bootscript/tizen-boot-rpi4.scr
@@ -70,19 +70,6 @@ else
        setenv ramdiskpart ${partition_fallback}
 fi
 
-# boot from ram0 if there is sbin
-if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then;
-       setenv rootdev ram0
-else
-       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
-
 # setting console device if noting is set
 if test -z "${console}"; then;
        if test "$board_name" = "5 Model B"; then;
@@ -102,9 +89,6 @@ echo "console: ${console}"
 # DT image by model
 setenv boot_prefixes \"/\"
 
-# To use cmdline for using serial console. /* Normal mode */
-setenv bootargs \"${tizen_bootarg} cgroup_enable=memory root=/dev/${rootdev} rw bootmode=${bootmode} partition_ab=${partition_ab} rootwait ${console} ${opts} ${ip_opt}\"
-
 # Find the ramdisk offset and block count
 part start $bootdev $mmcrootdev $ramdiskpart ramdisk_start
 part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size
@@ -113,20 +97,35 @@ part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size
 setexpr ramdisksize $ramdisk_size * 200
 setexpr tizen_kernel_addr_r $ramdisk_addr_r + $ramdisksize
 
-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";
-       if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then;
-               echo "Loading Ramdisk from partition ${ramdiskpart}";
+# boot from ram0 if there is sbin or it is initramfs
+if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then;
+       setenv rootdev ram0
+       echo "Loading Ramdisk from partition ${ramdiskpart}";
+       $bootdev read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
+else
+       # Check for gzip (initramfs) magic
+       $bootdev read $ramdisk_addr_r $ramdisk_start 1;
+       if itest.w *$ramdisk_addr_r == 0x8b1f; then;
+               setenv rootdev ram0
+               echo "Loading initramfs from partition ${ramdiskpart}";
                $bootdev read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
        else
-               # Check for gzip (initramfs) magic
-               $bootdev read $ramdisk_addr_r $ramdisk_start 1;
-               if itest.w *$ramdisk_addr_r == 0x8b1f; then;
-                       echo "Loading initramfs from partition ${ramdiskpart}";
-                       $bootdev read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
+               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
+fi
+
+# To use cmdline for using serial console. /* Normal mode */
+setenv bootargs \"${tizen_bootarg} cgroup_enable=memory root=/dev/${rootdev} rw bootmode=${bootmode} partition_ab=${partition_ab} rootwait ${console} ${opts} ${ip_opt}\"
+
+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";
 
        # use fdt already preloaded by the firmware available at $fdt_addr
        if test "$kernel" = "zImage"; then;