zy1000: reconfigure FPGA upon reset instead of just the CPU

[fw/openocd] / tcl / target / lpc2148.cfg

diff --git a/tcl/target/lpc2148.cfg b/tcl/target/lpc2148.cfg
index 0410d3665e425f45782995b8331b82331f5cb46a..cf6287c60eb1e3d256d1e1e6ffc19a2871dd8caa 100644 (file)
--- a/tcl/target/lpc2148.cfg
+++ b/tcl/target/lpc2148.cfg
@@ -1,9 +1,9 @@
-# Use RCLK. If RCLK is not available fall back to 500kHz. 
-# 
+# Use RCLK. If RCLK is not available fall back to 500kHz.
+#
 # Depending on cabling you might be able to eek this up to 2000kHz.
 jtag_rclk 500
 
-if { [info exists CHIPNAME] } {        
+if { [info exists CHIPNAME] } {
    set _CHIPNAME $CHIPNAME
 } else {
    set _CHIPNAME lpc2148
@@ -35,11 +35,11 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CP
 set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4
 
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
+$_TARGETNAME configure -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
 
 $_TARGETNAME configure -event reset-init {
-       # Force target into ARM state.
-       soft_reset_halt
+       # Force target into ARM state
+       arm core_state arm
 
        # Do not remap 0x0000-0x0020 to anything but the flash (i.e. select
        # "User Flash Mode" where interrupt vectors are _not_ remapped,
@@ -52,4 +52,5 @@ $_TARGETNAME configure -event reset-init {
 }
 
 # flash bank lpc2000 <base> <size> 0 0 <target#> <variant> <clock> [calc_checksum]
-flash bank lpc2000 0x0 0x7d000 0 0 0 lpc2000_v2 14765 calc_checksum
+set _FLASHNAME $_CHIPNAME.flash
+flash bank $_FLASHNAME lpc2000 0x0 0x7d000 0 0 $_TARGETNAME lpc2000_v2 14765 calc_checksum