From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 22 Mar 2024 08:53:51 +0000 (+0100)
Subject: tizen: bootscript: remove usb boot related workaround
X-Git-Tag: accepted/tizen/unified/20240327.064201^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c3291f25d7444119b374f5e239cf22f5f2a4490;p=platform%2Fkernel%2Fu-boot.git

tizen: bootscript: remove usb boot related workaround

Once rootfs block device retry loop has been added to init script, this
workaround is no longer needed.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I81ae139d07595e40316dbd4ebbee6ed58c7725ee
---

diff --git a/tizen/bootscript/tizen-boot-rpi3.scr b/tizen/bootscript/tizen-boot-rpi3.scr
index 2ad4ae00df..0cbe8a8a83 100644
--- a/tizen/bootscript/tizen-boot-rpi3.scr
+++ b/tizen/bootscript/tizen-boot-rpi3.scr
@@ -5,7 +5,6 @@ if test "${target}" = "mmc0"; then;
 fi
 if test "${target}" = "usb0"; then;
 	setenv bootdev usb
-	setenv opts "${opts} rootdelay=2"
 fi
 
 if test -e $bootdev $mmcbootdev:$mmcinformpart $rebootparamfile; then;
diff --git a/tizen/bootscript/tizen-boot-rpi4.scr b/tizen/bootscript/tizen-boot-rpi4.scr
index 6d0f6a4c3a..fd4b62f23a 100644
--- a/tizen/bootscript/tizen-boot-rpi4.scr
+++ b/tizen/bootscript/tizen-boot-rpi4.scr
@@ -8,7 +8,6 @@ if test "${target}" = "mmc0"; then;
 fi
 if test "${target}" = "usb0"; then;
 	setenv bootdev usb
-	setenv opts "${opts} rootdelay=2"
 fi
 
 # find 'inform' partition or use ${mmcinformpart} fallback
diff --git a/tizen/bootscript/tizen-boot-vf2.scr b/tizen/bootscript/tizen-boot-vf2.scr
index 6cbe0f70e4..7afbe23605 100644
--- a/tizen/bootscript/tizen-boot-vf2.scr
+++ b/tizen/bootscript/tizen-boot-vf2.scr
@@ -15,9 +15,6 @@ if test -z "${devtype}"; then
 		setenv devtype nvme
 	fi
 fi
-if test "${devtype}" = "usb"; then;
-	setenv opts "${opts} rootdelay=2"
-fi
 
 if test -e $devtype $devnum:$informpart $slotfile; then;
 	ext4load $devtype $devnum:$informpart $slot_addr $slotfile;