hifiveu: use ptgen instead of sgdisk for image generation

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

diff --git a/target/linux/hifiveu/image/gen_hifiveu_sdcard_img.sh b/target/linux/hifiveu/image/gen_hifiveu_sdcard_img.sh
index 047a6da01103fa70ca54e4c49617854853b46a61..35c06f029df2ca6304e61fdd447c8c8c4126efc2 100755 (executable)
--- a/target/linux/hifiveu/image/gen_hifiveu_sdcard_img.sh
+++ b/target/linux/hifiveu/image/gen_hifiveu_sdcard_img.sh
@@ -13,9 +13,7 @@ set -ex
 SPL_UUID="5B193300-FC78-40CD-8002-E86C45580B47"
 UBOOT_UUID="2E54B353-1271-4842-806F-E436D6AF6985"
 BOOT_UUID="EF00"
-LINUX_UUID="0FC63DAF-8483-4772-8E79-3D69D8477DE4"
 
-#BBL_SIZE=4
 OUTPUT="$1"
 BOOTFS="$2"
 ROOTFS="$3"
@@ -24,25 +22,29 @@ ROOTFSSIZE="$5"
 UBOOT="$6"
 UBOOT_SPL="$7"
 
-FULLSIZE="$(($BOOTFSSIZE+$ROOTFSSIZE+6))"
+#FULLSIZE="$(($BOOTFSSIZE+$ROOTFSSIZE+6))"
 #echo "Full size is: ${FULLSIZE}M"
 
-BOOTFSOFFSET="$(($BOOTFSSIZE * 1048576 / 512 + 10274))"
-BOOTFSEND="$(( ($BBL_SIZE+$BOOTFSSIZE) * 1048576 / 512 + 10274 ))"
-echo "Bootfs is: $BOOTFSOFFSET - $BOOTFSEND"
+#BOOTFSOFFSET="$(($BOOTFSSIZE * 1048576 / 512 + 10274))"
+#BOOTFSEND="$(( ($BBL_SIZE+$BOOTFSSIZE) * 1048576 / 512 + 10274 ))"
+#echo "Bootfs is: $BOOTFSOFFSET - $BOOTFSEND"
 
-ROOTFSOFFSET="$((($BOOTFSSIZE) * 1048576 / 512 + 10274 + 2 ))"
-ROOTFSEND="$((($BOOTFSSIZE+$ROOTFSSIZE) * 1048576 / 512 + 10274 + 2))"
-echo "Rootfs is: $ROOTFSOFFSET - $ROOTFSEND"
+#ROOTFSOFFSET="$((($BOOTFSSIZE) * 1048576 / 512 + 10274 + 2 ))"
+#ROOTFSEND="$((($BOOTFSSIZE+$ROOTFSSIZE) * 1048576 / 512 + 10274 + 2))"
+#echo "Rootfs is: $ROOTFSOFFSET - $ROOTFSEND"
 
-dd if=/dev/zero of=$OUTPUT bs=1M count=$FULLSIZE
+#dd if=/dev/zero of=$OUTPUT bs=1M count=$FULLSIZE
 
-sgdisk --clear \
-    --set-alignment=2 \
-    --new=1:34:2081            --change-name=1:loader1 --typecode=1:${SPL_UUID} \
-    --new=2:2082:10273         --change-name=2:loader2 --typecode=2:${UBOOT_UUID} \
-    --new=3:10274:${BOOTFSEND} --change-name=3:boot    --typecode=3:${BOOT_UUID} \
-    --new=4:${ROOTFSOFFSET}:${ROOTFSEND}       --change-name=4:rootfs  --typecode=4:${LINUX_UUID} $OUTPUT
+set $(ptgen -o $OUTPUT -v -g -T sifiveu_spl -N loader1 -p 1024 -T sifiveu_uboot -N loader -p 4096 -t ef -N boot -p ${BOOTFSSIZE}M -N rootfs -p ${ROOTFSSIZE}M)
+
+ROOTFSOFFSET=$(($7 / 512))
+
+#sgdisk --clear \
+#    --set-alignment=2 \
+#    --new=1:34:2081           --change-name=1:loader1 --typecode=1:${SPL_UUID} \
+#    --new=2:2082:10273                --change-name=2:loader2 --typecode=2:${UBOOT_UUID} \
+#    --new=3:10274:${BOOTFSEND}        --change-name=3:boot    --typecode=3:${BOOT_UUID} \
+#    --new=4:${ROOTFSOFFSET}:${ROOTFSEND}      --change-name=4:rootfs  --typecode=4:${LINUX_UUID} $OUTPUT
 
 dd bs=512 if="$UBOOT_SPL" of="$OUTPUT" seek=34 conv=notrunc
 dd bs=512 if="$UBOOT" of="$OUTPUT" seek=2082 conv=notrunc