zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install patchutils for the build. (#321) 

* Install patchutils for the build.

This contains filterdiff, which we need to check that our changes
conform to OpenOCD style.

Change-Id: Id522f4e62fee3efad4e0e00933abfeada9635624

* Fix paths for filterdiff line.

Change-Id: Ic50e13c7fe64e65b2d2af0260fb19c07a9f10e20

* Conform to OpenOCD style.

Change-Id: I51660d30404c0a625b58c9bed2d948695575e72e
deinit
Tim Newsome 2018-11-05 11:50:09 -08:00 committed by GitHub
parent ca1a1f8db7
commit 005cfca219
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -7,6 +7,10 @@ matrix:
env: env:
- BUILD=x86_64-linux-gnu - BUILD=x86_64-linux-gnu
- EXECUTABLE=openocd - EXECUTABLE=openocd
addons:
apt:
packages:
- patchutils
compiler: gcc compiler: gcc
- os: linux - os: linux
@ -17,13 +21,17 @@ matrix:
addons: addons:
apt: apt:
packages: packages:
- gcc-multilib - gcc-multilib patchutils
compiler: gcc compiler: gcc
- os: linux - os: linux
env: env:
- BUILD=x86_64-linux-gnu - BUILD=x86_64-linux-gnu
- EXECUTABLE=openocd - EXECUTABLE=openocd
addons:
apt:
packages:
- patchutils
compiler: clang compiler: clang
- os: linux - os: linux
@ -36,7 +44,7 @@ matrix:
addons: addons:
apt: apt:
packages: packages:
- gcc-multilib - gcc-multilib patchutils
- os: linux - os: linux
env: env:
@ -47,7 +55,7 @@ matrix:
addons: addons:
apt: apt:
packages: packages:
- binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 - binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 patchutils
script: script:
# Ideally we'd diff back to where we either branched off OpenOCD or master, # Ideally we'd diff back to where we either branched off OpenOCD or master,
@ -56,7 +64,7 @@ script:
# so this should work fine most of the time, and be a lot better than not # so this should work fine most of the time, and be a lot better than not
# checking at all. # checking at all.
- git diff -U20 HEAD~40 | - git diff -U20 HEAD~40 |
filterdiff -x "src/jtag/drivers/libjaylink/*" -x "tools/git2cl/*" | filterdiff -x "b/src/jtag/drivers/libjaylink/*" -x "b/tools/git2cl/*" |
./tools/scripts/checkpatch.pl --no-signoff - ./tools/scripts/checkpatch.pl --no-signoff -
- ./bootstrap && ./configure --enable-remote-bitbang --enable-jtag_vpi $CONFIGURE_ARGS && make - ./bootstrap && ./configure --enable-remote-bitbang --enable-jtag_vpi $CONFIGURE_ARGS && make
- file src/$EXECUTABLE - file src/$EXECUTABLE

5
src/target/riscv/riscv-013.c
View File

@ -3292,7 +3292,7 @@ static int riscv013_test_sba_config_reg(struct target *target,
LOG_INFO("ALL TESTS PASSED"); LOG_INFO("ALL TESTS PASSED");
return ERROR_OK; return ERROR_OK;
} else { } else {
LOG_ERROR("%d TESTS FAILED", tests_failed); LOG_ERROR("%d TESTS FAILED", tests_failed);
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -3369,9 +3369,8 @@ static int maybe_execute_fence_i(struct target *target)
{ {
RISCV013_INFO(info); RISCV013_INFO(info);
RISCV_INFO(r); RISCV_INFO(r);
if (info->progbufsize + r->impebreak >= 3) { if (info->progbufsize + r->impebreak >= 3)
return execute_fence(target); return execute_fence(target);
}
return ERROR_OK; return ERROR_OK;
} }