diff options
author | Tim Newsome <tim@sifive.com> | 2019-02-08 14:39:47 -0800 |
---|---|---|
committer | Tim Newsome <tim@sifive.com> | 2019-02-08 14:39:47 -0800 |
commit | 1c6d52cd88076cf22e55e0294cbb9751a3492470 (patch) | |
tree | aaa36ec90b01caccadfe2c07932f2a22e3967d0c /src/target/xscale.c | |
parent | 80ef54dba2411f9354b3793d5832c5d8ad871b4b (diff) | |
parent | 6c2020eb48803b941a94d600e2a96728d05a7da9 (diff) | |
download | riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.zip riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.tar.gz riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.tar.bz2 |
Merge branch 'master' into from_upstream
Conflicts:
README
contrib/loaders/flash/fespi/Makefile
src/flash/nor/fespi.c
src/flash/nor/spi.c
Change-Id: I78a4e73685cc95daace95e9d16066a6fb51034fb
Diffstat (limited to 'src/target/xscale.c')
-rw-r--r-- | src/target/xscale.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/target/xscale.c b/src/target/xscale.c index 87a3d0f..3ac4553 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c @@ -3703,6 +3703,7 @@ struct target_type xscale_target = { .deassert_reset = xscale_deassert_reset, /* REVISIT on some cores, allow exporting iwmmxt registers ... */ + .get_gdb_arch = arm_get_gdb_arch, .get_gdb_reg_list = arm_get_gdb_reg_list, .read_memory = xscale_read_memory, |