diff options
| author | Tim Newsome <tim@sifive.com> | 2021-10-05 17:46:02 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2021-10-05 17:46:02 -0700 |
| commit | 1775341ef81417f3fe18e8df9628ce6a96f81a38 (patch) | |
| tree | 34367880702efd084471f3045bd4d3854d5543c7 /Makefile.am | |
| parent | 5215fc52abc3d204b66a05939c5257495b940cb6 (diff) | |
| parent | 9188115296917ce74ad5b0f83451414735225ce5 (diff) | |
| download | riscv-openocd-1775341ef81417f3fe18e8df9628ce6a96f81a38.zip riscv-openocd-1775341ef81417f3fe18e8df9628ce6a96f81a38.tar.gz riscv-openocd-1775341ef81417f3fe18e8df9628ce6a96f81a38.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
src/jtag/drivers/remote_bitbang.c
src/rtos/rtos_standard_stackings.c
src/rtos/rtos_standard_stackings.h
src/target/breakpoints.c
src/target/riscv/riscv.c
src/target/target.c
Change-Id: Ia6fcba3d43be8ea31728f3bcc2be6cb7e3ccc5c5
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 5c625de..d2d1993 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,7 +37,6 @@ 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)\"\ -DFD_SETSIZE=128 |