diff --git a/packages/tools/bcm2835-bootloader/files/create_sdcard b/packages/tools/bcm2835-bootloader/files/create_sdcard
index a66a3cc5d7..b0757618a1 100755
--- a/packages/tools/bcm2835-bootloader/files/create_sdcard
+++ b/packages/tools/bcm2835-bootloader/files/create_sdcard
@@ -50,18 +50,19 @@ if [ -z "$1" ]; then
 fi
 
 DISK="$1"
-if [ "$DISK" = "/dev/mmcblk0" ]; then
-  PART1="${DISK}p1"
-  PART2="${DISK}p2"
-elif [ "$DISK" = "/dev/loop0" ]; then
-  PART1="${DISK}p1"
-  PART2="${DISK}p2"
-  IMGFILE="$2"
-  losetup $DISK $IMGFILE
-else
-  PART1="${DISK}1"
-  PART2="${DISK}2"
-fi
+case $DISK in
+  "/dev/mmcblk1"*)
+    PART1="${DISK}p1";
+    PART2="${DISK}p2";;
+  "/dev/loop"*)
+    PART1="${DISK}p1";
+    PART2="${DISK}p2";
+    IMGFILE="$2";
+    losetup $DISK $IMGFILE;;
+  *)
+    PART1="${DISK}1";
+    PART2="${DISK}2";;
+esac
 
 clear
 echo "#########################################################"