6 files changed, 14 insertions, 7 deletions
diff --git a/src/rtos/ChibiOS.c b/src/rtos/ChibiOS.c
index cf590b7f..e0424c69 100644
--- a/src/rtos/ChibiOS.c
+++ b/src/rtos/ChibiOS.c
@@ -94,7 +94,7 @@ struct ChibiOS_params {
 
 struct ChibiOS_params ChibiOS_params_list[] = {
 	{
-	"cortex_m3",							/* target_name */
+	"cortex_m",							/* target_name */
 	0,
 	NULL,									/* stacking_info */
 	},
diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c
index acf3689f..51bd35e4 100644
--- a/src/rtos/FreeRTOS.c
+++ b/src/rtos/FreeRTOS.c
@@ -50,7 +50,7 @@ struct FreeRTOS_params {
 
 const struct FreeRTOS_params FreeRTOS_params_list[] = {
 	{
-	"cortex_m3",			/* target_name */
+	"cortex_m",			/* target_name */
 	4,						/* thread_count_width; */
 	4,						/* pointer_width; */
 	16,						/* list_next_offset; */
diff --git a/src/rtos/ThreadX.c b/src/rtos/ThreadX.c
index 571814cb..86a24998 100644
--- a/src/rtos/ThreadX.c
+++ b/src/rtos/ThreadX.c
@@ -73,7 +73,7 @@ struct ThreadX_params {
 
 const struct ThreadX_params ThreadX_params_list[] = {
 	{
-	"cortex_m3",				/* target_name */
+	"cortex_m",				/* target_name */
 	4,							/* pointer_width; */
 	8,							/* thread_stack_offset; */
 	40,							/* thread_name_offset; */
diff --git a/src/rtos/eCos.c b/src/rtos/eCos.c
index 6a0ed4ec..f2c7f712 100644
--- a/src/rtos/eCos.c
+++ b/src/rtos/eCos.c
@@ -64,7 +64,7 @@ struct eCos_params {
 
 const struct eCos_params eCos_params_list[] = {
 	{
-	"cortex_m3",			/* target_name */
+	"cortex_m",			/* target_name */
 	4,						/* pointer_width; */
 	0x0c,					/* thread_stack_offset; */
 	0x9c,					/* thread_name_offset; */
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 7094b070..6fba9259 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -2256,9 +2256,9 @@ static const struct command_registration cortex_m3_command_handlers[] = {
 		.chain = armv7m_command_handlers,
 	},
 	{
-		.name = "cortex_m3",
+		.name = "cortex_m",
 		.mode = COMMAND_EXEC,
-		.help = "Cortex-M3 command group",
+		.help = "Cortex-M command group",
 		.usage = "",
 		.chain = cortex_m3_exec_command_handlers,
 	},
@@ -2266,7 +2266,8 @@ static const struct command_registration cortex_m3_command_handlers[] = {
 };
 
 struct target_type cortexm3_target = {
-	.name = "cortex_m3",
+	.name = "cortex_m",
+	.deprecated_name = "cortex_m3",
 
 	.poll = cortex_m3_poll,
 	.arch_state = armv7m_arch_state,
diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index 90f947df..0c72cc71 100644
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -167,3 +167,9 @@ proc init_targets {} {
 # Additionally board config scripts can define a procedure init_board that will be executed after init and init_targets
 proc init_board {} {
 }
+
+# deprecated target name cmds
+proc cortex_m3 args {
+	echo "DEPRECATED! use 'cortex_m' not 'cortex_m3'"
+	eval cortex_m $args
+}