Skip to content

Commit 3bed4c8

Browse files
authored
Merge pull request riscv-collab#1132 from en-sc/en-sc/from_upstream
Merge up to fd7b66c from upstream
2 parents 90162b3 + 4c45762 commit 3bed4c8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1200
-868
lines changed

README

Lines changed: 60 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
Welcome to OpenOCD!
2-
===================
1+
# Welcome to OpenOCD!
32

43
OpenOCD provides on-chip programming and debugging support with a
54
layered architecture of JTAG interface and TAP support including:
@@ -26,33 +25,33 @@ This README file contains an overview of the following topics:
2625
- packaging tips.
2726

2827

29-
============================
30-
Quickstart for the impatient
31-
============================
28+
# Quickstart for the impatient
3229

3330
If you have a popular board then just start OpenOCD with its config,
3431
e.g.:
3532

36-
openocd -f board/stm32f4discovery.cfg
33+
openocd -f board/stm32f4discovery.cfg
3734

3835
If you are connecting a particular adapter with some specific target,
3936
you need to source both the jtag interface and the target configs,
4037
e.g.:
4138

42-
openocd -f interface/ftdi/jtagkey2.cfg -c "transport select jtag" \
43-
-f target/ti_calypso.cfg
39+
```
40+
openocd -f interface/ftdi/jtagkey2.cfg -c "transport select jtag" \
41+
-f target/ti_calypso.cfg
42+
```
4443

45-
openocd -f interface/stlink.cfg -c "transport select hla_swd" \
46-
-f target/stm32l0.cfg
44+
```
45+
openocd -f interface/stlink.cfg -c "transport select hla_swd" \
46+
-f target/stm32l0.cfg
47+
```
4748

4849
After OpenOCD startup, connect GDB with
4950

50-
(gdb) target extended-remote localhost:3333
51+
(gdb) target extended-remote localhost:3333
5152

5253

53-
=====================
54-
OpenOCD Documentation
55-
=====================
54+
# OpenOCD Documentation
5655

5756
In addition to the in-tree documentation, the latest manuals may be
5857
viewed online at the following URLs:
@@ -71,35 +70,34 @@ by subscribing to the OpenOCD developer mailing list:
7170

7271
7372

74-
Building the OpenOCD Documentation
75-
----------------------------------
73+
## Building the OpenOCD Documentation
7674

7775
By default the OpenOCD build process prepares documentation in the
78-
"Info format" and installs it the standard way, so that "info openocd"
76+
"Info format" and installs it the standard way, so that `info openocd`
7977
can access it.
8078

8179
Additionally, the OpenOCD User's Guide can be produced in the
8280
following different formats:
8381

84-
# If PDFVIEWER is set, this creates and views the PDF User Guide.
85-
make pdf && ${PDFVIEWER} doc/openocd.pdf
82+
If `PDFVIEWER` is set, this creates and views the PDF User Guide.
8683

87-
# If HTMLVIEWER is set, this creates and views the HTML User Guide.
88-
make html && ${HTMLVIEWER} doc/openocd.html/index.html
84+
make pdf && ${PDFVIEWER} doc/openocd.pdf
85+
86+
If `HTMLVIEWER` is set, this creates and views the HTML User Guide.
87+
88+
make html && ${HTMLVIEWER} doc/openocd.html/index.html
8989

9090
The OpenOCD Developer Manual contains information about the internal
9191
architecture and other details about the code:
9292

93-
# NB! make sure doxygen is installed, type doxygen --version
94-
make doxygen && ${HTMLVIEWER} doxygen/index.html
93+
Note: make sure doxygen is installed, type doxygen --version
9594

95+
make doxygen && ${HTMLVIEWER} doxygen/index.html
9696

97-
==================
98-
Supported hardware
99-
==================
10097

101-
JTAG adapters
102-
-------------
98+
# Supported hardware
99+
100+
## JTAG adapters
103101

104102
AM335x, ARM-JTAG-EW, ARM-USB-OCD, ARM-USB-TINY, AT91RM9200, axm0432, BCM2835,
105103
Bus Blaster, Buspirate, Cadence DPI, Cadence vdebug, Chameleon, CMSIS-DAP,
@@ -116,17 +114,15 @@ sysfsgpio, Tigard, TI XDS110, TUMPA, Turtelizer, ULINK, USB-A9260, USB-Blaster,
116114
USB-JTAG, USBprog, VPACLink, VSLLink, Wiggler, XDS100v2, Xilinx XVC/PCIe,
117115
Xverve.
118116

119-
Debug targets
120-
-------------
117+
## Debug targets
121118

122119
ARM: AArch64, ARM11, ARM7, ARM9, Cortex-A/R (v7-A/R), Cortex-M (ARMv{6/7/8}-M),
123120
FA526, Feroceon/Dragonite, XScale.
124121
ARCv2, AVR32, DSP563xx, DSP5680xx, EnSilica eSi-RISC, EJTAG (MIPS32, MIPS64),
125122
ESP32, ESP32-S2, ESP32-S3, Intel Quark, LS102x-SAP, RISC-V, ST STM8,
126123
Xtensa.
127124

128-
Flash drivers
129-
-------------
125+
## Flash drivers
130126

131127
ADUC702x, AT91SAM, AT91SAM9 (NAND), ATH79, ATmega128RFA1, Atmel SAM, AVR, CFI,
132128
DSP5680xx, EFM32, EM357, eSi-RISC, eSi-TSMC, EZR32HG, FM3, FM4, Freedom E SPI,
@@ -140,12 +136,9 @@ TI CC13xx, TI CC26xx, TI CC32xx, TI MSP432, Winner Micro w600, Xilinx XCF,
140136
XMC1xxx, XMC4xxx.
141137

142138

143-
==================
144-
Installing OpenOCD
145-
==================
139+
# Installing OpenOCD
146140

147-
A Note to OpenOCD Users
148-
-----------------------
141+
## A Note to OpenOCD Users
149142

150143
If you would rather be working "with" OpenOCD rather than "on" it, your
151144
operating system or JTAG interface supplier may provide binaries for
@@ -164,8 +157,7 @@ Users of these binary versions of OpenOCD must contact their Packager to
164157
ask for support or newer versions of the binaries; the OpenOCD
165158
developers do not support packages directly.
166159

167-
A Note to OpenOCD Packagers
168-
---------------------------
160+
## A Note to OpenOCD Packagers
169161

170162
You are a PACKAGER of OpenOCD if you:
171163

@@ -192,20 +184,17 @@ suggestions:
192184
- Use "ftdi" interface adapter driver for the FTDI-based devices.
193185

194186

195-
================
196-
Building OpenOCD
197-
================
187+
# Building OpenOCD
198188

199-
The INSTALL file contains generic instructions for running 'configure'
189+
The INSTALL file contains generic instructions for running `configure`
200190
and compiling the OpenOCD source code. That file is provided by
201191
default for all GNU autotools packages. If you are not familiar with
202192
the GNU autotools, then you should read those instructions first.
203193

204194
The remainder of this document tries to provide some instructions for
205195
those looking for a quick-install.
206196

207-
OpenOCD Dependencies
208-
--------------------
197+
## OpenOCD Dependencies
209198

210199
GCC or Clang is currently required to build OpenOCD. The developers
211200
have begun to enforce strict code warnings (-Wall, -Werror, -Wextra,
@@ -250,8 +239,7 @@ Optional development script checkpatch needs:
250239
- python
251240
- python-ply
252241

253-
Permissions delegation
254-
----------------------
242+
## Permissions delegation
255243

256244
Running OpenOCD with root/administrative permissions is strongly
257245
discouraged for security reasons.
@@ -268,89 +256,81 @@ For parport adapters on Windows you need to run install_giveio.bat
268256
(it's also possible to use "ioperm" with Cygwin instead) to give
269257
ordinary users permissions for accessing the "LPT" registers directly.
270258

271-
Compiling OpenOCD
272-
-----------------
259+
## Compiling OpenOCD
273260

274261
To build OpenOCD, use the following sequence of commands:
275262

276-
./bootstrap (when building from the git repository)
277-
./configure [options]
278-
make
279-
sudo make install
263+
./bootstrap
264+
./configure [options]
265+
make
266+
sudo make install
280267

281-
The 'configure' step generates the Makefiles required to build
268+
The `bootstrap` command is only necessary when building from the Git repository. The `configure` step generates the Makefiles required to build
282269
OpenOCD, usually with one or more options provided to it. The first
283270
'make' step will build OpenOCD and place the final executable in
284-
'./src/'. The final (optional) step, ``make install'', places all of
271+
'./src/'. The final (optional) step, `make install`, places all of
285272
the files in the required location.
286273

287-
To see the list of all the supported options, run
288-
./configure --help
274+
To see the list of all the supported options, run `./configure --help`
289275

290-
Cross-compiling Options
291-
-----------------------
276+
## Cross-compiling Options
292277

293278
Cross-compiling is supported the standard autotools way, you just need
294279
to specify the cross-compiling target triplet in the --host option,
295280
e.g. for cross-building for Windows 32-bit with MinGW on Debian:
296281

297-
./configure --host=i686-w64-mingw32 [options]
282+
./configure --host=i686-w64-mingw32 [options]
298283

299284
To make pkg-config work nicely for cross-compiling, you might need an
300285
additional wrapper script as described at
301286

302-
https://autotools.io/pkgconfig/cross-compiling.html
287+
https://autotools.io/pkgconfig/cross-compiling.html
303288

304289
This is needed to tell pkg-config where to look for the target
305290
libraries that OpenOCD depends on. Alternatively, you can specify
306-
*_CFLAGS and *_LIBS environment variables directly, see "./configure
307-
--help" for the details.
291+
`*_CFLAGS` and `*_LIBS` environment variables directly, see `./configure
292+
--help` for the details.
308293

309294
For a more or less complete script that does all this for you, see
310295

311-
contrib/cross-build.sh
296+
contrib/cross-build.sh
312297

313-
Parallel Port Dongles
314-
---------------------
298+
## Parallel Port Dongles
315299

316300
If you want to access the parallel port using the PPDEV interface you
317-
have to specify both --enable-parport AND --enable-parport-ppdev, since
301+
have to specify both `--enable-parport` and `--enable-parport-ppdev`, since
318302
the later option is an option to the parport driver.
319303

320-
The same is true for the --enable-parport-giveio option, you have to
321-
use both the --enable-parport AND the --enable-parport-giveio option
304+
The same is true for the `--enable-parport-giveio` option, you have to
305+
use both the `--enable-parport` and the `--enable-parport-giveio` option
322306
if you want to use giveio instead of ioperm parallel port access
323307
method.
324308

325309

326-
==========================
327-
Obtaining OpenOCD From GIT
328-
==========================
310+
# Obtaining OpenOCD From GIT
329311

330312
You can download the current GIT version with a GIT client of your
331313
choice from the main repository:
332314

333-
git://git.code.sf.net/p/openocd/code
315+
git://git.code.sf.net/p/openocd/code
334316

335317
You may prefer to use a mirror:
336318

337-
http://repo.or.cz/r/openocd.git
338-
git://repo.or.cz/openocd.git
319+
http://repo.or.cz/r/openocd.git
320+
git://repo.or.cz/openocd.git
339321

340322
Using the GIT command line client, you might use the following command
341323
to set up a local copy of the current repository (make sure there is no
342324
directory called "openocd" in the current directory):
343325

344-
git clone git://git.code.sf.net/p/openocd/code openocd
345-
346-
Then you can update that at your convenience using
326+
git clone git://git.code.sf.net/p/openocd/code openocd
347327

348-
git pull
328+
Then you can update that at your convenience using `git pull`.
349329

350330
There is also a gitweb interface, which you can use either to browse
351331
the repository or to download arbitrary snapshots using HTTP:
352332

353-
http://repo.or.cz/w/openocd.git
333+
http://repo.or.cz/w/openocd.git
354334

355335
Snapshots are compressed tarballs of the source tree, about 1.3 MBytes
356336
each at this writing.

0 commit comments

Comments
 (0)