aboutsummaryrefslogtreecommitdiff
path: root/src/target/armv7m.h
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2016-05-08 23:49:07 +0200
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>2016-10-30 20:30:48 +0000
commiteaacb900dd3ce5257dcfec35a8032a873d141b6a (patch)
tree2cd0d6ba7538f4627b294488fe0f96d10368c364 /src/target/armv7m.h
parentb9ee6dd4655310c0553f4eef853213b11c1df28f (diff)
downloadriscv-openocd-eaacb900dd3ce5257dcfec35a8032a873d141b6a.zip
riscv-openocd-eaacb900dd3ce5257dcfec35a8032a873d141b6a.tar.gz
riscv-openocd-eaacb900dd3ce5257dcfec35a8032a873d141b6a.tar.bz2
flash/nor: Add erased_value to drivers and pass it to targets
struct flash_driver has a default_padded_value field that is similar, but it can be changed by the user for the specific purpose of padding. Add a new erased_value field and initialize it for all targets, particularly stm32lx, xmc4xxx and virtual. Use this value in core.c:default_flash_mem_blank_check(), the slow path. Extend the target API to pass erased_value down to target code. Adding an argument ensures that we catch all callers. This allows us to merge xmc4xxx.c:xmc4xxx_blank_check_memory() into armv7m:armv7m_blank_check_memory(). It further allows us to use default_flash_blank_check() in place of xmc4xxx.c:xmc4xxx_flash_blank_check(), adding a potential slow path fallback, as well as stm32lx:stm32lx_erase_check(), adding the potential armv7m fast path with fallback to default_flash_mem_blank_check(). Fix a mips32 code comment while at it (zeroed -> erased). The armv4_5 and mips32 target implementations will now error out if an erase value other than 0xff is used, causing default_flash_blank_check() to fall back to the default_flank_mem_blank_check() slow path. Change-Id: I39323fbbc4b71c256cd567e439896d0245d4745f Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-on: http://openocd.zylin.com/3497 Tested-by: jenkins Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Diffstat (limited to 'src/target/armv7m.h')
-rw-r--r--src/target/armv7m.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 90cad00..304c72d 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -225,7 +225,7 @@ int armv7m_restore_context(struct target *target);
int armv7m_checksum_memory(struct target *target,
uint32_t address, uint32_t count, uint32_t *checksum);
int armv7m_blank_check_memory(struct target *target,
- uint32_t address, uint32_t count, uint32_t *blank);
+ uint32_t address, uint32_t count, uint32_t *blank, uint8_t erased_value);
int armv7m_maybe_skip_bkpt_inst(struct target *target, bool *inst_found);