interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
riscv-openocd/tcl/interface
History
Parshintsev Anatoly 9740a4ddd6 Merge up to ac63cd00d7 from upstream 
- 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>
 		2024-08-20 15:44:15 +03:00
..
ft232r tcl/interface: replace last deprecated commands 2022-09-13 22:16:37 +00:00
ftdi Merge commit '4b1ea8511a7da9d7201df40302e3341c6e97ffdd' into from_upstream 2023-11-27 10:04:09 -08:00
altera-usb-blaster.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
altera-usb-blaster2.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
angie.cfg jtag/drivers: Add new driver for ANGIE USB-JTAG Adapter 2023-08-12 16:44:17 +00:00
arm-jtag-ew.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
ast2600-gpiod.cfg tcl/interface: add linuxgpiod cfg for Aspeed AST2600 2022-08-20 15:30:20 +00:00
at91rm9200.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
beaglebone-jtag-native.cfg drivers/am335xgpio: Migrate to adapter gpio commands 2022-08-15 13:24:36 +00:00
beaglebone-swd-native.cfg drivers/am335xgpio: Migrate to adapter gpio commands 2022-08-15 13:24:36 +00:00
buspirate.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
chameleon.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
cmsis-dap.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
dln-2-gpiod.cfg drivers/linuxgpiod: Migrate to adapter gpio commands 2022-08-15 13:24:54 +00:00
dummy.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
esp_usb_bridge.cfg jtag: add esp_usb_jtag driver 2022-07-02 08:24:01 +00:00
esp_usb_jtag.cfg tcl/interface: add Espressif builtin usb_jtag config file. 2023-07-19 00:11:22 +02:00
estick.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
flashlink.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
ft232r.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
imx-native.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
jlink.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
jtag_dpi.cfg tcl: replace FSF boilerplate with SPDX tag 2022-06-24 21:51:58 +00:00
jtag_hat_rpi2.cfg drivers/bcm2835gpio: Migrate to adapter gpio commands 2022-09-13 22:17:14 +00:00
jtag_vpi.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
kitprog.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
nulink.cfg tcl: Replace 'hla_' prefix with 'hla' command group 2024-07-13 22:18:17 +00:00
opendous.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
openjtag.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
osbdm.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
parport.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
parport_dlc5.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
raspberrypi-gpio-connector.cfg tcl/interface: support for Raspberry Pi 5 2024-06-25 07:23:18 +00:00
raspberrypi-native.cfg tcl/interface: support for Raspberry Pi 5 2024-06-25 07:23:18 +00:00
raspberrypi2-native.cfg tcl/interface: universal config for all Raspberry Pi models 2023-01-28 15:55:10 +00:00
raspberrypi5-gpiod.cfg tcl/interface/raspberrypi5-gpiod: fix string match pattern escaping 2024-08-16 04:45:11 +00:00
rlink.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
rshim.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
stlink-dap.cfg jtag/stlink: add STLINK-V3PWR support 2023-07-08 18:06:33 +00:00
stlink-v1.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
stlink-v2-1.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
stlink-v2.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
stlink.cfg tcl: Replace 'hla_' prefix with 'hla' command group 2024-07-13 22:18:17 +00:00
sysfsgpio-raspberrypi.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
ti-icdi.cfg tcl: Replace 'hla_' prefix with 'hla' command group 2024-07-13 22:18:17 +00:00
ulink.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
usb-jtag.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
usbprog.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
vdebug.cfg tcl: Replace 'tcl_' prefix with 'tcl' command group 2024-07-13 22:29:34 +00:00
vsllink.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00
xds110.cfg tcl/interface: add SPDX tag 2022-06-24 21:54:01 +00:00