tizen: bootscript: Use set bootmode also for cpio initramfs

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

diff --git a/tizen/bootscript/tizen-boot-vf2.scr b/tizen/bootscript/tizen-boot-vf2.scr
index 1db55e1..6cbe0f7 100644 (file)
--- a/tizen/bootscript/tizen-boot-vf2.scr
+++ b/tizen/bootscript/tizen-boot-vf2.scr
@@ -91,25 +91,6 @@ if test "${bootmode}" = "flash"; then;
        fi
 fi
 
-# boot from ramdisk if there is sbin
-if test -e $devtype $devnum:$ramdiskpart sbin/init; then;
-       setenv rootdev ram0
-else
-       if test "${devtype}" = "mmc"; then;
-               setenv rootdev mmcblk${devnum}p${rootpart}
-       fi
-       if test "${devtype}" = "usb"; then;
-               setenv rootdev sda${rootpart}
-       fi
-       if test "${devtype}" = "nvme"; then;
-               setenv rootdev nvme0n1p${rootpart}
-       fi
-       if test "${devtype}" = "virtio"; then;
-               setenv rootdev vda${rootpart}
-       fi
-       setenv bootmode normal
-fi
-
 # setting console device if noting is set
 if test -z "${console}"; then;
        setenv console "console=ttyS0,115200 earlycon"
@@ -128,9 +109,6 @@ fi
 
 setenv boot_prefixes \"/\"
 
-# To use cmdline for using serial console. /* Normal mode */
-setenv bootargs \"${tizen_bootarg} root=/dev/${rootdev} rw bootmode=${bootmode} partition_ab=${partition_ab} rootwait ${console} ${opts} ${ip_opt} stmmaceth=chain_mode:1\"
-
 # Find the ramdisk offset and block count
 part start $devtype $devnum $ramdiskpart ramdisk_start
 part size $devtype $devnum $ramdiskpart ramdisk_size
@@ -139,25 +117,45 @@ part size $devtype $devnum $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 $devtype $devnum:$distro_bootpart $tizen_kernel_addr_r $prefix$kernel; then;
-       echo ${bootmode} "boot";
-
-       if test -e $devtype $devnum:$ramdiskpart sbin/init; then;
-               echo "Loading Ramdisk from partition" ${part};
+# boot from ramdisk if there is sbin or it is initramfs
+if test -e $devtype $devnum:$ramdiskpart sbin/init; then;
+       setenv rootdev ram0
+       echo "Loading Ramdisk from partition" ${part};
+       echo "Environment value of ramdiskpart is" ${ramdiskpart};
+       $devtype dev $devnum
+       $devtype read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
+else
+       # Check for gzip (initramfs) magic
+       $devtype dev $devnum;
+       $devtype read $ramdisk_addr_r $ramdisk_start 1;
+       if itest.w *$ramdisk_addr_r == 0x8b1f; then;
+               setenv rootdev ram0
+               echo "Loading initramfs from partition ${part}";
                echo "Environment value of ramdiskpart is" ${ramdiskpart};
-               $devtype dev $devnum
                $devtype read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
        else
-               # Check for gzip (initramfs) magic
-               $devtype dev $devnum;
-               $devtype read $ramdisk_addr_r $ramdisk_start 1;
-               if itest.w *$ramdisk_addr_r == 0x8b1f; then;
-                       echo "Loading initramfs from partition ${part}";
-                       echo "Environment value of ramdiskpart is" ${ramdiskpart};
-                       $devtype read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
+               if test "${devtype}" = "mmc"; then;
+                       setenv rootdev mmcblk${devnum}p${rootpart}
                fi
+               if test "${devtype}" = "usb"; then;
+                       setenv rootdev sda${rootpart}
+               fi
+               if test "${devtype}" = "nvme"; then;
+                       setenv rootdev nvme0n1p${rootpart}
+               fi
+               if test "${devtype}" = "virtio"; then;
+                       setenv rootdev vda${rootpart}
+               fi
+               setenv bootmode normal
        fi
+fi
+
+# To use cmdline for using serial console. /* Normal mode */
+setenv bootargs \"${tizen_bootarg} root=/dev/${rootdev} rw bootmode=${bootmode} partition_ab=${partition_ab} rootwait ${console} ${opts} ${ip_opt} stmmaceth=chain_mode:1\"
+
+echo "Searching for kernel in"; for prefix in $boot_prefixes; do
+if load $devtype $devnum:$distro_bootpart $tizen_kernel_addr_r $prefix$kernel; then;
+       echo ${bootmode} "boot";
 
        if test "${board_name}" = "qemu-riscv"; then
                # If running in QEMU use the DeviceTree provided by