I need to test these changes.
Comments welcome!
- jtag_khz/speed are now single parameter only. These are used
from pre/post_reset event scripts. Adding the second parameter was
a mistake seen in retrospect. this gives precise control in post_reset
for *when* the post reset speed is set. The pre_reset event was
added *after* the second parameter to jtag_khz/speed
- the target implementations no longer gets involved in the reset mode
scheme. Either they reset a target into a halted mode or not.
target_process_reset()
detects if the reset halt failed or not.
- tcl target event names are now target_N_name. Mainly internal
at this early stage, but best to get the naming right now.
- added hardcoded reset modes from gdb_server.c. I don't know precisely what
these defaults should be or if it should be made configurable. Perhaps some
hardcoded defaults will do for now and it can be made configurable later.
- bugfix in cortex_m3.c for reset_run_and_xxx?
- issue syntax error upon obsolete argument in target command instead of
printing message that will surely drown in the log
-
--
Øyvind Harboe
http://www.zylin.com/zy1000.html
ARM7 ARM9 XScale Cortex
JTAG debugger and flash programmer
Index: C:/workspace/openocd/src/helper/startup.tcl
===================================================================
--- C:/workspace/openocd/src/helper/startup.tcl (revision 844)
+++ C:/workspace/openocd/src/helper/startup.tcl (working copy)
@@ -130,10 +130,13 @@
}
# This is the script we invoke
- proc "target_[set eventname]_[set target_num]" {} "script $scriptname"
+ proc "target_[set target_num]_[set eventname]" {} "script $scriptname"
}
+add_help_text target_script "<target#>
<event=reset/pre_reset/post_halt/pre_resume/gdb_program_config> <script_file>"
+
+
# Try flipping / and \ to find file if the filename does not
# match the precise spelling
proc find {filename} {
@@ -162,5 +165,4 @@
add_help_text script "<filename> - filename of OpenOCD script (tcl) to run"
-add_help_text target_script "<target#>
<event=reset/pre_reset/post_halt/pre_resume/gdb_program_config> <script_file>"
Index: C:/workspace/openocd/src/jtag/jtag.c
===================================================================
--- C:/workspace/openocd/src/jtag/jtag.c (revision 844)
+++ C:/workspace/openocd/src/jtag/jtag.c (working copy)
@@ -140,7 +140,7 @@
jtag_event_callback_t *jtag_event_callbacks;
/* speed in kHz*/
-static int speed1 = 0, speed2 = 0;
+static int speed1 = 0;
/* flag if the kHz speed was defined */
static int hasKHz = 0;
@@ -240,7 +240,7 @@
/* configuration */
jtag_interface_t *jtag_interface = NULL;
int jtag_speed = 0;
-int jtag_speed_post_reset = 0;
+
/* forward declarations */
@@ -1467,7 +1467,7 @@
register_command(cmd_ctx, NULL, "interface", handle_interface_command,
COMMAND_CONFIG, NULL);
register_command(cmd_ctx, NULL, "jtag_speed", handle_jtag_speed_command,
- COMMAND_ANY, "set jtag speed (if supported) <reset speed>
[<post reset speed, default value is reset speed>]");
+ COMMAND_ANY, "set jtag speed (if supported)");
register_command(cmd_ctx, NULL, "jtag_khz", handle_jtag_khz_command,
COMMAND_ANY, "same as jtag_speed, except it takes maximum khz
as arguments. 0 KHz = RTCK.");
register_command(cmd_ctx, NULL, "jtag_device",
handle_jtag_device_command,
@@ -1512,7 +1512,6 @@
{
/*stay on "reset speed"*/
jtag_interface->khz(speed1, &jtag_speed);
- jtag_interface->khz(speed2, &jtag_speed_post_reset);
hasKHz = 0;
}
@@ -1853,15 +1852,12 @@
if (argc != 0)
{
- if ((argc<1) || (argc>2))
+ if (argc!=1)
return ERROR_COMMAND_SYNTAX_ERROR;
LOG_DEBUG("handle jtag speed");
-
- if (argc >= 1)
- cur_speed = jtag_speed = jtag_speed_post_reset =
strtoul(args[0], NULL, 0);
- if (argc == 2)
- cur_speed = jtag_speed_post_reset = strtoul(args[1],
NULL, 0);
+
+ cur_speed = jtag_speed = strtoul(args[0], NULL, 0);
/* this command can be called during CONFIG,
* in which case jtag isn't initialized */
@@ -1868,11 +1864,10 @@
if (jtag)
{
jtag->speed_div(jtag_speed, &speed1);
- jtag->speed_div(jtag_speed_post_reset, &speed2);
jtag->speed(cur_speed);
}
}
- command_print(cmd_ctx, "jtag_speed: %d, %d", jtag_speed,
jtag_speed_post_reset);
+ command_print(cmd_ctx, "jtag_speed: %d", jtag_speed);
return ERROR_OK;
}
@@ -1881,17 +1876,9 @@
{
LOG_DEBUG("handle jtag khz");
- if (argc>2)
- return ERROR_COMMAND_SYNTAX_ERROR;
-
- if(argc != 0)
+ if(argc == 1)
{
-
- if (argc >= 1)
- speed1 = speed2 = strtoul(args[0], NULL, 0);
- if (argc == 2)
- speed2 = strtoul(args[1], NULL, 0);
-
+ speed1 = strtoul(args[0], NULL, 0);
if (jtag != NULL)
{
int cur_speed = 0;
@@ -1896,22 +1883,15 @@
{
int cur_speed = 0;
LOG_DEBUG("have interface set up");
- int speed_div1, speed_div2;
- if (jtag->khz(speed1, &speed_div1)!=ERROR_OK)
- {
- speed1 = speed2 = 0;
- return ERROR_OK;
- }
- if (jtag->khz(speed2, &speed_div2)!=ERROR_OK)
+ int speed_div1;
+ int retval;
+ if ((retval==jtag->khz(speed1, &speed_div1))!=ERROR_OK)
{
- speed1 = speed2 = 0;
- return ERROR_OK;
+ speed1 = 0;
+ return retval;
}
- if (argc >= 1)
- cur_speed = jtag_speed = jtag_speed_post_reset
= speed_div1;
- if (argc == 2)
- cur_speed = jtag_speed_post_reset = speed_div2;
+ cur_speed = jtag_speed = speed_div1;
jtag->speed(cur_speed);
} else
@@ -1918,10 +1898,15 @@
{
hasKHz = 1;
}
- }
- command_print(cmd_ctx, "jtag_khz: %d, %d", speed1, speed2);
+ return ERROR_OK;
+ } else if (argc==0)
+ {
+ command_print(cmd_ctx, "jtag_khz: %d", speed1);
- return ERROR_OK;
+ return ERROR_OK;
+ }
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
}
int handle_endstate_command(struct command_context_s *cmd_ctx, char *cmd, char
**args, int argc)
Index: C:/workspace/openocd/src/server/gdb_server.c
===================================================================
--- C:/workspace/openocd/src/server/gdb_server.c (revision 844)
+++ C:/workspace/openocd/src/server/gdb_server.c (working copy)
@@ -1807,7 +1807,8 @@
break;
case GDB_DETACH_RESET:
- target_process_reset(connection->cmd_ctx);
+ /* FIX?? make this configurable?? */
+ target_process_reset(connection->cmd_ctx, RESET_HALT);
break;
case GDB_DETACH_HALT:
@@ -1949,7 +1950,8 @@
break;
case 'R':
/* handle extended restart packet */
-
target_process_reset(connection->cmd_ctx);
+ /* fix?? make this configurable? */
+
target_process_reset(connection->cmd_ctx, RESET_HALT);
break;
default:
/* ignore unkown packets */
Index: C:/workspace/openocd/src/target/arm7_9_common.c
===================================================================
--- C:/workspace/openocd/src/target/arm7_9_common.c (revision 844)
+++ C:/workspace/openocd/src/target/arm7_9_common.c (working copy)
@@ -704,7 +704,7 @@
int check_pc=0;
if (target->state == TARGET_RESET)
{
- if ((target->reset_mode == RESET_HALT) ||
(target->reset_mode == RESET_INIT))
+ if (target->reset_halt)
{
if ((jtag_reset_config &
RESET_SRST_PULLS_TRST)==0)
{
@@ -772,7 +772,7 @@
return ERROR_FAIL;
}
- if ((target->reset_mode == RESET_HALT) || (target->reset_mode ==
RESET_INIT))
+ if (target->reset_halt)
{
/*
* Some targets do not support communication while SRST is
asserted. We need to
Index: C:/workspace/openocd/src/target/cortex_m3.c
===================================================================
--- C:/workspace/openocd/src/target/cortex_m3.c (revision 844)
+++ C:/workspace/openocd/src/target/cortex_m3.c (working copy)
@@ -691,7 +691,7 @@
ahbap_write_system_u32(swjdp, DCB_DCRDR, 0 );
- if (target->reset_mode == RESET_RUN)
+ if (!target->reset_halt)
{
/* Set/Clear C_MASKINTS in a separate operation */
if (cortex_m3->dcb_dhcsr & C_MASKINTS)
Index: C:/workspace/openocd/src/target/event/str912_reset.script
===================================================================
--- C:/workspace/openocd/src/target/event/str912_reset.script (revision 844)
+++ C:/workspace/openocd/src/target/event/str912_reset.script (working copy)
@@ -1,5 +0,0 @@
-# -- Enable 96K RAM */
-mww 0x5C002034, 0x0191 # PFQBC enabled / DTCM & AHB wait-states disabled
-
-str9x flash_config 0 4 2 0 0x80000
-flash protect 0 0 7 off
Index: C:/workspace/openocd/src/target/Makefile.am
===================================================================
--- C:/workspace/openocd/src/target/Makefile.am (revision 844)
+++ C:/workspace/openocd/src/target/Makefile.am (working copy)
@@ -28,7 +28,7 @@
event/omap5912_reset.script interface/jtagkey-tiny.cfg
interface/jtagkey.cfg interface/str9-comstick.cfg \
target/epc9301.cfg target/ipx42x.cfg target/lpc2129.cfg
target/netx500.cfg \
target/omap5912.cfg target/pxa270.cfg target/str750.cfg
target/str9comstick.cfg \
- target/str730.cfg target/stm32stick.cfg event/str912_reset.script
event/str710_program.script \
+ target/str730.cfg target/stm32stick.cfg event/str710_program.script \
target/lm3s811.cfg interface/luminary.cfg
interface/luminary-libftdi.cfg interface/luminary-lm3s811.cfg \
interface/stm32-stick.cfg interface/calao-usb-a9260-c01.cfg
interface/calao-usb-a9260-c02.cfg \
interface/calao-usb-a9260.cfg target/at91sam9260minimal.cfg
event/lpc2148_reset.script \
Index: C:/workspace/openocd/src/target/target/str710.cfg
===================================================================
--- C:/workspace/openocd/src/target/target/str710.cfg (revision 844)
+++ C:/workspace/openocd/src/target/target/str710.cfg (working copy)
@@ -1,5 +1,11 @@
#start slow, speed up after reset
-jtag_khz 10, 6000
+jtag_khz 10
+proc target_0_pre_reset {} {
+ jtag_khz 10
+}
+proc target_0_post_reset {} {
+ jtag_khz 6000
+}
#use combined on interfaces or targets that can't set TRST/SRST separately
reset_config trst_and_srst srst_pulls_trst
@@ -15,6 +21,7 @@
target_script 0 gdb_program_config event/str710_program.script
+
working_area 0 0x2000C000 0x4000 nobackup
#flash bank str7x <base> <size> 0 0 <target#> <variant>
Index: C:/workspace/openocd/src/target/target/str730.cfg
===================================================================
--- C:/workspace/openocd/src/target/target/str730.cfg (revision 844)
+++ C:/workspace/openocd/src/target/target/str730.cfg (working copy)
@@ -1,6 +1,14 @@
#STR730 CPU
-jtag_khz 10, 3000
+
+jtag_khz 3000
+proc target_0_pre_reset {} {
+ jtag_khz 10
+}
+proc target_0_post_reset {} {
+ jtag_khz 3000
+}
+
#use combined on interfaces or targets that cant set TRST/SRST separately
#reset_config trst_and_srst srst_pulls_trst
Index: C:/workspace/openocd/src/target/target/str750.cfg
===================================================================
--- C:/workspace/openocd/src/target/target/str750.cfg (revision 844)
+++ C:/workspace/openocd/src/target/target/str750.cfg (working copy)
@@ -1,7 +1,13 @@
#STR750 CPU
# jtag speed
-jtag_khz 10, 3000
+jtag_khz 10
+proc target_0_pre_reset {} {
+ jtag_khz 10
+}
+proc target_0_post_reset {} {
+ jtag_khz 3000
+}
#use combined on interfaces or targets that cant set TRST/SRST separately
#reset_config trst_and_srst srst_pulls_trst
@@ -15,9 +21,6 @@
jtag_nsrst_delay 500
jtag_ntrst_delay 500
-#target configuration
-daemon_startup reset
-
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi
Index: C:/workspace/openocd/src/target/target/str912.cfg
===================================================================
--- C:/workspace/openocd/src/target/target/str912.cfg (revision 844)
+++ C:/workspace/openocd/src/target/target/str912.cfg (working copy)
@@ -1,7 +1,24 @@
# script for str9
# jtag speed
-jtag_khz 16 3000
+
+proc target_0_pre_reset {} {
+ jtag_khz 16
+}
+
+# execute this upon reset init
+proc target_0_post_reset {} {
+ jtag_khz 3000
+
+ # -- Enable 96K RAM */
+ mww 0x5C002034, 0x0191 # PFQBC enabled / DTCM & AHB wait-states disabled
+
+ str9x flash_config 0 4 2 0 0x80000
+ flash protect 0 0 7 off
+
+
+}
+
jtag_nsrst_delay 100
jtag_ntrst_delay 100
@@ -20,7 +37,6 @@
target arm966e little 1 arm966e
run_and_halt_time 0 30
-target_script 0 reset event/str912_reset.script
working_area 0 0x50000000 16384 nobackup
Index: C:/workspace/openocd/src/target/target.c
===================================================================
--- C:/workspace/openocd/src/target/target.c (revision 844)
+++ C:/workspace/openocd/src/target/target.c (working copy)
@@ -284,7 +284,7 @@
return retval;
}
-int target_process_reset(struct command_context_s *cmd_ctx)
+int target_process_reset(struct command_context_s *cmd_ctx, enum
target_reset_mode reset_mode)
{
int retval = ERROR_OK;
target_t *target;
@@ -290,8 +290,6 @@
target_t *target;
struct timeval timeout, now;
- jtag->speed(jtag_speed);
-
target = targets;
while (target)
{
@@ -318,30 +316,7 @@
return retval;
keep_alive(); /* we might be running on a very slow JTAG clk */
-
- /* prepare reset_halt where necessary */
- target = targets;
- while (target)
- {
- if (jtag_reset_config & RESET_SRST_PULLS_TRST)
- {
- switch (target->reset_mode)
- {
- case RESET_HALT:
- command_print(cmd_ctx, "nSRST pulls
nTRST, falling back to \"reset run_and_halt\"");
- target->reset_mode = RESET_RUN_AND_HALT;
- break;
- case RESET_INIT:
- command_print(cmd_ctx, "nSRST pulls
nTRST, falling back to \"reset run_and_init\"");
- target->reset_mode = RESET_RUN_AND_INIT;
- break;
- default:
- break;
- }
- }
- target = target->next;
- }
-
+
target = targets;
while (target)
{
@@ -349,6 +324,7 @@
* have to drop working areas
*/
target_free_all_working_areas_restore(target, 0);
+
target->reset_halt=((reset_mode==RESET_HALT)||(reset_mode==RESET_INIT));
target->type->assert_reset(target);
target = target->next;
}
@@ -362,7 +338,7 @@
target = targets;
while (target)
{
- switch (target->reset_mode)
+ switch (reset_mode)
{
case RESET_RUN:
/* nothing to do if target just wants to be run
*/
@@ -377,10 +353,12 @@
target_register_event_callback(target_init_handler, cmd_ctx);
break;
case RESET_HALT:
- target_halt(target);
+ if ((jtag_reset_config &
RESET_SRST_PULLS_TRST)==0)
+ target_halt(target);
break;
case RESET_INIT:
- target_halt(target);
+ if ((jtag_reset_config &
RESET_SRST_PULLS_TRST)==0)
+ target_halt(target);
target_register_event_callback(target_init_handler, cmd_ctx);
break;
default:
@@ -399,6 +377,14 @@
while (target)
{
target->type->deassert_reset(target);
+ /* We can fail to bring the target into the halted state */
+ target_poll(target);
+ if (target->reset_halt&&((target->state != TARGET_HALTED)))
+ {
+ LOG_WARNING("Failed to reset target into halted mode -
issuing halt");
+ target->type->halt(target);
+ }
+
target = target->next;
}
@@ -415,12 +401,6 @@
return retval;
}
- /* post reset scripts can be quite long, increase speed now. If post
- * reset scripts needs a different speed, they can set the speed to
- * whatever they need.
- */
- jtag->speed(jtag_speed_post_reset);
-
LOG_DEBUG("Waiting for halted stated as approperiate");
/* Wait for reset to complete, maximum 5 seconds. */
@@ -437,10 +417,10 @@
{
LOG_DEBUG("Polling target");
target_poll(target);
- if ((target->reset_mode == RESET_RUN_AND_INIT) ||
- (target->reset_mode ==
RESET_RUN_AND_HALT) ||
- (target->reset_mode == RESET_HALT) ||
- (target->reset_mode == RESET_INIT))
+ if ((reset_mode == RESET_RUN_AND_INIT) ||
+ (reset_mode == RESET_RUN_AND_HALT) ||
+ (reset_mode == RESET_HALT) ||
+ (reset_mode == RESET_INIT))
{
if (target->state != TARGET_HALTED)
{
@@ -477,7 +457,6 @@
}
target_unregister_event_callback(target_init_handler, cmd_ctx);
-
return retval;
}
@@ -1420,23 +1399,28 @@
if (strcmp(args[2], "reset_halt") == 0)
{
- LOG_WARNING("reset_mode argument is
deprecated. reset_mode = reset_run");
+ LOG_WARNING("reset_mode argument is
obsolete.");
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
else if (strcmp(args[2], "reset_run") == 0)
{
- LOG_WARNING("reset_mode argument is
deprecated. reset_mode = reset_run");
+ LOG_WARNING("reset_mode argument is
obsolete.");
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
else if (strcmp(args[2], "reset_init") == 0)
{
- LOG_WARNING("reset_mode argument is
deprecated. reset_mode = reset_run");
+ LOG_WARNING("reset_mode argument is
obsolete.");
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
else if (strcmp(args[2], "run_and_halt") == 0)
{
- LOG_WARNING("reset_mode argument is
deprecated. reset_mode = reset_run");
+ LOG_WARNING("reset_mode argument is
obsolete.");
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
else if (strcmp(args[2], "run_and_init") == 0)
{
- LOG_WARNING("reset_mode argument is
deprecated. reset_mode = reset_run");
+ LOG_WARNING("reset_mode argument is
obsolete.");
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
else
{
@@ -1492,9 +1476,9 @@
int target_invoke_script(struct command_context_s *cmd_ctx, target_t *target,
char *name)
{
- return command_run_linef(cmd_ctx, " if {[catch {info body target_%s_%d}
t]==0} {target_%s_%d}",
- name, get_num_by_target(target),
- name, get_num_by_target(target));
+ return command_run_linef(cmd_ctx, " if {[catch {info body target_%d_%s}
t]==0} {target_%d_%s}",
+ get_num_by_target(target), name,
+ get_num_by_target(target), name);
}
int handle_run_and_halt_time_command(struct command_context_s *cmd_ctx, char
*cmd, char **args, int argc)
@@ -1848,11 +1832,8 @@
}
}
- /* temporarily modify mode of current reset target */
- target->reset_mode = reset_mode;
-
/* reset *all* targets */
- target_process_reset(cmd_ctx);
+ target_process_reset(cmd_ctx, reset_mode);
return ERROR_OK;
}
Index: C:/workspace/openocd/src/target/target.h
===================================================================
--- C:/workspace/openocd/src/target/target.h (revision 844)
+++ C:/workspace/openocd/src/target/target.h (working copy)
@@ -198,7 +198,7 @@
typedef struct target_s
{
target_type_t *type; /* target type
definition (name, access functions) */
- enum target_reset_mode reset_mode; /* what to do after a reset */
+ int reset_halt; /* attempt
resetting the CPU into the halted mode? */
int run_and_halt_time; /* how long the target
should run after a run_and_halt reset */
u32 working_area; /* working area
(initialized RAM). Evaluated
upon first allocation from virtual/physical address. */
@@ -252,7 +252,7 @@
extern int target_init(struct command_context_s *cmd_ctx);
extern int target_examine(struct command_context_s *cmd_ctx);
extern int handle_target(void *priv);
-extern int target_process_reset(struct command_context_s *cmd_ctx);
+extern int target_process_reset(struct command_context_s *cmd_ctx, enum
target_reset_mode reset_mode);
extern int target_register_event_callback(int (*callback)(struct target_s
*target, enum target_event event, void *priv), void *priv);
extern int target_unregister_event_callback(int (*callback)(struct target_s
*target, enum target_event event, void *priv), void *priv);
Index: C:/workspace/openocd/src/target/xscale.c
===================================================================
--- C:/workspace/openocd/src/target/xscale.c (revision 844)
+++ C:/workspace/openocd/src/target/xscale.c (working copy)
@@ -1699,7 +1699,7 @@
xscale_write_dcsr(target, 0, 1);
target->state = TARGET_RUNNING;
- if ((target->reset_mode != RESET_HALT) && (target->reset_mode
!= RESET_INIT))
+ if (!target->reset_halt)
{
jtag_add_sleep(10000);
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
