[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1155-gaf69f5ad0

[OpenOCD-Gerrit <ope...@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  af69f5ad0bb0cd38ad3163a8a3f3602d751c5d6d (commit)
      from  f00070edaf8fbe7e49c44845c440086d55288f28 (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 af69f5ad0bb0cd38ad3163a8a3f3602d751c5d6d
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Mon Mar 2 13:58:07 2020 +0100

    doc: fix OpenRISC target documentation
    
    OpenRISC correct target name is 'or1k' not 'openrisc'
    http://openocd.zylin.com/3096 introduced a conflict between 'openrisc'
    and 'ls1_sap' documentations
    
    Change-Id: Iedebbf9809300e1272334c5b63d0b31a41062282
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/5485
    Tested-by: jenkins
    Reviewed-by: Esben Haabendal <esb...@gm...>
    Reviewed-by: Oleksij Rempel <li...@re...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index e60d26939..b5692e653 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -4434,10 +4434,10 @@ The current implementation supports eSi-32xx cores.
 @item @code{mips_m4k} -- a MIPS core
 @item @code{xscale} -- this is actually an architecture,
 not a CPU type. It is based on the ARMv5 architecture.
-@item @code{openrisc} -- this is an OpenRISC 1000 core.
-The current implementation supports three JTAG TAP cores:
 @item @code{ls1_sap} -- this is the SAP on NXP LS102x CPUs,
 allowing access to physical memory addresses independently of CPU cores.
+@item @code{or1k} -- this is an OpenRISC 1000 core.
+The current implementation supports three JTAG TAP cores:
 @itemize @minus
 @item @code{OpenCores TAP} (See: @url{http://opencores.org/project@comma{}jtag})
 @item @code{Altera Virtual JTAG TAP} (See: @url{http://www.altera.com/literature/ug/ug_virtualjtag.pdf})

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

Summary of changes:
 doc/openocd.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository