updated syntax for post_reset scripts

git-svn-id: svn://svn.berlios.de/openocd/trunk@907 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index a8e435b3512bd8405cba3eb976700faa7566a87f..6e3ef161977199374cb9beecf896f8f5c48337e3 100644 (file)
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -19,7 +19,7 @@ noinst_HEADERS = target.h trace.h register.h armv4_5.h embeddedice.h etm.h arm7t
        arm_disassembler.h arm966e.h arm926ejs.h etb.h xscale.h arm_simulator.h image.h armv7m.h cortex_m3.h cortex_swjdp.h \
        etm_dummy.h oocd_trace.h target_request.h trace.h arm11.h mips32.h mips_m4k.h mips_ejtag.h mips32_pracc.h
 
-nobase_dist_pkglib_DATA = xscale/debug_handler.bin event/at91eb40a_reset.script target/at91eb40a.cfg \
+nobase_dist_pkglib_DATA = xscale/debug_handler.bin target/at91eb40a.cfg \
        event/at91r40008_reset.script event/sam7s256_reset.script event/sam7x256_reset.script \
        target/at91r40008.cfg target/lpc2148.cfg target/lpc2148_rclk.cfg target/lpc2148_2mhz.cfg target/lpc2294.cfg target/sam7s256.cfg \
        target/sam7x256.cfg target/str710.cfg target/str912.cfg target/nslu2.cfg target/pxa255_sst.cfg \

diff --git a/src/target/event/at91eb40a_reset.script b/src/target/event/at91eb40a_reset.script
deleted file mode 100644 (file)
index c6da2ef..0000000
--- a/src/target/event/at91eb40a_reset.script
+++ /dev/null
@@ -1,8 +0,0 @@
-# Reset script for AT91EB40a
-reg cpsr 0x000000D3            
-mww 0xFFE00020 0x1         
-mww 0xFFE00024 0x00000000  
-mww 0xFFE00000 0x01002539  
-mww 0xFFFFF124 0xFFFFFFFF  
-mww 0xffff0010 0x100
-mww 0xffff0034 0x100

diff --git a/src/target/target/at91eb40a.cfg b/src/target/target/at91eb40a.cfg
index 18cc04a8e3ab769182003dabeefce39f4d699506..27a1178c788f8c83278e5ed9098bae100d364880 100644 (file)
--- a/src/target/target/at91eb40a.cfg
+++ b/src/target/target/at91eb40a.cfg
@@ -35,7 +35,8 @@ arm7_9 force_hw_bkpts enable
 global reset_count
 set reset_count 0
 
-proc target_reset_0 {} {
+proc target_0_post_reset {} {
+       puts "Running reset init script for AT91EB40A"
        global reset_count
        # Reset script for AT91EB40a
        reg cpsr 0x000000D3
@@ -47,9 +48,11 @@ proc target_reset_0 {} {
        mww 0xffff0034 0x100
        set reset_count [expr $reset_count+1]
        echo "Testing reset $reset_count !"
+       
+       asdfs
 }
 
-proc target_pre_reset_0 {} {
+proc target_0_pre_reset {} {
        global reset_count
        set reset_count [expr $reset_count+1]
        echo "Testing pre_reset $reset_count !"