aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fritiofson <andreas.fritiofson@gmail.com>2013-07-09 22:32:24 +0200
committerSpencer Oliver <spen@spen-soft.co.uk>2013-07-15 09:55:44 +0000
commit3646e86c974948fdae4bd0771377e1910966bc8e (patch)
tree63ee0e62b84276f652645c14edcdc058bd37cc1f
parent9c298cd27874c77bd9f5aa84c0380349f002cffa (diff)
downloadriscv-openocd-3646e86c974948fdae4bd0771377e1910966bc8e.zip
riscv-openocd-3646e86c974948fdae4bd0771377e1910966bc8e.tar.gz
riscv-openocd-3646e86c974948fdae4bd0771377e1910966bc8e.tar.bz2
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>
-rw-r--r--src/flash/nor/stm32f1x.c5
-rw-r--r--src/flash/nor/stm32f2x.c6
-rw-r--r--src/flash/nor/stm32lx.c5
3 files changed, 0 insertions, 16 deletions
diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index 5ad0b62..037fea0 100644
--- 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;
- 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;
diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
index 7b8ac94..1922a8c 100644
--- 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)
{
- 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) {
diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index 7093fa4..ec696d2 100644
--- 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;
- 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