Skip to content

Commit 6dc58ef

Browse files
committed
[jtag] rename the bazel target jtag_adapter_cfg to jtag_olimex_cfg
Signed-off-by: Douglas Reis <[email protected]>
1 parent 0c061a5 commit 6dc58ef

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

doc/getting_started/setup_fpga.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -338,12 +338,12 @@ stat --dereference -c '%a' /dev/jtag_adapter_arm_usb_tiny_h
338338
```
339339

340340
The command below tells OpenOCD to connect to the ChipWhisperer CW310 FPGA board via an Olimex ARM-USB-TINY-H JTAG adapter.
341-
(Note that a different JTAG adapter will require a different config than `//third_party/openocd:jtag_adapter_cfg`.)
341+
(Note that a different JTAG adapter will require a different config than `//third_party/openocd:jtag_olimex_cfg`.)
342342

343343
```console
344344
cd $REPO_TOP
345345
./bazelisk.sh run //third_party/openocd -- \
346-
-f "bazel-opentitan/$(./bazelisk.sh outquery //third_party/openocd:jtag_adapter_cfg)" \
346+
-f "bazel-opentitan/$(./bazelisk.sh outquery //third_party/openocd:jtag_olimex_cfg)" \
347347
-c "adapter speed 500; transport select jtag; reset_config trst_only" \
348348
-f util/openocd/target/lowrisc-earlgrey.cfg
349349
```

doc/getting_started/using_openocd.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ It's not directly runnable, so we provide a runnable wrapper: `//third_party/ope
1111

1212
OpenOCD ships with a library of config files.
1313
Instead of using whichever config files happen to be installed on the system, users should prefer Bazel targets that expose config files directly from OpenOCD's source tree.
14-
Currently, we only expose OpenTitan's default JTAG adapter config as `//third_party/openocd:jtag_adapter_cfg`.
14+
Currently, we only expose OpenTitan's default JTAG adapter config as `//third_party/openocd:jtag_olimex_cfg`.
1515

1616
```sh
1717
# Manually run OpenOCD:

rules/opentitan_gdb_test.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ _opentitan_gdb_fpga_cw310_test = rv_rule(
209209
allow_single_file = True,
210210
),
211211
"_openocd_jtag_adapter_config": attr.label(
212-
default = "//third_party/openocd:jtag_adapter_cfg",
212+
default = "//third_party/openocd:jtag_olimex_cfg",
213213
allow_single_file = True,
214214
),
215215
"_openocd": attr.label(

rules/opentitan_test.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ DEFAULT_TEST_FAILURE_MSG = "({})|({})".format(
2828

2929
OPENTITANTOOL_OPENOCD_TEST_CMDS = [
3030
"--openocd=\"$(rootpath //third_party/openocd:openocd_bin)\"",
31-
"--openocd-adapter-config=\"$(rootpath //third_party/openocd:jtag_adapter_cfg)\"",
31+
"--openocd-adapter-config=\"$(rootpath //third_party/openocd:jtag_olimex_cfg)\"",
3232
"--openocd-riscv-target-config=\"$(rootpath //util/openocd/target:lowrisc-earlgrey.cfg)\"",
3333
"--openocd-lc-target-config=\"$(rootpath //util/openocd/target:lowrisc-earlgrey-lc.cfg)\"",
3434
]
3535
OPENTITANTOOL_OPENOCD_DATA_DEPS = [
36-
"//third_party/openocd:jtag_adapter_cfg",
36+
"//third_party/openocd:jtag_olimex_cfg",
3737
"//third_party/openocd:openocd_bin",
3838
"//util/openocd/target:lowrisc-earlgrey.cfg",
3939
"//util/openocd/target:lowrisc-earlgrey-lc.cfg",

sw/device/silicon_creator/manuf/tests/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ _ALL_LC_ITEMS = (
6262
_MANUF_LC_TRANSITION_TEST_CMDS = [
6363
"--bitstream=\"$(rootpath {bitstream})\"",
6464
"--openocd=\"$(rootpath //third_party/openocd:openocd_bin)\"",
65-
"--openocd-adapter-config=\"$(rootpath //third_party/openocd:jtag_adapter_cfg)\"",
65+
"--openocd-adapter-config=\"$(rootpath //third_party/openocd:jtag_olimex_cfg)\"",
6666
"--openocd-riscv-target-config=\"$(rootpath //util/openocd/target:lowrisc-earlgrey.cfg)\"",
6767
"--openocd-lc-target-config=\"$(rootpath //util/openocd/target:lowrisc-earlgrey-lc.cfg)\"",
6868
]

third_party/openocd/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ genrule(
2929
)
3030

3131
filegroup(
32-
name = "jtag_adapter_cfg",
32+
name = "jtag_olimex_cfg",
3333
srcs = ["@openocd//:tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg"],
3434
visibility = ["//visibility:public"],
3535
)

0 commit comments

Comments
 (0)