arm_adi_v5: dap_queue_ap_* DAP->AP parameter

[openocd] / src / target / Makefile.am

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 159f0fa4307c426935c971445caa7178519d15ab..9f47b1fd86679fca021e7adcd7cb13de08b82945 100644 (file)
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -9,19 +9,19 @@ endif
 SUBDIRS = openrisc
 libtarget_la_LIBADD = $(top_builddir)/src/target/openrisc/libopenrisc.la
 
-BIN2C          = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
+BIN2C          = $(top_srcdir)/src/helper/bin2char.sh
 
 DEBUG_HANDLER  = $(srcdir)/xscale/debug_handler.bin
 EXTRA_DIST = \
        startup.tcl \
-       $(DEBUG_HANDLER)
+       $(wildcard $(srcdir)/xscale/*)
 
-DEBUG_HEADER   = xscale_debug.h
+DEBUG_HEADER   = xscale_debug.inc
 BUILT_SOURCES = $(DEBUG_HEADER)
 CLEANFILES = $(DEBUG_HEADER)
 
-$(DEBUG_HEADER): $(BIN2C) $(DEBUG_HANDLER)
-       $(BIN2C) < $(DEBUG_HANDLER) xscale_debug_handler > xscale_debug.h
+$(DEBUG_HEADER): $(DEBUG_HANDLER) $(BIN2C)
+       $(BIN2C) < $< > $@ || { rm -f $@; false; }
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libtarget.la
@@ -79,6 +79,7 @@ ARMV6_SRC = \
 
 ARMV7_SRC = \
        armv7m.c \
+       armv7m_trace.c \
        cortex_m.c \
        armv7a.c \
        cortex_a.c
@@ -90,9 +91,10 @@ ARM_DEBUG_SRC = \
        arm_simulator.c \
        arm_semihosting.c \
        arm_adi_v5.c \
+       armv7a_cache.c \
+       armv7a_cache_l2x.c \
        adi_v5_jtag.c \
        adi_v5_swd.c \
-       adi_v5_cmsis_dap.c \
        embeddedice.c \
        trace.c \
        etb.c \
@@ -136,6 +138,8 @@ noinst_HEADERS = \
        arm_dpm.h \
        arm_jtag.h \
        arm_adi_v5.h \
+       armv7a_cache.h \
+       armv7a_cache_l2x.h \
        arm_disassembler.h \
        arm_opcodes.h \
        arm_simulator.h \
@@ -155,6 +159,7 @@ noinst_HEADERS = \
        armv4_5_cache.h \
        armv7a.h \
        armv7m.h \
+       armv7m_trace.h \
        avrt.h \
        dsp563xx.h \
        dsp563xx_once.h \