From: Marek Pikuła <m.pikula@partner.samsung.com>
Date: Wed, 18 Jan 2023 15:57:27 +0000 (+0100)
Subject: scripts: sd_fusing_rpi4: support formatting loop devices
X-Git-Tag: accepted/tizen/unified/20230703.143011~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc2ad96224251220ec49ec52a54bde9356b9063e;p=platform%2Fkernel%2Fu-boot.git

scripts: sd_fusing_rpi4: support formatting loop devices

Change-Id: Ic6384281104ed710552119f9910cfca95ddf9a21
Signed-off-by: Marek Pikuła <m.pikula@partner.samsung.com>
---

diff --git a/scripts/tizen/sd_fusing_rpi4.sh b/scripts/tizen/sd_fusing_rpi4.sh
index 1b60fcc398..6e824a140e 100755
--- a/scripts/tizen/sd_fusing_rpi4.sh
+++ b/scripts/tizen/sd_fusing_rpi4.sh
@@ -373,25 +373,25 @@ function mkpart_3 () {
 
 	sfdisk $DISK <<-__EOF__
 	label: gpt
-	${DEVICE}1 : start=4MiB, size=${BOOT_SZ}MiB, type= C12A7328-F81F-11D2-BA4B-00A0C93EC93B, name=${PART_LABEL_NR_1}
-	${DEVICE}2 : size=${ROOTFS_SZ}MiB, name=${PART_LABEL_NR_2}
-	${DEVICE}3 : size=${DATA_SZ}MiB, name=${PART_LABEL_NR_3}
-	${DEVICE}4 : size=${EXTEND_SZ}MiB, name=none
-	${DEVICE}5 : size=${USER_SZ}MiB, name=${PART_LABEL_NR_5}
-	${DEVICE}6 : size=${MODULE_SZ}MiB, name=${PART_LABEL_NR_6}
-	${DEVICE}7 : size=${RAMDISK_SZ}MiB, name=${PART_LABEL_NR_7}
-	${DEVICE}8 : size=${RAMDISK_RECOVERY_SZ}MiB, name=${PART_LABEL_NR_8}
-	${DEVICE}9 : size=${INFORM_SZ}MiB, name=inform
-	${DEVICE}10: size=${HAL_SZ}MiB, name=${PART_LABEL_NR_10}
-	${DEVICE}11: size=${BOOT_SZ}MiB, type= C12A7328-F81F-11D2-BA4B-00A0C93EC93B, name=${PART_LABEL_NR_11}
-	${DEVICE}12: size=${ROOTFS_SZ}MiB, name=${PART_LABEL_NR_12}
-	${DEVICE}13: size=${MODULE_SZ}MiB, name=${PART_LABEL_NR_13}
-	${DEVICE}14: size=${RAMDISK_SZ}MiB, name=${PART_LABEL_NR_14}
-	${DEVICE}15: size=${RAMDISK_RECOVERY_SZ}MiB, name=${PART_LABEL_NR_15}
-	${DEVICE}16: size=${HAL_SZ}MiB, name=${PART_LABEL_NR_16}
-	${DEVICE}17: size=${PARAM_SZ}MiB, name=reserved0
-	${DEVICE}18: size=${RESERVED1_SZ}MiB, name=reserved1
-	${DEVICE}19: size=${RESERVED2_SZ}MiB, name=reserved2
+	start=4MiB, size=${BOOT_SZ}MiB, type= C12A7328-F81F-11D2-BA4B-00A0C93EC93B, name=${PART_LABEL_NR_1}
+	size=${ROOTFS_SZ}MiB, name=${PART_LABEL_NR_2}
+	size=${DATA_SZ}MiB, name=${PART_LABEL_NR_3}
+	size=${EXTEND_SZ}MiB, name=none
+	size=${USER_SZ}MiB, name=${PART_LABEL_NR_5}
+	size=${MODULE_SZ}MiB, name=${PART_LABEL_NR_6}
+	size=${RAMDISK_SZ}MiB, name=${PART_LABEL_NR_7}
+	size=${RAMDISK_RECOVERY_SZ}MiB, name=${PART_LABEL_NR_8}
+	size=${INFORM_SZ}MiB, name=inform
+	size=${HAL_SZ}MiB, name=${PART_LABEL_NR_10}
+	size=${BOOT_SZ}MiB, type= C12A7328-F81F-11D2-BA4B-00A0C93EC93B, name=${PART_LABEL_NR_11}
+	size=${ROOTFS_SZ}MiB, name=${PART_LABEL_NR_12}
+	size=${MODULE_SZ}MiB, name=${PART_LABEL_NR_13}
+	size=${RAMDISK_SZ}MiB, name=${PART_LABEL_NR_14}
+	size=${RAMDISK_RECOVERY_SZ}MiB, name=${PART_LABEL_NR_15}
+	size=${HAL_SZ}MiB, name=${PART_LABEL_NR_16}
+	size=${PARAM_SZ}MiB, name=reserved0
+	size=${RESERVED1_SZ}MiB, name=reserved1
+	size=${RESERVED2_SZ}MiB, name=reserved2
 	__EOF__
 
 
@@ -510,7 +510,7 @@ function check_device () {
 		exit 0
 	fi
 
-	DEVICE=/dev/`lsblk $DEVICE -o TYPE,KNAME | awk "/^disk/ { print \\\$2 }"`
+	DEVICE=/dev/`lsblk $DEVICE -o TYPE,KNAME | awk '/^(disk)|(loop)/ { print $2 }'`
 
 	local REMOVABLE=`lsblk $DEVICE -nd -o RM | grep 1 | wc -l`
 	if [ "$REMOVABLE" == "0" ]; then