diff options
| author | Tim Newsome <tim@sifive.com> | 2020-08-31 13:20:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:20:46 -0700 |
| commit | f5a44b0d149001541dc92a7c6b128aaa2090468c (patch) | |
| tree | 83f5a280a13f43d1e2466264697fddd86fb90f66 | |
| parent | 91dc0c0c8eaf2579798bbe9c2d121fd042527df8 (diff) | |
| download | riscv-openocd-f5a44b0d149001541dc92a7c6b128aaa2090468c.zip riscv-openocd-f5a44b0d149001541dc92a7c6b128aaa2090468c.tar.gz riscv-openocd-f5a44b0d149001541dc92a7c6b128aaa2090468c.tar.bz2 | |
Make checkpatch require Signed-off-by (#516)
* Make checkpatch require Signed-off-by
This will make it easier to send changes contributed here to mainline
OpenOCD.
(Intentionally not including the required line here to make sure I can't
just merge this.)
Change-Id: I089084d38f3e08859d62cf7eface405f37af4799
* Whitespace fix.
This PR isn't building on travis. Maybe because I only changed
.travis.yml. Here's a source change to force a build (hopefully).
Change-Id: I8a828fe1d56a1960bc4bfb91d3d2f3a0790ad571
* Can't check for signoff on sources alone.
Change-Id: I741a299b64bf14857a4e1807b254a7d270b2e466
Signed-off-by: Tim Newsome <tim@sifive.com>
* Actual whitespace fixes.
Why didn't this fail to build before?
Change-Id: I339c03c4ef96546dbef5f16e635921a4fdaf9b35
Signed-off-by: Tim Newsome <tim@sifive.com>
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/target/riscv/batch.c | 2 | ||||
| -rw-r--r-- | src/target/riscv/encoding.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 7191445..78bdc8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,8 @@ matrix: - binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 patchutils script: + # This is here for the signoff check. + - ./tools/checkpatch.sh # Ideally we'd diff back to where we either branched off OpenOCD or master, # or riscv. But that's tricky, and the default git clone only gets the last # 50 changes any case. Most merges won't consist of more than 40 changes, diff --git a/src/target/riscv/batch.c b/src/target/riscv/batch.c index 81d0358..b2c7e83 100644 --- a/src/target/riscv/batch.c +++ b/src/target/riscv/batch.c @@ -11,7 +11,7 @@ #define get_field(reg, mask) (((reg) & (mask)) / ((mask) & ~((mask) << 1))) #define set_field(reg, mask, val) (((reg) & ~(mask)) | (((val) * ((mask) & ~((mask) << 1))) & (mask))) -#define DTM_DMI_MAX_ADDRESS_LENGTH ((1<<DTM_DTMCS_ABITS_LENGTH)-1) +#define DTM_DMI_MAX_ADDRESS_LENGTH ((1 << DTM_DTMCS_ABITS_LENGTH) - 1) #define DMI_SCAN_MAX_BIT_LENGTH (DTM_DMI_MAX_ADDRESS_LENGTH + DTM_DMI_DATA_LENGTH + DTM_DMI_OP_LENGTH) #define DMI_SCAN_BUF_SIZE (DIV_ROUND_UP(DMI_SCAN_MAX_BIT_LENGTH, 8)) diff --git a/src/target/riscv/encoding.h b/src/target/riscv/encoding.h index 36bea29..90f65de 100644 --- a/src/target/riscv/encoding.h +++ b/src/target/riscv/encoding.h @@ -49,8 +49,8 @@ #define SSTATUS64_SD 0x8000000000000000 #define SSTATUS_VS_MASK (SSTATUS_SIE | SSTATUS_SPIE | \ - SSTATUS_SPP | SSTATUS_SUM | \ - SSTATUS_MXR | SSTATUS_UXL) + SSTATUS_SPP | SSTATUS_SUM | \ + SSTATUS_MXR | SSTATUS_UXL) #define HSTATUS_VSXL 0x300000000 #define HSTATUS_VTSR 0x00400000 |