X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=README;h=7c1b5b247d3379a6d86a4f85f7378d9243836b37;hp=f60b67bf0a9699180b478ce7e606b67f73eb0074;hb=1163435e19f316a4a97fd33f1467f5c1684db654;hpb=ef30f22fd3355f668b23905f50bab4671f803ab1 diff --git a/README b/README index f60b67bf0a..7c1b5b247d 100644 --- a/README +++ b/README @@ -64,8 +64,8 @@ you can build the in-tree documentation. Installing OpenOCD ================== -On Linux, you may have permissions problems to address. The best -way to do this is to use the contrib/udev.rules file. It probably +On Linux, you may have permissions problems to address. The best way +to do this is to use the contrib/openocd.udev rules file. It probably belongs somewhere in /etc/udev/rules.d, but consult your operating system documentation to be sure. In particular, make sure that it matches the syntax used by your operating system's version of udev. @@ -74,13 +74,13 @@ A Note to OpenOCD Users ----------------------- If you would rather be working "with" OpenOCD rather than "on" it, your -operating system or interface supplier may provide binaries for you in a -convenient package. +operating system or JTAG interface supplier may provide binaries for +you in a convenient-enough package. -Such packages should be more stable than SVN trunk, where bleeding-edge +Such packages may be more stable than git mainline, where bleeding-edge development takes place. These "Packagers" produce binary releases of -OpenOCD after the developers produces new "stable" versions of the -source code. Previous versions of OpenOCD cannot be used to diagnosed +OpenOCD after the developers produces new "release" versions of the +source code. Previous versions of OpenOCD cannot be used to diagnose problems with the current release, so users are encouraged to keep in contact with their distribution package maintainers or interface vendors to ensure suitable upgrades appear regularly. @@ -205,7 +205,7 @@ options may be available there: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - NOTE: This option is *required* for SVN builds! + NOTE: This option is *required* for GIT builds! It should *not* be used to build a release. --enable-dummy Enable building the dummy JTAG port driver @@ -236,6 +236,8 @@ options may be available there: Programmer --enable-rlink Enable building support for the Raisonance RLink JTAG Programmer + --enable-ulink Enable building support for the Keil ULINK JTAG + Programmer --enable-usbprog Enable building support for the usbprog JTAG Programmer --enable-vsllink Enable building support for the Versaloon-Link JTAG @@ -255,8 +257,9 @@ options may be available there: --enable-ioutil Enable ioutil functions - useful for standalone OpenOCD implementations - --enable-httpd Enable builtin httpd server - useful for standalone - OpenOCD implementations + + --disable-doxygen-html Disable building Doxygen manual as HTML. + --enable-doxygen-pdf Enable building Doxygen manual as PDF. Miscellaneous Configure Options ------------------------------- @@ -314,7 +317,7 @@ The libftdi source code can be download from the following website: For both Linux and Windows, both libusb and libftdi must be built and installed. To use the newer FT2232H chips, supporting RTCK and USB high -speed (480 Mbps), you need libftdi version 0.16 or newer. Many Linux +speed (480 Mbps), use libftdi version 0.17 or newer. Many Linux distributions provide suitable packages for these libraries. For Windows, libftdi is supported with versions 0.14 and later. @@ -335,7 +338,7 @@ all operating systems used with OpenOCD. You may, however, build such copies for personal use. The FTDICHIP drivers come as either a (win32) ZIP file, or a (Linux) -TAR.GZ file. You must unpack them ``some where'' convient. As of this +TAR.GZ file. You must unpack them ``some where'' convenient. As of this writing FTDICHIP does not supply means to install these files "in an appropriate place." @@ -376,29 +379,42 @@ the following: Note that on Linux there is no good reason to use these FTDI binaries; they are no faster (on Linux) than libftdi, and cause licensing issues. -================================= -Obtaining OpenOCD From Subversion ---------------------------------- +========================== +Obtaining OpenOCD From GIT +========================== + +You can download the current GIT version with a GIT client of your +choice from the main repository: + + git://openocd.git.sourceforge.net/gitroot/openocd/openocd + +You may prefer to use a mirror: + + http://repo.or.cz/r/openocd.git + git://repo.or.cz/openocd.git + +Using the GIT command line client, you might use the following command +to set up a local copy of the current repository (make sure there is no +directory called "openocd" in the current directory): + + git clone git://openocd.git.sourceforge.net/gitroot/openocd/openocd -You can download the current SVN version with an SVN client of your -choice from the following repositories: +Then you can update that at your convenience using - svn://svn.berlios.de/openocd/trunk -or - http://svn.berlios.de/svnroot/repos/openocd/trunk + git pull -Using the SVN command line client, you can use the following command to -fetch the latest version (make sure there is no (non-svn) directory -called "openocd" in the current directory): +There is also a gitweb interface, which you can use either to browse +the repository or to download arbitrary snapshots using HTTP: - svn checkout svn://svn.berlios.de/openocd/trunk openocd + http://openocd.git.sourceforge.net/git/gitweb.cgi?p=openocd/openocd + http://repo.or.cz/w/openocd.git -If you prefer GIT based tools, the git-svn package works too: +Snapshots are compressed tarballs of the source tree, about 1.3 MBytes +each at this writing. - git svn clone -s svn://svn.berlios.de/openocd -Tips For Building From The Subversion Repository -************************************************ +Tips For Building From a GIT Repository +--------------------------------------- Building OpenOCD from a repository requires a recent version of the GNU autotools (autoconf >= 2.59 and automake >= 1.9).