From: Spencer Oliver Date: Thu, 30 May 2013 10:33:27 +0000 (+0100) Subject: cortex_m: print 'Cortex-M' rather than 'Cortex-M3' X-Git-Tag: v0.8.0-rc1~417 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=452df0371e90705f9dce01fe0ebd4139a7dcba21;p=openocd cortex_m: print 'Cortex-M' rather than 'Cortex-M3' This file is used by all the Cortex-M family not just Cortex-M3. Change-Id: Ie8680535b220c66bb8fcd862510407a46a73e8a0 Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/1429 Tested-by: jenkins Reviewed-by: Andreas Fritiofson --- diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c index 9521085b..d6d773c3 100644 --- a/src/target/cortex_m.c +++ b/src/target/cortex_m.c @@ -1061,11 +1061,11 @@ static int cortex_m3_assert_reset(struct target *target) if (retval != ERROR_OK) return retval; - LOG_DEBUG("Using Cortex-M3 %s", (reset_config == CORTEX_M3_RESET_SYSRESETREQ) + LOG_DEBUG("Using Cortex-M %s", (reset_config == CORTEX_M3_RESET_SYSRESETREQ) ? "SYSRESETREQ" : "VECTRESET"); if (reset_config == CORTEX_M3_RESET_VECTRESET) { - LOG_WARNING("Only resetting the Cortex-M3 core, use a reset-init event " + LOG_WARNING("Only resetting the Cortex-M core, use a reset-init event " "handler to reset any peripherals or configure hardware srst support."); } @@ -2051,7 +2051,7 @@ static int cortex_m3_verify_pointer(struct command_context *cmd_ctx, struct cortex_m3_common *cm3) { if (cm3->common_magic != CORTEX_M3_COMMON_MAGIC) { - command_print(cmd_ctx, "target is not a Cortex-M3"); + command_print(cmd_ctx, "target is not a Cortex-M"); return ERROR_TARGET_INVALID; } return ERROR_OK;