From 3646e86c974948fdae4bd0771377e1910966bc8e Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Tue, 9 Jul 2013 22:32:24 +0200 Subject: [PATCH] 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 Reviewed-on: http://openocd.zylin.com/1495 Tested-by: jenkins Reviewed-by: Spencer Oliver --- src/flash/nor/stm32f1x.c | 5 ----- src/flash/nor/stm32f2x.c | 6 ------ src/flash/nor/stm32lx.c | 5 ----- 3 files changed, 16 deletions(-) diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c index 5ad0b622..037fea07 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 7b8ac941..1922a8c9 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 7093fa4c..ec696d2b 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 -- 2.39.5