flash/stm32*: Remove the halted check in protect_check 95/1495/2
authorAndreas Fritiofson <andreas.fritiofson@gmail.com>
Tue, 9 Jul 2013 20:32:24 +0000 (22:32 +0200)
committerSpencer Oliver <spen@spen-soft.co.uk>
Mon, 15 Jul 2013 09:55:44 +0000 (09:55 +0000)
These chips are capable of reading the flash registers while they're
running.

Change-Id: I76b90b2bae1aa79b5a063b2073faa5d3ed93cfd7
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1495
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
src/flash/nor/stm32f1x.c
src/flash/nor/stm32f2x.c
src/flash/nor/stm32lx.c

index 5ad0b62..037fea0 100644 (file)
@@ -364,11 +364,6 @@ static int stm32x_protect_check(struct flash_bank *bank)
        int num_bits;
        int set;
 
-       if (target->state != TARGET_HALTED) {
-               LOG_ERROR("Target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-
        int retval = stm32x_check_operation_supported(bank);
        if (ERROR_OK != retval)
                return retval;
index 7b8ac94..1922a8c 100644 (file)
@@ -379,14 +379,8 @@ static int stm32x_write_options(struct flash_bank *bank)
 
 static int stm32x_protect_check(struct flash_bank *bank)
 {
-       struct target *target = bank->target;
        struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 
-       if (target->state != TARGET_HALTED) {
-               LOG_ERROR("Target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-
        /* read write protection settings */
        int retval = stm32x_read_options(bank);
        if (retval != ERROR_OK) {
index 7093fa4..ec696d2 100644 (file)
@@ -158,11 +158,6 @@ static int stm32lx_protect_check(struct flash_bank *bank)
 
        uint32_t wrpr;
 
-       if (target->state != TARGET_HALTED) {
-               LOG_ERROR("Target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-
        /*
         * Read the WRPR word, and check each bit (corresponding to each
         * flash sector