Merge pull request #62 from riscv/riscv64

Merge mainline OpenOCD

Author: palmer-dabbelt

.gitignore

@@ -52,8 +52,8 @@ doc/openocd.pg
 doc/openocd.toc
 doc/openocd.tp
 doc/openocd.vr
-doc/texinfo.tex
 doc/version.texi
+texinfo.tex
 src/openocd
 src/openocd.exe
 

Makefile.am

@@ -5,22 +5,45 @@ AUTOMAKE_OPTIONS = gnu 1.6
 # make sure we pass the correct jimtcl flags to distcheck
 DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
 
+# do not run Jim Tcl tests (esp. during distcheck)
+check-recursive:
+	@true
+
 nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/dcc_stdio.c \
 	contrib/libdcc/dcc_stdio.h \
 	contrib/libdcc/example.c \
 	contrib/libdcc/README \
-	contrib/99-openocd.rules
+	contrib/60-openocd.rules
 
-if INTERNAL_JIMTCL
-SUBDIRS = jimtcl
-else
 SUBDIRS =
+DIST_SUBDIRS =
+bin_PROGRAMS =
+noinst_LTLIBRARIES =
+info_TEXINFOS =
+dist_man_MANS =
+EXTRA_DIST =
+
+if INTERNAL_JIMTCL
+SUBDIRS += jimtcl
+DIST_SUBDIRS += jimtcl
 endif
 
-SUBDIRS += src doc
+# common flags used in openocd build
+AM_CFLAGS = $(GCC_WARNINGS)
+
+AM_CPPFLAGS = $(HOST_CPPFLAGS)\
+			  -I$(top_srcdir)/src \
+			  -I$(top_builddir)/src \
+			  -I$(top_srcdir)/src/helper \
+			  -DPKGDATADIR=\"$(pkgdatadir)\" \
+			  -DBINDIR=\"$(bindir)\"
 
-EXTRA_DIST = \
+if INTERNAL_JIMTCL
+AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
+			   -I$(top_builddir)/jimtcl
+endif
+EXTRA_DIST += \
 	BUGS \
 	HACKING \
 	NEWTAPS \
@@ -96,17 +119,26 @@ distclean-local:
 
 DISTCLEANFILES = doxygen.log
 
+METASOURCES = AUTO
+
+BUILT_SOURCES =
+CLEANFILES =
+
 MAINTAINERCLEANFILES = \
-	$(srcdir)/INSTALL \
-	$(srcdir)/configure \
-	$(srcdir)/Makefile.in \
-	$(srcdir)/depcomp \
-	$(srcdir)/config.guess \
-	$(srcdir)/config.sub \
-	$(srcdir)/config.h.in \
-	$(srcdir)/config.h.in~ \
-	$(srcdir)/compile \
-	$(srcdir)/ltmain.sh \
-	$(srcdir)/missing \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/install-sh
+	%D%/INSTALL \
+	%D%/configure \
+	%D%/Makefile.in \
+	%D%/depcomp \
+	%D%/config.guess \
+	%D%/config.sub \
+	%D%/config.h.in \
+	%D%/config.h.in~ \
+	%D%/compile \
+	%D%/ltmain.sh \
+	%D%/missing \
+	%D%/aclocal.m4 \
+	%D%/install-sh \
+	%D%/texinfo.tex
+
+include src/Makefile.am
+include doc/Makefile.am

NEWS-0.10.0

@@ -0,0 +1,155 @@
+This file includes highlights of the changes made in the OpenOCD
+source archive release.
+
+JTAG Layer:
+	* New driver for J-Link adapters based on libjaylink
+          (including support for FPGA configuration, SWO and EMUCOM)
+	* FTDI improvements to work at 30MHz clock
+	* BCM2835 native driver SWD and Raspberry Pi2 support
+	* BCM2835 is set to 4ma drive, slow slew rate
+	* ixo-usb-jtag (emulation of an Altera Bus Blaster I on
+          Cypress FX2 IC) support
+	* JTAG pass-through mode for CMSIS-DAP (including support for
+          FPGA configuration)
+	* OpenJTAG support for Cypress CY7C65215
+	* connect_assert_srst support for SWD
+	* Xilinx Virtex-II Series7 bitstream loading support
+	* Use JEP106 data to decode IDs
+	* Deprecated "ft2232" driver removed (use "ftdi" instead)
+	* GPL-incompatible FTDI D2XX library support dropped (Presto,
+          OpenJTAG and USB-Blaster I are using libftdi only now)
+	* ZY1000 support dropped (unmaintained since long)
+	* oocd_trace support dropped
+
+Boundary Scan:
+
+Target Layer:
+	* ARMv7-A, Cortex-M, Cortex-A/R important fixes and
+          improvements (allowing e.g. simultaneous debugging of A8 and
+          M3 cores, JTAG WAIT support etc.)
+	* ARM Cortex-A,R allow interrupt disable during single-step
+          (maskisr command)
+	* Semihosting support for ARMv7-A
+	* ARM Cortex-M7 support
+	* Intel Quark mcu D2000 support
+	* Freescale LS102x SAP support
+	* ThreadX RTOS support on ARM926E-JS
+	* Cortex-M RTOS stack alignment fixes
+	* FreeRTOS FPU support
+	* uC/OS-III RTOS support
+	* bridging semihosting to GDB's File-I/O support
+	* -defer-examine option added to target create command
+	* verify_image_checksum command added
+
+Flash Layer:
+	* Atmel SAM4S, SAM4N, SAM4C support
+	* Atmel SAMV, SAMS, SAME (Cortex-M7) support
+	* Atmel AT91SAMD handle reset run/halt in DSU, other fixes
+	* Atmel AT91SAML21, SAML22, SAMC20/SAMC21, SAMD09 support
+	* ST STM32F4x support
+	* ST STM32F74x/76x/77x, STM32L4 support
+	* ST STM32L0 categories 1, 2 and 5 support
+	* Kinetis K02, K21, K22, K24, K26, K63, K64, K66 support
+	* Kinetis KE, KVx, K8x families support
+	* Kinetis FlexNVM handling
+	* Kinetis flash protection, security, mass_erase improvements
+	* Infineon XMC4xxx family support
+	* Infineon XMC1000 flash driver
+	* Energy Micro EFM32 Happy Gecko support
+	* Energy Micro EFM32 debug interface lock support
+	* Analog Devices ADuCM360 support
+	* Unified Nuvoton NuMicro flash driver
+	* NIIET K1921VK01T (Cortex-M4) support
+	* Nordic Semiconductor nRF51 improvements
+	* Spansion FM4 flash (including MB9BFx64/x65, S6E2DH) driver
+	* Ambiq Micro Apollo flash driver
+	* PIC32MX new device IDs, 17x/27x flash support
+	* read_bank() and verify_bank() NOR flash internal API to
+          allow reading (and verifying) non-memory-mapped devices
+	* JTAGSPI driver to access SPI NOR flashes via a trivial
+          FPGA proxy
+	* Milandr read/verify for Info memory support
+	* Various discrete SPI NOR flashes support
+	* CFI 16-bit flash reversed endianness support
+
+Board, Target, and Interface Configuration Scripts:
+	* Digilent JTAG-HS2, JTAG-HS3 interfaces configs
+	* FTDI UM232H module as JTAG interface config
+	* 100ask's OpenJTAG interface config
+	* MBFTDI interface config
+	* XDS100v3 interface config
+	* Freescale Vybrid VF6xx target config
+	* EmCraft VF6 SOM and baseboard configs
+	* Freescale SabreSD board config
+	* Freescale VF65GS10 tower board config
+	* Pipistrello Xilinx Spartan6 LX45 FPGA board config
+	* miniSpartan6+ board config
+	* Xilinx Kintex7 Development board config
+	* Parallella-I board config
+	* Digilent Atlys and Analog Discovery board configs
+	* Numato Opsis board config
+	* Xilinx Spartan 6 FPGA "Device DNA" reading support
+	* Altera 10M50 FPGA (MAX10 family) target config
+	* Altera EPM240 CPLD (MAXII family) target config
+	* Marsohod2, Marsohod3 FPGA, Marsohod CPLD boards configs
+	* Novena's integrated FPGA board config
+	* XMOS XS1-XAU8A-10's ARM core config
+	* XMOS xCORE-XA Core Module board config
+	* Exynos5250 target config
+	* Arndale board config
+	* FM4 MB9BFxxx family configs
+	* Spansion SK-FM4-U120-9B560 board config
+	* Diolan LPC4357-DB1 board config
+	* ST STM32F469 discovery board config
+	* ST STM32F7-DISCO, STM327[4|5]6G-EVAL boards configs
+	* ST STM32L4 discovery, NUCLEO L476RG, STM32F429I-DISC1 boards
+          configs
+	* Atheros AR2313, AR2315 targets config
+	* Netgear WP102 board config
+	* La Fonera FON2200 board config
+	* Linksys WAG200G board config
+	* LPC-Link2 board config
+	* NXP LPC4370 target config
+	* Atmel SAMV, SAMS, SAME target configs
+	* Atmel SAM E70 Xplained, SAM V71 Xplained Ultra boards
+          configs
+	* Nordic nRF52 target config
+	* Nordic nRF51-DK, nRF52-DK boards configs
+	* Infineon XMC4700 Relax Kit, XMC4800 Relax EtherCAT Kit,
+          XMC4300 Relax EtherCAT Kit boards configs
+	* Renesas S7G2 target config
+	* Renesas DK-S7G2 board config
+	* Altera EP3C10 FPGA (Cyclone III family) target config
+	* TI MSP432P4xx target config
+	* Cypress PSoC 5LP target config
+	* Analog Devices ADSP-SC58x target config (Cortex-A5 core only)
+
+Server Layer:
+	* tcl_trace command for async target trace output via Tcl RPC
+
+Documentation:
+
+Build and Release:
+	* Various fixes thanks to http://coccinellery.org/
+	* libftdi is now autodetected with pkgconfig
+	* Releases should now support reproducible builds
+	* Conversion to non-recursive make, requires automake >= 1.14
+	* Udev rules modified to add uaccess tag and moved to
+          60-openocd.rules
+	* Support searching for scripts relative to the openocd binary
+          for all major architectures
+
+
+This release also contains a number of other important functional and
+cosmetic bugfixes. For more details about what has changed since the
+last release, see the git repository history:
+
+http://sourceforge.net/p/openocd/code/ci/v0.10.0/log/?path=
+
+
+For older NEWS, see the NEWS files associated with each release
+(i.e. NEWS-<version>).
+
+For more information about contributing test reports, bug fixes, or new
+features and device support, please read the new Developer Manual (or
+the BUGS and PATCHES.txt files in the source archive).

README

@@ -4,7 +4,7 @@ Welcome to OpenOCD!
 OpenOCD provides on-chip programming and debugging support with a
 layered architecture of JTAG interface and TAP support including:
 
-- (X)SVF playback to faciliate automated boundary scan and FPGA/CPLD
+- (X)SVF playback to facilitate automated boundary scan and FPGA/CPLD
   programming;
 - debug target support (e.g. ARM, MIPS): single-stepping,
   breakpoints/watchpoints, gprof profiling, etc;
@@ -45,9 +45,6 @@ e.g.:
   openocd -f interface/stlink-v2-1.cfg -c "transport select hla_swd" \
           -f target/stm32l0.cfg
 
-NB: when using an FTDI-based adapter you should prefer configs in the
-ftdi directory; the old configs for the ft2232 are deprecated.
-
 After OpenOCD startup, connect GDB with
 
   (gdb) target extended-remote localhost:3333
@@ -126,7 +123,7 @@ XScale, Intel Quark.
 Flash drivers
 -------------
 
-ADUC702x, AT91SAM, AVR, CFI, DSP5680xx, EFM32, EM357, FM3, FM4, Kinetis,
+ADUC702x, AT91SAM, ATH79, AVR, CFI, DSP5680xx, EFM32, EM357, FM3, FM4, Kinetis,
 LPC8xx/LPC1xxx/LPC2xxx/LPC541xx, LPC2900, LPCSPIFI, Marvell QSPI,
 Milandr, NIIET, NuMicro, PIC32mx, PSoC4, SiM3x, Stellaris, STM32, STMSMI,
 STR7x, STR9x, nRF51; NAND controllers of AT91SAM9, LPC3180, LPC32xx,
@@ -184,10 +181,6 @@ suggestions:
   particular hardware;
 - Use "ftdi" interface adapter driver for the FTDI-based devices.
 
-As a PACKAGER, never link against the FTD2XX library, as the resulting
-binaries can't be legally distributed, due to the restrictions of the
-GPL.
-
 
 ================
 Building OpenOCD
@@ -221,18 +214,16 @@ You'll also need:
 Additionally, for building from git:
 
 - autoconf >= 2.64
-- automake >= 1.9
+- automake >= 1.14
 - texinfo
 
 USB-based adapters depend on libusb-1.0 and some older drivers require
 libusb-0.1 or libusb-compat-0.1. A compatible implementation, such as
 FreeBSD's, additionally needs the corresponding .pc files.
 
-USB-Blaster, ASIX Presto, OpenJTAG and ft2232 interface adapter
-drivers need either one of:
+USB-Blaster, ASIX Presto and OpenJTAG interface adapter
+drivers need:
   - libftdi: http://www.intra2net.com/en/developer/libftdi/index.php
-  - ftd2xx: http://www.ftdichip.com/Drivers/D2XX.htm (proprietary,
-    GPL-incompatible)
 
 CMSIS-DAP support needs HIDAPI library.
 
@@ -242,7 +233,7 @@ Permissions delegation
 Running OpenOCD with root/administrative permissions is strongly
 discouraged for security reasons.
 
-For USB devices on GNU/Linux you should use the contrib/99-openocd.rules
+For USB devices on GNU/Linux you should use the contrib/60-openocd.rules
 file. It probably belongs somewhere in /etc/udev/rules.d, but
 consult your operating system documentation to be sure. Do not forget
 to add yourself to the "plugdev" group.
@@ -304,40 +295,6 @@ use both the --enable-parport AND the --enable-parport-giveio option
 if you want to use giveio instead of ioperm parallel port access
 method.
 
-Using FTDI's FTD2XX
--------------------
-
-The (closed source) FTDICHIP.COM solution is faster than libftdi on
-Windows. That is the motivation for supporting it even though its
-licensing restricts it to non-redistributable OpenOCD binaries, and it
-is not available for 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'' convenient. As of this
-writing FTDICHIP does not supply means to install these files "in an
-appropriate place."
-
-You should use the following ./configure options to make use of
-FTD2XX:
-
-  --with-ftd2xx-win32-zipdir
-                          Where (CYGWIN/MINGW) the zip file from ftdichip.com
-                          was unpacked <default=search>
-  --with-ftd2xx-linux-tardir
-                          Where (Linux/Unix) the tar file from ftdichip.com
-                          was unpacked <default=search>
-  --with-ftd2xx-lib=(static|shared)
-                          Use static or shared ftd2xx libs (default is static)
-
-Remember, this library is binary-only, while OpenOCD is licenced
-according to GNU GPLv2 without any exceptions. That means that
-_distributing_ copies of OpenOCD built with the FTDI code would
-violate the OpenOCD licensing terms.
-
-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 GIT

TODO

@@ -93,9 +93,6 @@ interface support:
   -# rewrite implementation to use non-blocking I/O
 - J-Link driver:
   - fix to work with long scan chains, such as R.Doss's svf test.
-- FT2232 (libftdi):
-  - make performance comparable to alternatives (on Win32, D2XX is faster)
-  - make usability comparable to alternatives
 - Autodetect USB based adapters; this should be easy on Linux.  If there's
   more than one, list the options; otherwise, just select that one.
 

bootstrap

@@ -39,5 +39,12 @@ else
     git submodule update
 fi
 
+if [ -x src/jtag/drivers/libjaylink/autogen.sh ]; then
+    (
+    cd src/jtag/drivers/libjaylink
+    ./autogen.sh
+    )
+fi
+
 echo "Bootstrap complete. Quick build instructions:"
 echo "./configure ...."