tizen: bootscript: rename environment variables

The script shall be used in QEMU with virtio storage, so we better rename
variables to avoid confusion.

Change-Id: I17c32390b19287113d78ac9e95c45d5d6590ae04
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/include/samsung/tizen_visionfive2.h b/include/samsung/tizen_visionfive2.h
index 572dfd5..8bf0974 100644 (file)
--- a/include/samsung/tizen_visionfive2.h
+++ b/include/samsung/tizen_visionfive2.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2023 Samsung Electronics
  *
- * Configuration settings for the Tizen Amlogic board.
+ * Configuration settings for the Tizen on VisionFive2 board and QEMU.
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -11,7 +11,7 @@
 
 #define CLEAR_REBOOT_PARAM \
        "mw.l ${rebootparam_addr} ${normal_val} ; "                                             \
-       "ext4write mmc ${mmcbootdev}:${mmcinformpart} ${rebootparam_addr} /${rebootparamfile} 8; "
+       "ext4write ${bootdevtype} ${bootdevnum}:${informpart} ${rebootparam_addr} /${rebootparamfile} 8; "
 
 /* SD/MMC configuration */
 #define CONFIG_MMC_DEFAULT_DEV 1
@@ -20,11 +20,10 @@
 
 #define TIZEN_ENV_SETTING \
        "kernel=" KERNEL_NAME "\0"              \
-       "mmcbootdev=1\0"                        \
-       "mmcbootpart=3\0"                       \
-       "mmcrootdev=1\0"                        \
-       "mmcrootpart=5\0"                       \
-       "mmcinformpart=0xb\0"                   \
+       "bootdevnum=1\0"                        \
+       "bootpart=3\0"                  \
+       "rootpart=5\0"                  \
+       "informpart=0xb\0"                      \
        "rebootparamfile=reboot-param.bin\0"    \
        "slotfile=partition-ab.info\0"  \
        "slot_addr=0x82200000\0"                \
@@ -37,7 +36,7 @@
        "ramdiskpart=9\0"                       \
        "part=9\0"                              \
        "bootmode=ramdisk\0"                    \
-       "bootdev=mmc\0"                         \
+       "bootdevtype=mmc\0"                     \
        "tfm=setenv bootmode download; run bootcmd\0"   \
        "tizen_bootarg= \0"     \
        "opts=loglevel=7\0"                     \

diff --git a/tizen/bootscript/tizen-boot-vf2.scr b/tizen/bootscript/tizen-boot-vf2.scr
index 2e663ca..db1d861 100644 (file)
--- a/tizen/bootscript/tizen-boot-vf2.scr
+++ b/tizen/bootscript/tizen-boot-vf2.scr
@@ -1,15 +1,15 @@
 # U-boot script for tizen VF2
 
-if test "${target}" = "mmc0"; then;
-       setenv bootdev mmc
+if test "${target}" = "mmc0" -o "${target}" = "mmc1"; then;
+       setenv devtype mmc
 fi
 if test "${target}" = "usb0"; then;
-       setenv bootdev usb
+       setenv devtype usb
        setenv opts "${opts} rootdelay=2"
 fi
 
-if test -e $bootdev $mmcbootdev:$mmcinformpart $slotfile; then;
-       ext4load $bootdev $mmcbootdev:$mmcinformpart $slot_addr $slotfile;
+if test -e $devtype $devnum:$informpart $slotfile; then;
+       ext4load $devtype $devnum:$informpart $slot_addr $slotfile;
        if itest.b *${slot_addr} == 0x62; then;
                setenv ramdiskpart 0xf
                setenv part 15
@@ -28,8 +28,8 @@ else
        echo "boot from slot_a";
 fi
 
-if test -e $bootdev $mmcbootdev:$mmcinformpart $rebootparamfile; then;
-       ext4load $bootdev $mmcbootdev:$mmcinformpart $rebootparam_addr $rebootparamfile;
+if test -e $devtype $devnum:$informpart $rebootparamfile; then;
+       ext4load $devtype $devnum:$informpart $rebootparam_addr $rebootparamfile;
        if itest.l *${rebootparam_addr} == ${upgrade_val}; then;
                if test "${partition_ab}" = "b"; then
                        setenv ramdiskpart 0x10
@@ -45,6 +45,7 @@ if test -e $bootdev $mmcbootdev:$mmcinformpart $rebootparamfile; then;
                        setenv part 16
                else
                        setenv ramdiskpart 9
+                       setenv part 9
                fi
                setenv bootmode recovery
        elif itest.l *${rebootparam_addr} == ${download_val}; then;
@@ -80,14 +81,14 @@ if test "${bootmode}" = "flash"; then;
 fi
 
 # boot from ramdisk if there is sbin
-if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then;
+if test -e $devtype $bootdevnum:$ramdiskpart sbin/init; then;
        setenv rootdev ram0
 else
-       if test "${bootdev}" = "mmc"; then;
-               setenv rootdev mmcblk${mmcrootdev}p${mmcrootpart}
+       if test "${devtype}" = "mmc"; then;
+               setenv rootdev mmcblk${bootdevnum}p${rootpart}
        fi
-       if test "${bootdev}" = "usb"; then;
-               setenv rootdev sda${mmcrootpart}
+       if test "${devtype}" = "usb"; then;
+               setenv rootdev sda${rootpart}
        fi
        setenv bootmode normal
 fi
@@ -105,24 +106,24 @@ setenv boot_prefixes \"/\"
 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 $bootdev $mmcrootdev $ramdiskpart ramdisk_start
-part size $bootdev $mmcrootdev $ramdiskpart ramdisk_size
+part start $devtype $bootdevnum $ramdiskpart ramdisk_start
+part size $devtype $bootdevnum $ramdiskpart ramdisk_size
 
 # Set to ramdisksize with real partition size. (Need to multiply block-size 0x200)
 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;
+if load $devtype $devnum:$distro_bootpart $tizen_kernel_addr_r $prefix$kernel; then;
        echo ${bootmode} "boot";
 
-       if test -e $bootdev $mmcrootdev:$ramdiskpart sbin/init; then;
+       if test -e $devtype $bootdevnum:$ramdiskpart sbin/init; then;
                echo "Loading Ramdisk from partition"${part};
                echo "Environment value of ramdiskpart is" ${ramdiskpart};
-               $bootdev read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
+               $devtype read $ramdisk_addr_r $ramdisk_start $ramdisk_size;
        fi
 
-       load $bootdev $mmcrootdev:$mmcbootpart $fdt_addr_r $fdtfile
+       load $devtype $bootdevnum:$distro_bootpart $fdt_addr_r $fdtfile
        booti $tizen_kernel_addr_r $ramdisk_addr_r:$ramdisksize $fdt_addr_r;
 fi
 done