diff options
| author | Tim Newsome <tim@sifive.com> | 2022-05-03 13:41:55 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2022-05-03 13:41:55 -0700 |
| commit | 9460f43dc356829858bcb0057c7fe0dd7153c0c6 (patch) | |
| tree | 51fa5e6f157caeffeec27d0dba117c01389f6d66 /src/rtos | |
| parent | b6dddfacc05ea981aabcf76ed155f68b677950a1 (diff) | |
| parent | 66335683fec62ac89da48d64932fd9d082314225 (diff) | |
| download | riscv-openocd-9460f43dc356829858bcb0057c7fe0dd7153c0c6.zip riscv-openocd-9460f43dc356829858bcb0057c7fe0dd7153c0c6.tar.gz riscv-openocd-9460f43dc356829858bcb0057c7fe0dd7153c0c6.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
tcl/target/gd32vf103.cfg
I kept our version, except I changed the flash device as happened in
mainline. Once this file settles down in mainline, we can copy it
wholesale into this fork.
Change-Id: I4c5b21fec0734b5e08eba392883e006a46386b1c
Diffstat (limited to 'src/rtos')
| -rw-r--r-- | src/rtos/zephyr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rtos/zephyr.c b/src/rtos/zephyr.c index 6305116..7f3325f 100644 --- a/src/rtos/zephyr.c +++ b/src/rtos/zephyr.c @@ -375,15 +375,15 @@ static const struct symbol_table_elem zephyr_symbol_list[] = { .optional = false }, { - .symbol_name = "_kernel_openocd_offsets", + .symbol_name = "_kernel_thread_info_offsets", .optional = false }, { - .symbol_name = "_kernel_openocd_size_t_size", + .symbol_name = "_kernel_thread_info_size_t_size", .optional = false }, { - .symbol_name = "_kernel_openocd_num_offsets", + .symbol_name = "_kernel_thread_info_num_offsets", .optional = true }, { |