diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-06-27 23:25:07 +0100 |
|---|---|---|
| committer | Freddie Chopin <freddie.chopin@gmail.com> | 2012-07-11 08:17:42 +0000 |
| commit | 5b170456f794138cec31b24ee45e2ba4389da5d5 (patch) | |
| tree | 4c3a26c8edbdabdbeb11dbf7e454cbe4d495f36b /src/target | |
| parent | 2c14497d0a87ecebcfc9a7768f6de75898f261bf (diff) | |
target: detect correct Cortex-M tar auto increment size
The ADIv5 spec guarentees that tar_autoincr_block will be 10bits.
Make this the default for Cortex-M family until we detect a Cortex-M3/M4,
we then change autoincrement to 12bits.
Change-Id: Ie8c89134aa036879bdd8a3c312cee9715dbc6913
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/730
Tested-by: jenkins
Reviewed-by: simon qian <simonqian.openocd@gmail.com>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Diffstat (limited to 'src/target')
| -rw-r--r-- | src/target/cortex_m.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c index e4374318..4cc61f64 100644 --- a/src/target/cortex_m.c +++ b/src/target/cortex_m.c @@ -1829,6 +1829,11 @@ int cortex_m3_examine(struct target *target) armv7m->arm.is_armv6m = true; } + if (i == 4 || i == 3) { + /* Cortex-M3/M4 has 4096 bytes autoincrement range */ + armv7m->dap.tar_autoincr_block = (1 << 12); + } + /* NOTE: FPB and DWT are both optional. */ /* Setup FPB */ @@ -1964,8 +1969,11 @@ static int cortex_m3_init_arch_info(struct target *target, /* Leave (only) generic DAP stuff for debugport_init(); */ armv7m->dap.jtag_info = &cortex_m3->jtag_info; armv7m->dap.memaccess_tck = 8; - /* Cortex-M3 has 4096 bytes autoincrement range */ - armv7m->dap.tar_autoincr_block = (1 << 12); + + /* Cortex-M3/M4 has 4096 bytes autoincrement range + * but set a safe default to 1024 to support Cortex-M0 + * this will be changed in cortex_m3_examine if a M3/M4 is detected */ + armv7m->dap.tar_autoincr_block = (1 << 10); /* register arch-specific functions */ armv7m->examine_debug_reason = cortex_m3_examine_debug_reason; |