From: Antonio Borneo Date: Tue, 10 Mar 2020 22:07:42 +0000 (+0100) Subject: cortex_m: remove deprecation for soft_reset_halt X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=17ac52360fc27eed9f58506a102a32b653d4d48c;p=fw%2Fopenocd cortex_m: remove deprecation for soft_reset_halt The command "soft_reset_halt" is deprecated since mid 2013 with the commit 146dfe32956d ("cortex_m: deprecate soft_reset_halt"). Nevertheless it is still extremely useful with multicore chips where it allows to reset only one of the cores, option not available through asserting the chip-wide srst. It also get useful to handle the reset on some problematic chip, as in http://openocd.zylin.com/5489 Replace the warning about deprecation with a more light debug message. Change-Id: I52de6359475ba31014ae77e596a87fe88b252177 Signed-off-by: Antonio Borneo Reviewed-on: http://openocd.zylin.com/5514 Tested-by: jenkins Reviewed-by: Edward Fewell Reviewed-by: Tarek BOCHKATI --- diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c index 9a1f2b16f..af245dfc0 100644 --- a/src/target/cortex_m.c +++ b/src/target/cortex_m.c @@ -710,11 +710,11 @@ static int cortex_m_soft_reset_halt(struct target *target) uint32_t dcb_dhcsr = 0; int retval, timeout = 0; - /* soft_reset_halt is deprecated on cortex_m as the same functionality - * can be obtained by using 'reset halt' and 'cortex_m reset_config vectreset' - * As this reset only used VC_CORERESET it would only ever reset the cortex_m + /* on single cortex_m MCU soft_reset_halt should be avoided as same functionality + * can be obtained by using 'reset halt' and 'cortex_m reset_config vectreset'. + * As this reset only uses VC_CORERESET it would only ever reset the cortex_m * core, not the peripherals */ - LOG_WARNING("soft_reset_halt is deprecated, please use 'reset halt' instead."); + LOG_DEBUG("soft_reset_halt is discouraged, please use 'reset halt' instead."); /* Set C_DEBUGEN */ retval = cortex_m_write_debug_halt_mask(target, 0, C_STEP | C_MASKINTS);