[Openocd-svn] r2720 - in trunk: doc src/jtag src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-09-17 13:23:41 +0200 (Thu, 17 Sep 2009)
New Revision: 2720

Modified:
   trunk/doc/openocd.texi
   trunk/src/jtag/jtag.h
   trunk/src/jtag/tcl.c
   trunk/src/target/arm7_9_common.c
Log:
srst_gates_jtag option. at91sam9260 needs retesting, and possibly srst_gates_jtag added to reset_config. Could i.MX27 be a case where srst does not pull trst, but really srst gates jtag clock?

Modified: trunk/doc/openocd.texi
===================================================================
--- trunk/doc/openocd.texi	2009-09-17 08:02:43 UTC (rev 2719)
+++ trunk/doc/openocd.texi	2009-09-17 11:23:41 UTC (rev 2720)
@@ -2018,6 +2018,10 @@
 @option{combined} implies both @option{srst_pulls_trst} and
 @option{trst_pulls_srst}.
 
+@option{srst_gates_jtag} indicates that asserting SRST gates the
+JTAG clock. This means that no communication can happen on JTAG
+while SRST is asserted. 
+
 The optional @var{trst_type} and @var{srst_type} parameters allow the
 driver mode of each reset line to be specified.  These values only affect
 JTAG interfaces with support for different driver modes, like the Amontec

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-09-17 08:02:43 UTC (rev 2719)
+++ trunk/src/jtag/jtag.h	2009-09-17 11:23:41 UTC (rev 2720)
@@ -277,6 +277,7 @@
 	RESET_TRST_PULLS_SRST = 0x8,
 	RESET_TRST_OPEN_DRAIN = 0x10,
 	RESET_SRST_PUSH_PULL  = 0x20,
+	RESET_SRST_GATES_JTAG = 0x40,
 };
 
 enum reset_types jtag_get_reset_config(void);

Modified: trunk/src/jtag/tcl.c
===================================================================
--- trunk/src/jtag/tcl.c	2009-09-17 08:02:43 UTC (rev 2719)
+++ trunk/src/jtag/tcl.c	2009-09-17 11:23:41 UTC (rev 2720)
@@ -845,6 +845,14 @@
 		int tmp = 0;
 		int m;
 
+		m = RESET_SRST_GATES_JTAG;
+		tmp = 0;
+		if (strcmp(*args, "srst_gates_jtag") == 0)
+		{
+			tmp = RESET_SRST_GATES_JTAG;
+			goto next;
+		}
+
 		/* signals */
 		m = RESET_HAS_TRST | RESET_HAS_SRST;
 		if (strcmp(*args, "none") == 0)

Modified: trunk/src/target/arm7_9_common.c
===================================================================
--- trunk/src/target/arm7_9_common.c	2009-09-17 08:02:43 UTC (rev 2719)
+++ trunk/src/target/arm7_9_common.c	2009-09-17 11:23:41 UTC (rev 2720)
@@ -1021,6 +1021,17 @@
 		return ERROR_FAIL;
 	}
 
+	/* at this point trst has been asserted/deasserted once. We want to
+	 * program embedded ice while SRST is asserted, but some CPUs gate
+	 * the JTAG clock while SRST is asserted
+	 */
+	bool srst_asserted = false;
+	if (((jtag_reset_config & RESET_SRST_PULLS_TRST) == 0) && ((jtag_reset_config & RESET_SRST_GATES_JTAG) == 0))
+	{
+		jtag_add_reset(0, 1);
+		srst_asserted = true;
+	}
+
 	if (target->reset_halt)
 	{
 		/*
@@ -1053,7 +1064,7 @@
 	if (jtag_reset_config & RESET_SRST_PULLS_TRST)
 	{
 		jtag_add_reset(1, 1);
-	} else
+	} else if (!srst_asserted)
 	{
 		jtag_add_reset(0, 1);
 	}