[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-158-g804c0b2

[David B. <dbr...@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  804c0b2ad321247e50910511f691d987d8141081 (commit)
       via  5dcf7898f6144266c814306003c1e0a5ee067011 (commit)
      from  75cfda4cd1fe057f0557bd86963a71e530edd584 (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 804c0b2ad321247e50910511f691d987d8141081
Author: David Brownell <dbr...@us...>
Date:   Thu Jan 28 14:03:29 2010 -0800

    doc clarifications for server flags
    
    The "-f" is a shortcut for "-c" ... and providing any "-c" options
    means the "openocd.cfg" file isn't implicitly used.  Both the User's
    Guide and the manual page were weak on these points, which has led
    to some confusion.
    
    Also update the manual page to include highlights of the search path
    mechanism, including the facts that it exists and that "-s" adds to it.
    Stop saying only the current directory is involved; the OpenOCD
    script library is quite significant.
    
    (Missing: complete manpage coverage of the search path, including a
    FILES section listing all components and saying where the script
    library is found.)
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/doc/openocd.1 b/doc/openocd.1
index 68b6957..3720d42 100644
--- a/doc/openocd.1
+++ b/doc/openocd.1
@@ -22,19 +22,23 @@ please check the \fIopenocd\fR info page for the complete list.
 .SH "OPTIONS"
 .TP
 .B "\-f, \-\-file <filename>"
-Use configuration file
-.BR <filename> .
+This is a shortcut for a \fB\-c "[script \fI<filename>\fB]"\fR
+command, using a search path to load the configuration file
+.IR <filename> .
 In order to specify multiple config files, you can use multiple
 .B \-\-file
-arguments. If this option is omitted, the config file
+arguments. If no such \fB\-c\fR
+options are included, the first config file
 .B openocd.cfg
-in the current working directory will be used.
+in the search path will be used.
 .TP
 .B "\-s, \-\-search <dirname>"
-Search for config files and scripts in the directory
-.BR <dirname> .
-If this option is omitted, OpenOCD searches for config files and scripts
-in the current directory.
+Add
+.I <dirname>
+to the search path used for config files and scripts.
+The search path begins with the current directory,
+then includes these additional directories before other
+components such as the standard OpenOCD script libraries.
 .TP
 .B "\-d, \-\-debug <debuglevel>"
 Set debug level. Possible values are:
@@ -52,13 +56,17 @@ The default level is
 .TP
 .B "\-l, \-\-log_output <filename>"
 Redirect log output to the file
-.BR <filename> .
+.IR <filename> .
 Per default the log output is printed on
 .BR stderr .
 .TP
 .B "\-c, \-\-command <cmd>"
-Run the command
-.BR <cmd> .
+Add the command
+.I <cmd>
+to a list of commands executed on server startup.
+Note that you will need to explicitly invoke
+.I init
+if the command requires access to a target or flash.
 .TP
 .B "\-p, \-\-pipe"
 Use pipes when talking to gdb.
diff --git a/doc/openocd.texi b/doc/openocd.texi
index ee5c723..38fa92f 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -513,9 +513,10 @@ bash$ openocd --help
 --pipe       | -p       use pipes when talking to gdb
 @end verbatim
 
-By default OpenOCD reads the configuration file @file{openocd.cfg}.
-To specify a different (or multiple)
-configuration file, you can use the @option{-f} option. For example:
+If you don't give any @option{-f} or @option{-c} options,
+OpenOCD tries to read the configuration file @file{openocd.cfg}.
+To specify one or more different
+configuration files, use @option{-f} options. For example:
 
 @example
 openocd -f config1.cfg -f config2.cfg -f config3.cfg

commit 5dcf7898f6144266c814306003c1e0a5ee067011
Author: David Brownell <dbr...@us...>
Date:   Thu Jan 28 13:58:20 2010 -0800

    ARM: reference DPM defn from v6/v7 arch spec
    
    The term "DPM" is probably not well known ("Device Power Management"?),
    so identify its source in the current ARM architecture specification.
    It's relevant to ARMv6, ARMv7-A, and ARMv7-R ... but not "M" profiles.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index 4bd22ff..3c18e63 100644
--- a/src/target/arm_dpm.c
+++ b/src/target/arm_dpm.c
@@ -35,6 +35,12 @@
  * Implements various ARM DPM operations using architectural debug registers.
  * These routines layer over core-specific communication methods to cope with
  * implementation differences between cores like ARM1136 and Cortex-A8.
+ *
+ * The "Debug Programmers' Model" (DPM) for ARMv6 and ARMv7 is defined by
+ * Part C (Debug Architecture) of the ARM Architecture Reference Manual,
+ * ARMv7-A and ARMv7-R edition (ARM DDI 0406B).  In OpenOCD, DPM operations
+ * are abstracted through internal programming interfaces to share code and
+ * to minimize needless differences in debug behavior between cores.
  */
 
 /*----------------------------------------------------------------------*/

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

Summary of changes:
 doc/openocd.1        |   30 +++++++++++++++++++-----------
 doc/openocd.texi     |    7 ++++---
 src/target/arm_dpm.c |    6 ++++++
 3 files changed, 29 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository