openocd-commit — OpenOCD commit maling list - read only

[Openocd-svn] r1225 - in trunk: doc src/flash

[ntfreak at B. <nt...@ma...>]

Author: ntfreak
Date: 2008-12-11 16:53:45 +0100 (Thu, 11 Dec 2008)
New Revision: 1225

Modified:
   trunk/doc/openocd.texi
   trunk/src/flash/flash.c
Log:
- typo with flash bank help command
- typo with flash erase_sector in texi

Modified: trunk/doc/openocd.texi
===================================================================
--- trunk/doc/openocd.texi	2008-12-10 17:47:16 UTC (rev 1224)
+++ trunk/doc/openocd.texi	2008-12-11 15:53:45 UTC (rev 1225)
@@ -1950,7 +1950,7 @@
 @cindex flash protect_check
 @*Check protection state of sectors in flash bank <num>. 
 @option{flash erase_sector} using the same syntax. 
-@subsection fash erase_sector
+@subsection flash erase_sector
 @b{flash erase_sector} <@var{num}> <@var{first}> <@var{last}>
 @cindex flash erase_sector
 @anchor{flash erase_sector}

Modified: trunk/src/flash/flash.c
===================================================================
--- trunk/src/flash/flash.c	2008-12-10 17:47:16 UTC (rev 1224)
+++ trunk/src/flash/flash.c	2008-12-11 15:53:45 UTC (rev 1225)
@@ -144,7 +144,7 @@
 {
 	flash_cmd = register_command(cmd_ctx, NULL, "flash", NULL, COMMAND_ANY, NULL);
 
-	register_command(cmd_ctx, flash_cmd, "bank", handle_flash_bank_command, COMMAND_CONFIG, "flash_bank <driver> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]");
+	register_command(cmd_ctx, flash_cmd, "bank", handle_flash_bank_command, COMMAND_CONFIG, "flash bank <driver> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]");
 	return ERROR_OK;
 }
 

[Openocd-svn] r1224 - trunk/src/helper

[ntfreak at B. <nt...@ma...>]

Author: ntfreak
Date: 2008-12-10 18:47:16 +0100 (Wed, 10 Dec 2008)
New Revision: 1224

Modified:
   trunk/src/helper/command.c
Log:
- fix illegal memory access in unregister_command function

Modified: trunk/src/helper/command.c
===================================================================
--- trunk/src/helper/command.c	2008-12-10 11:44:45 UTC (rev 1223)
+++ trunk/src/helper/command.c	2008-12-10 17:47:16 UTC (rev 1224)
@@ -289,8 +289,10 @@
 		return ERROR_INVALID_ARGUMENTS;
 
 	/* find command */
-	for (c = context->commands; c; c = c->next)
-	{
+	c = context->commands;
+	
+	while(NULL != c)
+	{		
 		if (strcmp(name, c->name) == 0)
 		{
 			/* unlink command */
@@ -300,26 +302,32 @@
 			}
 			else
 			{
+				/* first element in command list */
 				context->commands = c->next;
 			}
-
+			
 			/* unregister children */
-			if (c->children)
+			while(NULL != c->children)
 			{
-				for (c2 = c->children; c2; c2 = c2->next)
-				{
-					free(c2->name);
-					free(c2);
-				}
+				c2 = c->children;
+				c->children = c->children->next;
+				free(c2->name);
+				c2->name = NULL;
+				free(c2);
+				c2 = NULL;
 			}
-
+			
 			/* delete command */
 			free(c->name);
+			c->name = NULL;
 			free(c);
+			c = NULL;
+			return ERROR_OK;
 		}
-
+		
 		/* remember the last command for unlinking */
 		p = c;
+		c = c->next;
 	}
 
 	return ERROR_OK;

[Openocd-svn] r1223 - trunk/src/target/target

[<du...@ma...>]

Author: duane
Date: 2008-12-10 12:44:45 +0100 (Wed, 10 Dec 2008)
New Revision: 1223

Modified:
   trunk/src/target/target/imote2.cfg
   trunk/src/target/target/is5114.cfg
   trunk/src/target/target/samsung_s3c6410.cfg
Log:
More fixes thanks to Kees Jongenburger

Modified: trunk/src/target/target/imote2.cfg
===================================================================
--- trunk/src/target/target/imote2.cfg	2008-12-10 01:18:10 UTC (rev 1222)
+++ trunk/src/target/target/imote2.cfg	2008-12-10 11:44:45 UTC (rev 1223)
@@ -35,7 +35,7 @@
 jtag newtap $_CHIPNAME cpu -irlen 7 -ircapture 0x1 -irmask 0x7f -expected-id $_CPUTAPID
 
 set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
-target create $_TARGETNAME xscale -endian $_ENDIAN -chain-position $_TARGETNAME -varient pxa27x
+target create $_TARGETNAME xscale -endian $_ENDIAN -chain-position $_TARGETNAME -variant pxa27x
 $_TARGETNAME configure -work-area-virt 0x0x5c000000 -work-area-phys 0x0x5c000000 -work-area-size 0x10000 -work-area-backup 1
 # maps to PXA internal RAM. If you are using a PXA255
 # you must initialize SDRAM or leave this option off

Modified: trunk/src/target/target/is5114.cfg
===================================================================
--- trunk/src/target/target/is5114.cfg	2008-12-10 01:18:10 UTC (rev 1222)
+++ trunk/src/target/target/is5114.cfg	2008-12-10 11:44:45 UTC (rev 1223)
@@ -39,7 +39,7 @@
 
 #arm946e-s and 
 set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
-target create $_TARGETNAME arm966e -endian $_ENDIAN  -chain-position $_TARGETNAME  -varient arm966e
+target create $_TARGETNAME arm966e -endian $_ENDIAN  -chain-position $_TARGETNAME  -variant arm966e
 
 $_TARGETNAME configure -event reset-start { jtag_rclk 16 }
 $_TARGETNAME configure -event reset-init {

Modified: trunk/src/target/target/samsung_s3c6410.cfg
===================================================================
--- trunk/src/target/target/samsung_s3c6410.cfg	2008-12-10 01:18:10 UTC (rev 1222)
+++ trunk/src/target/target/samsung_s3c6410.cfg	2008-12-10 11:44:45 UTC (rev 1223)
@@ -23,14 +23,14 @@
    set _BSTAPID $BSTAPID
 } else {
   # force an error till we get a good number
-   set _BSTAPID 0xffffffff
+   set _BSTAPID 0x2b900f0f
 }
 
 if { [info exists CPUTAPID ] } {
    set _CPUTAPID $CPUTAPID
 } else {
   # force an error till we get a good number
-   set _CPUTAPID 0xffffffff
+   set _CPUTAPID 0x07b76f0f
 }
 
 #jtag scan chain
@@ -40,7 +40,7 @@
 jtag newtap $_CHIPNAME cpu     -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_CPUTAPID
 
 set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
-target create $_TARGETNAME arm11 -endian $_ENDIAN  -chain-position $_TARGETNAME -varient arm1176
+target create $_TARGETNAME arm11 -endian $_ENDIAN  -chain-position $_TARGETNAME -variant arm1176
 
 jtag_nsrst_delay 500
 jtag_ntrst_delay 500

[Openocd-svn] r1222 - trunk/src/target/target

[<du...@ma...>]

Author: duane
Date: 2008-12-10 02:18:10 +0100 (Wed, 10 Dec 2008)
New Revision: 1222

Added:
   trunk/src/target/target/samsung_s3c2410.cfg
Removed:
   trunk/src/target/target/samsung_s2c2410.cfg
Log:
Fix from Kees Jongenburger (Part Duex)

Deleted: trunk/src/target/target/samsung_s2c2410.cfg
===================================================================
--- trunk/src/target/target/samsung_s2c2410.cfg	2008-12-10 01:15:27 UTC (rev 1221)
+++ trunk/src/target/target/samsung_s2c2410.cfg	2008-12-10 01:18:10 UTC (rev 1222)
@@ -1,35 +0,0 @@
-# Found on the 'TinCanTools' Hammer board.
-
-if { [info exists CHIPNAME] } {	
-   set  _CHIPNAME $CHIPNAME    
-} else {	 
-   set  _CHIPNAME s3c2410
-}
-
-if { [info exists ENDIAN] } {	
-   set  _ENDIAN $ENDIAN    
-} else {	 
-  # This config file was defaulting to big endian..
-   set  _ENDIAN little
-}
-
-if { [info exists CPUTAPID] } {	
-   set  _CPUTAPID $CPUTAPID    
-} else {	 
-   set  _CPUTAPID 0xffffffff
-}
-
-#use combined on interfaces or targets that cannot set TRST/SRST separately
-reset_config trst_and_srst
-
-#jtag scan chain
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
-target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm920t
-
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x30800000 -work-area-size 0x20000 -work-area-backup 0
-
-# speed up memory downloads
-arm7_9 fast_memory_access enable
-arm7_9 dcc_downloads enable

Copied: trunk/src/target/target/samsung_s3c2410.cfg (from rev 1220, trunk/src/target/target/samsung_s2c2410.cfg)


Property changes on: trunk/src/target/target/samsung_s3c2410.cfg
___________________________________________________________________
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

[Openocd-svn] r1221 - trunk/src/target/board

[<du...@ma...>]

Author: duane
Date: 2008-12-10 02:15:27 +0100 (Wed, 10 Dec 2008)
New Revision: 1221

Modified:
   trunk/src/target/board/hammer.cfg
Log:
Fix from Kees Jongenburger

Modified: trunk/src/target/board/hammer.cfg
===================================================================
--- trunk/src/target/board/hammer.cfg	2008-12-08 11:23:04 UTC (rev 1220)
+++ trunk/src/target/board/hammer.cfg	2008-12-10 01:15:27 UTC (rev 1221)
@@ -1,7 +1,7 @@
 # Target Configuration for the TinCanTools S3C2410 Based Hammer Module
 # http://www.tincantools.com
 
-source [target/samsung_s3c2410.cfg]
+source [find target/samsung_s3c2410.cfg]
 
 $_TARGETNAME configure -event reset-init {
 	# Reset Script for the TinCanTools S3C2410 Based Hammer Module

[Openocd-svn] r1220 - trunk/src/target/target

[<du...@ma...>]

Author: duane
Date: 2008-12-08 12:23:04 +0100 (Mon, 08 Dec 2008)
New Revision: 1220

Modified:
   trunk/src/target/target/at91r40008.cfg
   trunk/src/target/target/at91sam9260.cfg
   trunk/src/target/target/at91sam9260minimal.cfg
Log:
Typos in config files found by Sergey Lapin

Modified: trunk/src/target/target/at91r40008.cfg
===================================================================
--- trunk/src/target/target/at91r40008.cfg	2008-12-06 13:13:02 UTC (rev 1219)
+++ trunk/src/target/target/at91r40008.cfg	2008-12-08 11:23:04 UTC (rev 1220)
@@ -29,7 +29,7 @@
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
-target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGENAME -variant arm7tdmi
+target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi
 
 
 $_TARGETNAME configure -event gdb-flash-erase-start {

Modified: trunk/src/target/target/at91sam9260.cfg
===================================================================
--- trunk/src/target/target/at91sam9260.cfg	2008-12-06 13:13:02 UTC (rev 1219)
+++ trunk/src/target/target/at91sam9260.cfg	2008-12-08 11:23:04 UTC (rev 1220)
@@ -9,7 +9,7 @@
 # Target configuration
 ######################
 
-$_TARGET_NAME configure -event reset-init {
+$_TARGETNAME configure -event reset-init {
 	# at reset chip runs at 32khz
 	jtag_khz 8
 	mww 0xfffffd08 0xa5000501         # RSTC_MR : enable user reset

Modified: trunk/src/target/target/at91sam9260minimal.cfg
===================================================================
--- trunk/src/target/target/at91sam9260minimal.cfg	2008-12-06 13:13:02 UTC (rev 1219)
+++ trunk/src/target/target/at91sam9260minimal.cfg	2008-12-08 11:23:04 UTC (rev 1220)
@@ -18,7 +18,7 @@
    set _CPUTAPID $CPUTAPID
 } else {
   # force an error till we get a good number
-   set _CPUTAPID 0xffffffff
+   set _CPUTAPID 0x0792603f
 }
 
 reset_config trst_and_srst
@@ -37,6 +37,6 @@
 target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
 
 # Internal sram1 memory
-$_TARGET_NAME configure -work-area-virt 0 -work-area-phys 0x00300000 -work-area-size 0x1000 -work-area-backup 1
+$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x00300000 -work-area-size 0x1000 -work-area-backup 1
 
 

[Openocd-svn] r1219 - trunk

[<du...@ma...>]

Author: duane
Date: 2008-12-06 14:13:02 +0100 (Sat, 06 Dec 2008)
New Revision: 1219

Modified:
   trunk/README
Log:
Test of commit email from duane

Modified: trunk/README
===================================================================
--- trunk/README	2008-12-06 10:48:46 UTC (rev 1218)
+++ trunk/README	2008-12-06 13:13:02 UTC (rev 1219)
@@ -1 +1,2 @@
 openocd.texi is the authoritative source of OpenOCD documentation
+

[Openocd-svn] r1218 - trunk/doc

[ntfreak at B. <nt...@ma...>]

Author: ntfreak
Date: 2008-12-06 11:48:46 +0100 (Sat, 06 Dec 2008)
New Revision: 1218

Modified:
   trunk/doc/openocd.texi
Log:
- update texi to describe str9xpec driver flow

Modified: trunk/doc/openocd.texi
===================================================================
--- trunk/doc/openocd.texi	2008-12-05 20:26:07 UTC (rev 1217)
+++ trunk/doc/openocd.texi	2008-12-06 10:48:46 UTC (rev 1218)
@@ -2080,7 +2080,7 @@
 @option{enable_turbo} <@var{num>.}
 
 Only use this driver for locking/unlocking the device or configuring the option bytes.
-Use the standard str9 driver for programming.
+Use the standard str9 driver for programming. @xref{STR9 specific commands}.
 
 @subsubsection stellaris (LM3Sxxx) options
 @cindex stellaris (LM3Sxxx) options
@@ -2140,6 +2140,7 @@
 
 @subsection STR9 specific commands
 @cindex STR9 specific commands
+@anchor{STR9 specific commands}
 These are flash specific commands when using the str9xpec driver.
 @itemize @bullet
 @item @b{str9xpec enable_turbo} <@var{num}>
@@ -2164,6 +2165,43 @@
 @*write str9 option bytes. 
 @end itemize
 
+Note: Before using the str9xpec driver here is some background info to help
+you better understand how the drivers works. Openocd has two flash drivers for
+the str9.
+@enumerate
+@item
+Standard driver @option{str9x} programmed via the str9 core. Normally used for
+flash programming as it is faster than the @option{str9xpec} driver.
+@item
+Direct programming @option{str9xpec} using the flash controller, this is
+ISC compilant (IEEE 1532) tap connected in series with the str9 core. The str9
+core does not need to be running to program using this flash driver. Typical use
+for this driver is locking/unlocking the target and programming the option bytes.
+@end enumerate
+
+Before we run any cmds using the @option{str9xpec} driver we must first disable
+the str9 core. This example assumes the @option{str9xpec} driver has been
+configured for flash bank 0.
+@example
+# assert srst, we do not want core running
+# while accessing str9xpec flash driver
+jtag_reset 0 1
+# turn off target polling
+poll off
+# disable str9 core
+str9xpec enable_turbo 0
+# read option bytes
+str9xpec options_read 0
+# re-enable str9 core
+str9xpec disable_turbo 0
+poll on
+reset halt
+@end example
+The above example will read the str9 option bytes.
+When performing a unlock remember that you will not be able to halt the str9 - it
+has been locked. Halting the core is not required for the @option{str9xpec} driver
+as mentioned above, just issue the cmds above manually or from a telnet prompt.
+
 @subsection STR9 configuration
 @cindex STR9 configuration
 @itemize @bullet