diff options
author | Tim Newsome <tim@sifive.com> | 2021-06-21 14:27:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-21 14:27:48 -0700 |
commit | 388db62ca95ffe5c35d3698c3d26a06b8d2a85d8 (patch) | |
tree | 54ab22b3ed95482e85bdbb05efc7c0753997601e | |
parent | 383ff36547e6a349c42bbbd1f3ecd18aa0e7cab5 (diff) | |
download | riscv-openocd-388db62ca95ffe5c35d3698c3d26a06b8d2a85d8.zip riscv-openocd-388db62ca95ffe5c35d3698c3d26a06b8d2a85d8.tar.gz riscv-openocd-388db62ca95ffe5c35d3698c3d26a06b8d2a85d8.tar.bz2 |
Get closer to mainline. (#624)
* Get closer to mainline.
.gitignore is left-over from when I tried gnulib.
The other changes were made to make the checker happy, and I don't care
to upstream these.
Change-Id: I9168b3b80d89a142a46eb1906a7640fc02552743
Signed-off-by: Tim Newsome <tim@sifive.com>
* checkpatch requires this.
Why isn't this correct in upstream?
Change-Id: I3810e26e591450b6d7425368a39750405f4d8bfa
Signed-off-by: Tim Newsome <tim@sifive.com>
* Appears unnecessary.
I added this as part of FreeRtos work, but all those tests pass just
fine even without this change. I suspect I added it in an attempt to fix
something and it turned out to be unnecessary. Reverting because I don't
know how to justify upstreaming this.
Change-Id: I1e4d0af9d2b4d62c79969216929702463bf0c815
Signed-off-by: Tim Newsome <tim@sifive.com>
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | contrib/loaders/erase_check/armv7m_erase_check.s | 5 | ||||
-rw-r--r-- | src/server/gdb_server.c | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -14,8 +14,6 @@ # generated source files src/jtag/minidriver_imp.h src/jtag/jtag_minidriver.h -src/gnulib/sys/ -src/gnulib/limits.h # OpenULINK driver files generated by SDCC src/jtag/drivers/OpenULINK/*.rel diff --git a/contrib/loaders/erase_check/armv7m_erase_check.s b/contrib/loaders/erase_check/armv7m_erase_check.s index 163fa8c..3303c87 100644 --- a/contrib/loaders/erase_check/armv7m_erase_check.s +++ b/contrib/loaders/erase_check/armv7m_erase_check.s @@ -11,6 +11,11 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ /* diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index fe289c8..398c3f6 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -1354,7 +1354,7 @@ static int gdb_get_register_packet(struct connection *connection, if (reg_list_size <= reg_num) { LOG_ERROR("gdb requested a non-existing register"); - return gdb_error(connection, retval); + return ERROR_SERVER_REMOTE_CLOSED; } if (!reg_list[reg_num]->valid) { |