diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-22 10:30:00 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-22 10:30:00 +0000 |
| commit | f669c50fc9e4d3b54ce6830e46faa055a8dfe4f9 (patch) | |
| tree | ce9146207010198e35aa892b7bd8ef23e63d4ff7 /src/jtag/jtag.c | |
| parent | 4622cb15a9f77c282b1544e5092346bd54dd3a48 (diff) | |
| download | openocd+libswd-f669c50fc9e4d3b54ce6830e46faa055a8dfe4f9.tar.gz openocd+libswd-f669c50fc9e4d3b54ce6830e46faa055a8dfe4f9.tar.bz2 openocd+libswd-f669c50fc9e4d3b54ce6830e46faa055a8dfe4f9.tar.xz openocd+libswd-f669c50fc9e4d3b54ce6830e46faa055a8dfe4f9.zip | |
- changed jtag_add_reset errors to warnings
- removed extra jtag reset warnings from arm7_9 and cortex_m3
git-svn-id: svn://svn.berlios.de/openocd/trunk@520 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/jtag.c')
| -rw-r--r-- | src/jtag/jtag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index 7d0dcab9..a27396a1 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -899,7 +899,7 @@ int jtag_add_reset(int req_trst, int req_srst) /* if SRST pulls TRST, we can't fulfill srst == 1 with trst == 0 */ if (((jtag_reset_config & RESET_SRST_PULLS_TRST) && (req_srst == 1)) && (req_trst == 0)) { - ERROR("requested reset would assert trst"); + WARNING("requested reset would assert trst"); return ERROR_JTAG_RESET_WOULD_ASSERT_TRST; } @@ -912,7 +912,7 @@ int jtag_add_reset(int req_trst, int req_srst) if (req_srst && !(jtag_reset_config & RESET_HAS_SRST)) { - ERROR("requested nSRST assertion, but the current configuration doesn't support this"); + WARNING("requested nSRST assertion, but the current configuration doesn't support this"); return ERROR_JTAG_RESET_CANT_SRST; } |