stellaris: recover_command use usleep rather than sleep

[openocd.git] / src / flash / nor / stm32x.c

diff --git a/src/flash/nor/stm32x.c b/src/flash/nor/stm32x.c
index eaa3a0e450177587d510c6de0c4c23a4f9ee0b1b..53fc4ea23a56ffcd9ebd81a2013d10fb5d5f53e8 100644 (file)
--- a/src/flash/nor/stm32x.c
+++ b/src/flash/nor/stm32x.c
@@ -459,8 +459,7 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t
                0x01, 0xD1,                                     /* bne  exit */
                0x01, 0x3A,                                     /* subs r2, r2, #1 */
                0xED, 0xD1,                                     /* bne  write */
-                                                                       /* exit: */
-               0xFE, 0xE7,                                     /* b exit */
+               0x00, 0xBE,                             /* bkpt #0 */
                0x10, 0x20, 0x02, 0x40,         /* STM32_FLASH_CR:      .word 0x40022010 */
                0x0C, 0x20, 0x02, 0x40          /* STM32_FLASH_SR:      .word 0x4002200C */
        };
@@ -978,7 +977,9 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
                return ERROR_OK;
        }
 
-       command_print(CMD_CTX, "stm32x unlocked");
+       command_print(CMD_CTX, "stm32x unlocked.\n"
+                       "INFO: a reset or power cycle is required "
+                       "for the new settings to take effect.");
 
        return ERROR_OK;
 }
@@ -1114,7 +1115,9 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
                return ERROR_OK;
        }
 
-       command_print(CMD_CTX, "stm32x write options complete");
+       command_print(CMD_CTX, "stm32x write options complete.\n"
+                               "INFO: a reset or power cycle is required "
+                               "for the new settings to take effect.");
 
        return ERROR_OK;
 }