Browse Source

retired reset run_and_init/halt

git-svn-id: svn://svn.berlios.de/openocd/trunk@877 b42882b7-edfa-0310-969c-e2dbd0fdcd60
tags/v0.1.0
oharboe 13 years ago
parent
commit
e2b6de3d66
38 changed files with 346 additions and 501 deletions
  1. +1
    -15
      doc/openocd.texi
  2. +311
    -440
      src/target/target.c
  3. +0
    -3
      src/target/target.h
  4. +1
    -1
      src/target/target/at91r40008.cfg
  5. +1
    -1
      src/target/target/at91sam9260.cfg
  6. +1
    -1
      src/target/target/at91sam9260minimal.cfg
  7. +1
    -1
      src/target/target/eir-sam7se512.cfg
  8. +1
    -1
      src/target/target/hammer.cfg
  9. +1
    -1
      src/target/target/ipx42x.cfg
  10. +1
    -1
      src/target/target/lpc2129.cfg
  11. +1
    -1
      src/target/target/lpc2148.cfg
  12. +1
    -1
      src/target/target/lpc2294.cfg
  13. +1
    -1
      src/target/target/mx31.cfg
  14. +1
    -1
      src/target/target/netx500.cfg
  15. +1
    -1
      src/target/target/nslu2.cfg
  16. +1
    -1
      src/target/target/omap5912.cfg
  17. +1
    -1
      src/target/target/pic32mx.cfg
  18. +1
    -1
      src/target/target/pxa255.cfg
  19. +1
    -1
      src/target/target/pxa270.cfg
  20. +1
    -1
      src/target/target/sam7s256.cfg
  21. +1
    -1
      src/target/target/sam7x256.cfg
  22. +1
    -1
      src/target/target/stm32.cfg
  23. +1
    -1
      src/target/target/stm32stick.cfg
  24. +1
    -1
      src/target/target/str710.cfg
  25. +1
    -1
      src/target/target/str730.cfg
  26. +1
    -1
      src/target/target/str750.cfg
  27. +1
    -1
      src/target/target/str912.cfg
  28. +1
    -1
      src/target/target/str9comstick.cfg
  29. +1
    -1
      src/target/target/wi-9c.cfg
  30. +0
    -1
      src/target/target/xba_revA3.cfg
  31. +1
    -2
      testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg
  32. +1
    -2
      testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg
  33. +1
    -2
      testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg
  34. +1
    -2
      testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg
  35. +1
    -2
      testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg
  36. +1
    -2
      testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg
  37. +1
    -2
      testing/examples/STR710Test/prj/str710_jtagkey.cfg
  38. +1
    -2
      testing/examples/STR912Test/prj/str912_jtagkey.cfg

+ 1
- 15
doc/openocd.texi View File

@@ -540,11 +540,6 @@ Event is one of the following:
@option{pre_resume} or @option{gdb_program_config}.
@option{post_reset} and @option{reset} will produce the same results.

@item @b{run_and_halt_time} <@var{target#}> <@var{time_in_ms}>
@cindex run_and_halt_time
The amount of time the debugger should wait after releasing reset before it asserts
a debug request. This is used by the @option{run_and_halt} and @option{run_and_init}
reset modes.
@item @b{working_area} <@var{target#}> <@var{address}> <@var{size}>
<@var{backup}|@var{nobackup}>
@cindex working_area
@@ -795,8 +790,7 @@ OpenOCD will wait 5 seconds for the target to resume.
@cindex step
Single-step the target at its current code position, or at an optional address.

@item @b{reset} [@option{run}|@option{halt}|@option{init}|@option{run_and_halt}
|@option{run_and_init}]
@item @b{reset} [@option{run}|@option{halt}|@option{init}]
@cindex reset
Perform a hard-reset. The optional parameter specifies what should happen after the reset.

@@ -812,15 +806,7 @@ Immediately halt the target (works only with certain configurations).
@cindex reset init
Immediately halt the target, and execute the reset script (works only with certain
configurations)
@item @b{run_and_halt}
@cindex reset run_and_halt
Let the target run for a certain amount of time, then request a halt.
@item @b{run_and_init}
@cindex reset run_and_init
Let the target run for a certain amount of time, then request a halt. Execute the
reset script once the target enters debug mode.
@end itemize
The runtime can be set using the @option{run_and_halt_time} command.
@end itemize

@subsection Memory access commands


+ 311
- 440
src/target/target.c
File diff suppressed because it is too large
View File


+ 0
- 3
src/target/target.h View File

@@ -62,8 +62,6 @@ enum target_reset_mode
RESET_RUN = 0, /* reset and let target run */
RESET_HALT = 1, /* reset and halt target out of reset */
RESET_INIT = 2, /* reset and halt target out of reset, then run init script */
RESET_RUN_AND_HALT = 3, /* reset and let target run, halt after n milliseconds */
RESET_RUN_AND_INIT = 4, /* reset and let target run, halt after n milliseconds, then run init script */
};

enum target_debug_reason
@@ -202,7 +200,6 @@ typedef struct target_s
{
target_type_t *type; /* target type definition (name, access functions) */
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. */
u32 working_area_virt; /* virtual address */


+ 1
- 1
src/target/target/at91r40008.cfg View File

@@ -11,7 +11,7 @@ jtag_device 4 0x1 0xf 0xe
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi
run_and_halt_time 0 30

target_script 0 reset event/at91r40008_reset.script



+ 1
- 1
src/target/target/at91sam9260.cfg View File

@@ -18,7 +18,7 @@ jtag_ntrst_delay 0
target arm926ejs little 0 arm926ejs

target_script 0 reset event/at91sam9260_reset.script
run_and_halt_time 0 30

#working area <target#> <address> <size> <backup|nobackup>
working_area 0 0x00300000 0x1000 backup


+ 1
- 1
src/target/target/at91sam9260minimal.cfg View File

@@ -16,5 +16,5 @@ jtag_ntrst_delay 200

#target <type> <endianess> <reset mode> <JTAG pos> <variant>
target arm926ejs little 0 arm926ejs
run_and_halt_time 0 30


+ 1
- 1
src/target/target/eir-sam7se512.cfg View File

@@ -6,7 +6,7 @@ reset_config srst_only srst_pulls_trst
jtag_device 4 0x1 0xf 0xe

target arm7tdmi little 0 arm7tdmi
run_and_halt_time 0 30

target_script 0 reset event/eir-sam7se512_reset.script



+ 1
- 1
src/target/target/hammer.cfg View File

@@ -18,7 +18,7 @@ arm7_9 dcc_downloads enable
target_script 0 reset event/hammer_reset.script

working_area 0 0x30800000 0x20000 nobackup
run_and_halt_time 0 1000

#flash configuration
#flash bank <driver> <base> <size> <chip_width> <bus_width> [driver_options ...]


+ 1
- 1
src/target/target/ipx42x.cfg View File

@@ -6,4 +6,4 @@ reset_config srst_only srst_pulls_trst
#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
jtag_device 7 0x1 0x7f 0x7e
target xscale big 0 IXP42x
run_and_halt_time 0 30

+ 1
- 1
src/target/target/lpc2129.cfg View File

@@ -5,7 +5,7 @@ reset_config trst_and_srst srst_pulls_trst
#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
jtag_device 4 0x1 0xf 0xe
target arm7tdmi little 0 arm7tdmi-s_r4
run_and_halt_time 0 30
working_area 0 0x40000000 0x4000 nobackup
#flash bank <driver> <base> <size> <chip_width> <bus_width>
flash bank lpc2000 0x0 0x40000 0 0 0 lpc2000_v1 14765 calc_checksum

+ 1
- 1
src/target/target/lpc2148.cfg View File

@@ -16,7 +16,7 @@ jtag_device 4 0x1 0xf 0xe
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi-s_r4
run_and_halt_time 0 30

target_script 0 reset event/lpc2148_reset.script



+ 1
- 1
src/target/target/lpc2294.cfg View File

@@ -8,7 +8,7 @@ jtag_device 4 0x1 0xf 0xe
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi-s_r4
run_and_halt_time 0 30

working_area 0 0x40000000 0x4000 nobackup



+ 1
- 1
src/target/target/mx31.cfg View File

@@ -12,5 +12,5 @@ jtag_device 5 0x1 0x0 0x1e

#target <type> <endianess> <reset mode>
target arm11 little 1
run_and_halt_time 0 0


+ 1
- 1
src/target/target/netx500.cfg View File

@@ -7,4 +7,4 @@ jtag_device 4 0x1 0xf 0xe
jtag_nsrst_delay 100
jtag_ntrst_delay 100
target arm926ejs little 0 arm926ejs
run_and_halt_time 0 500

+ 1
- 1
src/target/target/nslu2.cfg View File

@@ -7,7 +7,7 @@ jtag_device 7 0x1 0x7f 0x7e

# target configuration
target xscale big 0 ixp42x
run_and_halt_time 0 30

# maps to PXA internal RAM. If you are using a PXA255
# you must initialize SDRAM or leave this option off


+ 1
- 1
src/target/target/omap5912.cfg View File

@@ -12,7 +12,7 @@ jtag_device 8 0x0 0x0 0x0

target arm926ejs little 1 arm926ejs
target_script 0 reset event/omap5912_reset.script
run_and_halt_time 0 30

# omap5912 lcd frame buffer as working area
working_area 0 0x20000000 0x3e800 nobackup


+ 1
- 1
src/target/target/pic32mx.cfg View File

@@ -11,7 +11,7 @@ jtag_device 5 0x1 0x1 0x1e
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target mips_m4k little 0
run_and_halt_time 0 30

working_area 0 0xa0000000 16384 nobackup



+ 1
- 1
src/target/target/pxa255.cfg View File

@@ -3,7 +3,7 @@ jtag_nsrst_delay 200
jtag_ntrst_delay 200
target xscale little 0 pxa255
reset_config trst_and_srst
run_and_halt_time 0 30

target_script 0 reset event/pxa255_reset.script



+ 1
- 1
src/target/target/pxa270.cfg View File

@@ -14,7 +14,7 @@ target xscale little 0 pxa27x
# maps to PXA internal RAM. If you are using a PXA255
# you must initialize SDRAM or leave this option off
working_area 0 0x5c000000 0x10000 nobackup
run_and_halt_time 0 30
#flash bank <driver> <base> <size> <chip_width> <bus_width>
# works for P30 flash
flash bank cfi 0x00000000 0x1000000 2 4 0

+ 1
- 1
src/target/target/sam7s256.cfg View File

@@ -8,7 +8,7 @@ jtag_device 4 0x1 0xf 0xe
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi
run_and_halt_time 0 30

target_script 0 reset event/sam7s256_reset.script



+ 1
- 1
src/target/target/sam7x256.cfg View File

@@ -8,7 +8,7 @@ jtag_device 4 0x1 0xf 0xe
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi
run_and_halt_time 0 30

target_script 0 reset event/sam7x256_reset.script



+ 1
- 1
src/target/target/stm32.cfg View File

@@ -17,7 +17,7 @@ jtag_device 5 0x1 0x1 0x1e
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target cortex_m3 little 0
run_and_halt_time 0 30

working_area 0 0x20000000 16384 nobackup



+ 1
- 1
src/target/target/stm32stick.cfg View File

@@ -18,7 +18,7 @@ jtag_device 4 0x1 0xf 0xe
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target cortex_m3 little 0
run_and_halt_time 0 30

working_area 0 0x20000000 16384 nobackup



+ 1
- 1
src/target/target/str710.cfg View File

@@ -17,7 +17,7 @@ jtag_device 4 0x1 0xf 0xe
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi
run_and_halt_time 0 30

target_script 0 gdb_program_config event/str710_program.script



+ 1
- 1
src/target/target/str730.cfg View File

@@ -24,7 +24,7 @@ jtag_ntrst_delay 500

target arm7tdmi little 0 arm7tdmi

run_and_halt_time 0 30

target_script 0 gdb_program_config event/str730_program.script



+ 1
- 1
src/target/target/str750.cfg View File

@@ -25,7 +25,7 @@ jtag_ntrst_delay 500
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi

run_and_halt_time 0 30

target_script 0 gdb_program_config event/str750_program.script



+ 1
- 1
src/target/target/str912.cfg View File

@@ -37,7 +37,7 @@ jtag_device 5 0x1 0x1 0x1e
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm966e little 1 arm966e
run_and_halt_time 0 30


working_area 0 0x50000000 16384 nobackup


+ 1
- 1
src/target/target/str9comstick.cfg View File

@@ -13,7 +13,7 @@ jtag_device 8 0x1 0x1 0xfe
jtag_device 4 0x1 0xf 0xe
jtag_device 5 0x1 0x1 0x1e
target arm966e little 1 arm966e
run_and_halt_time 0 30
working_area 0 0x50000000 16384 nobackup
#flash bank <driver> <base> <size> <chip_width> <bus_width>
flash bank str9x 0x00000000 0x00080000 0 0 0

+ 1
- 1
src/target/target/wi-9c.cfg View File

@@ -18,7 +18,7 @@ jtag_ntrst_delay 0
target arm926ejs big 0 arm926ejs

target_script 0 reset event/wi-9c_reset.script
run_and_halt_time 0 30

#working area <target#> <address> <size> <backup|nobackup>
working_area 0 0x00000000 0x1000 backup


+ 0
- 1
src/target/target/xba_revA3.cfg View File

@@ -12,7 +12,6 @@ jtag_device 7 0x1 0x7f 0x7e
target xscale big 0 ixp42x
target_script 0 reset event/xba_revA3.script

run_and_halt_time 0 100

flash bank cfi 0x50000000 0x400000 2 2 0
working_area 0 0x20010000 0x8060 nobackup


+ 1
- 2
testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg View File

@@ -28,8 +28,7 @@ daemon_startup reset

#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little run_and_init 0 arm7tdmi
run_and_halt_time 0 30
target arm7tdmi little 0 arm7tdmi

target_script 0 reset .\prj\at91r40008_reset.script



+ 1
- 2
testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg View File

@@ -26,8 +26,7 @@ daemon_startup reset

#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little run_and_halt 0 arm7tdmi-s_r4
run_and_halt_time 0 30
target arm7tdmi little 0 arm7tdmi-s_r4

working_area 0 0x40000000 0x4000 nobackup



+ 1
- 2
testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg View File

@@ -26,8 +26,7 @@ daemon_startup reset

#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little run_and_halt 0 arm7tdmi-s_r4
run_and_halt_time 0 30
target arm7tdmi little 0 arm7tdmi-s_r4

working_area 0 0x40000000 0x4000 nobackup



+ 1
- 2
testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg View File

@@ -29,8 +29,7 @@ daemon_startup reset

#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little run_and_init 0 arm7tdmi
run_and_halt_time 0 30
target arm7tdmi little 0 arm7tdmi

target_script 0 reset .\prj\sam7s256_reset.script



+ 1
- 2
testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg View File

@@ -29,8 +29,7 @@ daemon_startup reset
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little run_and_init 0 arm7tdmi
run_and_halt_time 0 30
target arm7tdmi little 0 arm7tdmi
target_script 0 reset .\prj\sam7x256_reset.script


+ 1
- 2
testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg View File

@@ -26,8 +26,7 @@ daemon_startup reset

#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little run_and_halt 0 arm7tdmi
run_and_halt_time 0 30
target arm7tdmi little 0 arm7tdmi

working_area 0 0x2000C000 0x4000 nobackup



+ 1
- 2
testing/examples/STR710Test/prj/str710_jtagkey.cfg View File

@@ -26,8 +26,7 @@ daemon_startup reset

#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little run_and_halt 0 arm7tdmi
run_and_halt_time 0 30
target arm7tdmi little 0 arm7tdmi

target_script 0 gdb_program_config .\prj\str710_program.script



+ 1
- 2
testing/examples/STR912Test/prj/str912_jtagkey.cfg View File

@@ -31,8 +31,7 @@ daemon_startup reset

#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm966e little reset_halt 1 arm966e
run_and_halt_time 0 30
target arm966e little 1 arm966e

target_script 0 gdb_program_config .\prj\str912_program.script



Loading…
Cancel
Save