flash/stm32*: Remove the halted check in protect_check

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>

diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index 5ad0b62279d37d0f5578b55ef0c93b87cb627722..037fea07b9b634ef56e8b0a995ab176c2087aaf4 100644 (file)
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -364,11 +364,6 @@ static int stm32x_protect_check(struct flash_bank *bank)
        int num_bits;
        int set;
 
        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;
        int retval = stm32x_check_operation_supported(bank);
        if (ERROR_OK != retval)
                return retval;

diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
index 7b8ac941a6b8657e5cba59cf953324ef8096c7b0..1922a8c9afaadef910e5083005335083330a46ed 100644 (file)
--- a/src/flash/nor/stm32f2x.c
+++ b/src/flash/nor/stm32f2x.c
@@ -379,14 +379,8 @@ static int stm32x_write_options(struct flash_bank *bank)
 
 static int stm32x_protect_check(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;
 
        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) {
        /* read write protection settings */
        int retval = stm32x_read_options(bank);
        if (retval != ERROR_OK) {

diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index 7093fa4cbb6996f790fb42379c36632712a50125..ec696d2b376a1314be506dc64fc5a66612412c27 100644 (file)
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -158,11 +158,6 @@ static int stm32lx_protect_check(struct flash_bank *bank)
 
        uint32_t wrpr;
 
 
        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
        /*
         * Read the WRPR word, and check each bit (corresponding to each
         * flash sector