diff options
| author | Tim Newsome <tim@sifive.com> | 2021-04-13 11:22:43 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2021-04-13 11:26:25 -0700 |
| commit | 7420382a4d9453bf4bf72f2e42728136f9a3b7bb (patch) | |
| tree | 4aa04d3b401b9b9da8c29fda93e6ff23a70b29f1 /Makefile.am | |
| parent | 05e962e03a9642f883c0a91c38409ba89ad4fa7c (diff) | |
| parent | 0f06d943366154963c6f5eb70f52e70f64fe5c71 (diff) | |
| download | riscv-openocd-7420382a4d9453bf4bf72f2e42728136f9a3b7bb.zip riscv-openocd-7420382a4d9453bf4bf72f2e42728136f9a3b7bb.tar.gz riscv-openocd-7420382a4d9453bf4bf72f2e42728136f9a3b7bb.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
.github/workflows/snapshot.yml
NEWS
configure.ac
contrib/loaders/checksum/riscv_crc.c
jimtcl
src/helper/time_support.h
src/jtag/drivers/arm-jtag-ew.c
src/rtos/FreeRTOS.c
src/target/image.c
src/target/riscv/riscv.c
Change-Id: I043624ba540d4672fc123dddb2066bcb9c6b5a05
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 5d699b9..26ce136 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,6 @@ if INTERNAL_JIMTCL AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \ -I$(top_builddir)/jimtcl endif -EXTRA_DIST_NEWS != ls $(srcdir)/NEWS-* EXTRA_DIST += \ BUGS \ HACKING \ @@ -53,6 +52,14 @@ EXTRA_DIST += \ README.macOS \ $(EXTRA_DIST_NEWS) \ Doxyfile.in \ + LICENSES/license-rules.txt \ + LICENSES/preferred/BSD-1-Clause \ + LICENSES/preferred/BSD-2-Clause \ + LICENSES/preferred/BSD-3-Clause \ + LICENSES/preferred/GFDL-1.2 \ + LICENSES/preferred/gfdl-1.2.texi.readme \ + LICENSES/preferred/GPL-2.0 \ + LICENSES/stand-alone/GPL-3.0 \ tools/logger.pl \ tools/rlink_make_speed_table \ tools/st7_dtc_as \ @@ -118,6 +125,8 @@ uninstall-hook: distclean-local: rm -rf Doxyfile doxygen rm -f $(srcdir)/jimtcl/configure.gnu +# FIXME: workaround for jimtcl 0.80 only. Remove from jimtcl 0.81 + rm -f jimtcl/examples.api/Makefile # We want every change to have Signed-off-by. This is tricky to enforce in # Travis, because it automatically makes temporary commits when merging. So |