diff options
| author | Tim Newsome <tim@sifive.com> | 2020-06-23 13:05:43 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2020-06-23 13:05:43 -0700 |
| commit | e07613de332d2cda48cd1a845b6e19171f084571 (patch) | |
| tree | e32451d4730030a2b1e8539cbfd6abf590a07896 /tools | |
| parent | 4579dd93586ab361f40da6cbd9e3e0681efc866b (diff) | |
| parent | 8833c889da07eae750bcbc11215cc84323de9b74 (diff) | |
| download | riscv-openocd-e07613de332d2cda48cd1a845b6e19171f084571.zip riscv-openocd-e07613de332d2cda48cd1a845b6e19171f084571.tar.gz riscv-openocd-e07613de332d2cda48cd1a845b6e19171f084571.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
.gitmodules
.travis.yml
jimtcl
src/jtag/core.c
src/jtag/drivers/ftdi.c
src/jtag/drivers/libjaylink
src/jtag/drivers/mpsse.c
src/jtag/drivers/stlink_usb.c
src/rtos/hwthread.c
src/target/riscv/riscv-013.c
src/target/riscv/riscv.c
tcl/board/sifive-hifive1-revb.cfg
Change-Id: I2d26ebeffb4c1374730d2e20e6e2a7710403657c
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/checkpatch.sh | 2 | ||||
| -rw-r--r-- | tools/release/helpers.sh | 1 | ||||
| -rwxr-xr-x | tools/release/version.sh | 1 | ||||
| -rwxr-xr-x | tools/st7_dtc_as/st7_dtc_as.pl | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/tools/checkpatch.sh b/tools/checkpatch.sh index e1dd267..0a630a2 100755 --- a/tools/checkpatch.sh +++ b/tools/checkpatch.sh @@ -2,4 +2,4 @@ # since=${1:-HEAD^} -git format-patch -M --stdout $since | tools/scripts/checkpatch.pl - --no-tree +git format-patch -M --stdout $since | tools/scripts/checkpatch.pl - diff --git a/tools/release/helpers.sh b/tools/release/helpers.sh index 47d5782..f06df34 100644 --- a/tools/release/helpers.sh +++ b/tools/release/helpers.sh @@ -57,4 +57,3 @@ Release: ${PACKAGE_RELEASE} Type: ${RELEASE_TYPE} INFO } - diff --git a/tools/release/version.sh b/tools/release/version.sh index d6c9434..a1c92f7 100755 --- a/tools/release/version.sh +++ b/tools/release/version.sh @@ -146,4 +146,3 @@ do_version() { package_info_load do_version "$@" - diff --git a/tools/st7_dtc_as/st7_dtc_as.pl b/tools/st7_dtc_as/st7_dtc_as.pl index 380c61d..d4c42d7 100755 --- a/tools/st7_dtc_as/st7_dtc_as.pl +++ b/tools/st7_dtc_as/st7_dtc_as.pl @@ -706,4 +706,3 @@ if($opt{'b'}) { 0; - |