Changes to make unlock and restore more stable

3_backup_internal_flash.sh

@@ -26,7 +26,7 @@ if ! ./scripts/flashloader.sh $ADAPTER new_flash_image.bin; then
     echo "Flashloader failed, check debug connection and try again."
 fi
 
-echo "Flash flashed. Now do the following procedure:"
+echo "Flash successfully flashed. Now do the following procedure:"
 echo "- Disconnect power from the device"
 echo "- Power it again"
 echo "- Press and hold the power button"
@@ -53,4 +53,4 @@ fi
 
 rm new_flash_image.bin
 
-echo "Device backed up successful"
+echo "Device backed up successfully"

4_unlock_device.sh

@@ -28,9 +28,9 @@ echo "Unlocking device... (Takes up to 30 seconds.)"
 if ! openocd -f openocd/interface_"$1".cfg \
     -c "init;" \
     -c "halt;" \
-    -f openocd/rdp0.cfg >/dev/null 2>&1; then
+    -f openocd/rdp0.cfg; then
     echo "Unlocking device failed."
     exit 1
 fi
 
-echo "Congratulations, your device has been unlocked. Please power-cycle it for the changes to take full effect."
+echo "Congratulations, your device has been unlocked. Please power-cycle it for the changes to take full effect."

5_restore.sh

@@ -19,13 +19,8 @@ fi
 
 ADAPTER=$1
 
-echo "Ok, restoring original firmware!"
+echo "Ok, restoring original firmware! (We will not lock the device, so you won't have to repeat this procedure!)"
 
-echo "Restoring SPI flash..."
-if ! ./scripts/flashloader.sh $ADAPTER backups/flash_backup.bin; then
-    echo "Restoring SPI flash failed. Check debug connection and try again."
-    exit 1
-fi
 
 echo "Restoring internal flash..."
 if ! openocd -f openocd/interface_"$1".cfg \
@@ -37,4 +32,11 @@ if ! openocd -f openocd/interface_"$1".cfg \
     exit 1
 fi
 
+
+echo "Restoring SPI flash..."
+if ! ./scripts/flashloader.sh $ADAPTER backups/flash_backup.bin; then
+    echo "Restoring SPI flash failed. Check debug connection and try again."
+    exit 1
+fi
+
 echo "Success, your device should be running the original firmware again!"

openocd/rdp0.cfg

@@ -1,7 +1,6 @@
 
 init
 echo "Reset and halt"
-reset
 halt
 
 # mwr 

openocd/rdp1.cfg

@@ -1,7 +1,5 @@
 
 init
-echo "Reset and halt"
-reset
 halt
 
 # mwr