9740a4ddd6
- src/jtag/drivers/ftdi.c:
```
++<<<<<<< HEAD
+ int i;
+ static const uint8_t zero;
++=======
+ uint8_t zero = 0;
++>>>>>>> ocd_upstream
```
Decided to choose the latter.
- src/target/riscv/riscv-013.c:
```
++<<<<<<< HEAD
+ int abs_chain_position;
+ /* The base address to access this DM on DMI */
+ uint32_t base;
++=======
+ unsigned int abs_chain_position;
+
++>>>>>>> ocd_upstream
```
Decided to choose the latter (abs_chain_position is unsigned now)
- src/target/riscv/batch.c:
```
++<<<<<<< HEAD
++=======
+ void dump_field(int idle, const struct scan_field *field)
+ {
...
+ }
++>>>>>>> ocd_upstream
```
dump_field function is not needed anymore
Signed-off-by: Parshintsev Anatoly <anatoly.parshintsev@syntacore.com>
|
||
|---|---|---|
| .. | ||
| git2cl@8373c9f749 | ||
| release | ||
| rlink_make_speed_table | ||
| scripts | ||
| st7_dtc_as | ||
| checkpatch.sh | ||
| disassemble_inc.sh | ||
| filter_openocd_log.py | ||
| initial.sh | ||
| logger.pl | ||
| release.sh | ||
| uncrustify1.sh | ||