[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-229-g7b76da5

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  7b76da57f471e77a24519c10927aab79890783a9 (commit)
       via  b05f8171c965bc3875df82f4469f952a13e2c504 (commit)
      from  6f03e92959008708ac6808df679f5729f6683166 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7b76da57f471e77a24519c10927aab79890783a9
Author: Øyvind Harboe <oyv...@zy...>
Date:   Wed May 12 13:45:04 2010 +0200

    zy1000.cfg: gdb connect will fail first time without gdb-attach
    
    gdb-attach does a reset init to make sure that the CFI probe
    will succeed upon first gdb connect.
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/tcl/board/zy1000.cfg b/tcl/board/zy1000.cfg
index ee7afcd..d2561e9 100644
--- a/tcl/board/zy1000.cfg
+++ b/tcl/board/zy1000.cfg
@@ -63,6 +63,11 @@ $_TARGETNAME configure -event reset-init {
 	mww 0x08020004 0
 }
 
+$_TARGETNAME configure -event gdb-attach {
+	# Without this gdb-attach will first time as probe will fail
+	reset init
+}
+
 # required for usable performance. Used for lots of
 # other things than flash programming.
 $_TARGETNAME configure -work-area-phys 0x00020000 -work-area-size 0x20000 -work-area-backup 0

commit b05f8171c965bc3875df82f4469f952a13e2c504
Author: Jun Ma <jm...@hf...>
Date:   Mon May 10 22:54:25 2010 +0800

    fix instruction refilling bug when using software breakpoints on a big-endian arm926ej-s system
    
    Signed-off-by: Jun Ma <syn...@gm...>
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 9f1bb2e..ac18b37 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -377,6 +377,7 @@ static int arm7_9_unset_breakpoint(struct target *target, struct breakpoint *bre
 			{
 				return retval;
 			}
+                        current_instr = target_buffer_get_u32(target, (uint8_t *)&current_instr);
 			if (current_instr == arm7_9->arm_bkpt)
 				if ((retval = target_write_memory(target, breakpoint->address, 4, 1, breakpoint->orig_instr)) != ERROR_OK)
 				{

-----------------------------------------------------------------------

Summary of changes:
 src/target/arm7_9_common.c |    1 +
 tcl/board/zy1000.cfg       |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository