summaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-29 20:03:59 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-29 20:03:59 +0000
commitf0fd28a66ca5866de557941113b35de5b55b554d (patch)
treeb1418e73450edfad19ce2d82ee6281bb192dfa32 /src/flash
parent54ffd82a1a3f90dfc0a81e777d0638998f122a90 (diff)
downloadopenocd+libswd-f0fd28a66ca5866de557941113b35de5b55b554d.tar.gz
openocd+libswd-f0fd28a66ca5866de557941113b35de5b55b554d.tar.bz2
openocd+libswd-f0fd28a66ca5866de557941113b35de5b55b554d.tar.xz
openocd+libswd-f0fd28a66ca5866de557941113b35de5b55b554d.zip
David Brownell <david-b@pacbell.net>:
Warn when people (or scripts) use numeric identifiers for TAPs, instead of dotted.name values. We want this usage to go away, so that for example adding more TAPs doesn't cause config scripts to break because some sequence number changed. It's been deprecated since late 2008, but putting a warning on this should help us remove it (say, in June 2010) by helping to phase out old (ab)usage in config scripts. Other than in various config files, the only code expecting such a number was the almost unused str9xpec driver. This code was changed to use the TAP it was passed, instead of making its own dubious lookup and ignoring that TAP. git-svn-id: svn://svn.berlios.de/openocd/trunk@2415 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/str9xpec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index c1021ba0..bca3b88f 100644
--- a/src/flash/str9xpec.c
+++ b/src/flash/str9xpec.c
@@ -318,14 +318,14 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *
str9xpec_info = malloc(sizeof(str9xpec_flash_controller_t));
bank->driver_priv = str9xpec_info;
- /* find out jtag position of flash controller
- * it is always after the arm966 core */
-
+ /* REVISIT verify that the jtag position of flash controller is
+ * right after *THIS* core, which must be a STR9xx core ...
+ */
armv4_5 = bank->target->arch_info;
arm7_9 = armv4_5->arch_info;
jtag_info = &arm7_9->jtag_info;
- str9xpec_info->tap = jtag_tap_by_position(jtag_info->tap->abs_chain_position - 1);
+ str9xpec_info->tap = bank->target->tap;
str9xpec_info->isc_enable = 0;
str9xpec_build_block_list(bank);