fix(scripts/bundle): Pack spinor under respective target-storage directory

When a platform has a *_spinor directory, place it under the corresponding
platform target storage (emmc/ufs/nvme).

Signed-off-by: Vishwas Udupa <vudupa@qti.qualcomm.com>

Author: vishwasudupa

scripts/bundle-flash-dirs.sh

@@ -43,6 +43,16 @@ done
 echo "emmc_dirs: $emmc_dirs"
 echo "ufs_dirs: $ufs_dirs"
 
+# Organize spinor directories under their base directories
+for dir in $emmc_dirs $ufs_dirs; do
+    [ -d "$dir" ] || continue
+    echo "$dir" | grep -q "_spinor$" || continue
+    prefix=$(echo "$dir" | sed 's/_spinor$//')
+    for folder in $emmc_dirs $ufs_dirs; do
+        echo "$folder" | grep -q "^${prefix}_" && [ "$folder" != "$dir" ] && [ -d "$folder" ] && cp -r "${dir}"/* "${folder}/" && break
+    done
+done
+
 # word splitting is a feature in this case
 # shellcheck disable=SC2086
 tar -cvzf "$output_dir/flash-emmc.tar.gz" disk-sdcard.img1 disk-sdcard.img2 $emmc_dirs