diff --git a/linux/sdcard/flash-sd.sh b/linux/sdcard/flash-sd.sh index 73c9e1b9e..a636f3d60 100755 --- a/linux/sdcard/flash-sd.sh +++ b/linux/sdcard/flash-sd.sh @@ -72,6 +72,13 @@ if [ ! -e "$SDCARD" ] ; then exit 1 fi +# Prefix partition with "p" for non-SCSI disks (mmcblk, nvme) +if [[ $SDCARD == "/dev/sd"* ]]; then + $PART_PREFIX="" +else + $PART_PREFIX="p" +fi + # If no images directory, images have not been built if [ ! -d $IMAGES ] ; then echo -e "$ERRORTEXT Buildroot images directory does not exist" @@ -155,18 +162,18 @@ if [[ $REPLY =~ ^[Yy]$ ]] ; then DD_FLAGS="bs=4k iflag=fullblock oflag=direct conv=fsync status=progress" echo -e "$NAME Copying device tree" - sudo dd if=$DEVICE_TREE of="$SDCARD"1 $DD_FLAGS + sudo dd if=$DEVICE_TREE of="$SDCARD""$PART_PREFIX"1 $DD_FLAGS echo -e "$NAME Copying OpenSBI" - sudo dd if=$FW_JUMP of="$SDCARD"2 $DD_FLAGS + sudo dd if=$FW_JUMP of="$SDCARD""$PART_PREFIX"2 $DD_FLAGS echo -e "$NAME Copying Kernel" - sudo dd if=$LINUX_KERNEL of="$SDCARD"3 $DD_FLAGS + sudo dd if=$LINUX_KERNEL of="$SDCARD""$PART_PREFIX"3 $DD_FLAGS - sudo mkfs.ext4 "$SDCARD"4 + sudo mkfs.ext4 "$SDCARD""$PART_PREFIX"4 sudo mkdir /mnt/$MNT_DIR - sudo mount -v "$SDCARD"4 /mnt/$MNT_DIR + sudo mount -v "$SDCARD""$PART_PREFIX"4 /mnt/$MNT_DIR sudo umount -v /mnt/$MNT_DIR