diff options
author | Spencer Oliver <spen@spen-soft.co.uk> | 2013-10-10 21:16:42 +0100 |
---|---|---|
committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-10-10 20:51:03 +0000 |
commit | 1c975fe30b8fb380907133462cc38a0b2e9de565 (patch) | |
tree | 435e0ccd10febade04c74ac609880b633e172ec5 /src/rtos | |
parent | 43fc460559bb779a8867cc1eb9728e0e68fb7609 (diff) |
cortex_m: target implementation renames cortex_m3 to cortex_m
We changed the actual target name quite a while ago.
This changes the actual target function names/defines to also match
this change.
Change-Id: I4f22fb107636db2279865b45350c9c776e608a75
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1626
Tested-by: jenkins
Diffstat (limited to 'src/rtos')
-rw-r--r-- | src/rtos/embKernel.c | 6 | ||||
-rw-r--r-- | src/rtos/rtos_embkernel_stackings.c | 6 | ||||
-rw-r--r-- | src/rtos/rtos_embkernel_stackings.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/rtos/embKernel.c b/src/rtos/embKernel.c index ec3e5774..9a45cf0b 100644 --- a/src/rtos/embKernel.c +++ b/src/rtos/embKernel.c @@ -83,7 +83,7 @@ struct embKernel_params { struct embKernel_params embKernel_params_list[] = { { - "cortex_m3", /* target_name */ + "cortex_m", /* target_name */ 4, /* pointer_width */ 4, /* thread_count_width */ 8, /*rtos_list_size */ @@ -93,7 +93,7 @@ struct embKernel_params embKernel_params_list[] = { 4, /*thread_priority_width */ 4, /*iterable_next_offset */ 12, /*iterable_task_owner_offset */ - &rtos_embkernel_Cortex_M3_stacking, /* stacking_info*/ + &rtos_embkernel_Cortex_M_stacking, /* stacking_info*/ }, { "hla_target", /* target_name */ 4, /* pointer_width */ @@ -105,7 +105,7 @@ struct embKernel_params embKernel_params_list[] = { 4, /*thread_priority_width */ 4, /*iterable_next_offset */ 12, /*iterable_task_owner_offset */ - &rtos_embkernel_Cortex_M3_stacking, /* stacking_info */ + &rtos_embkernel_Cortex_M_stacking, /* stacking_info */ } }; diff --git a/src/rtos/rtos_embkernel_stackings.c b/src/rtos/rtos_embkernel_stackings.c index 07490f5c..2f0874ef 100644 --- a/src/rtos/rtos_embkernel_stackings.c +++ b/src/rtos/rtos_embkernel_stackings.c @@ -24,7 +24,7 @@ #include "rtos.h" -static const struct stack_register_offset rtos_embkernel_Cortex_M3_stack_offsets[] = { +static const struct stack_register_offset rtos_embkernel_Cortex_M_stack_offsets[] = { { 0x24, 32 }, /* r0 */ { 0x28, 32 }, /* r1 */ { 0x2c, 32 }, /* r2 */ @@ -53,12 +53,12 @@ static const struct stack_register_offset rtos_embkernel_Cortex_M3_stack_offsets { 0x40, 32 }, /* xPSR */ }; -const struct rtos_register_stacking rtos_embkernel_Cortex_M3_stacking = { +const struct rtos_register_stacking rtos_embkernel_Cortex_M_stacking = { 0x40, /* stack_registers_size */ -1, /* stack_growth_direction */ 26, /* num_output_registers */ 8, /* stack_alignment */ - rtos_embkernel_Cortex_M3_stack_offsets /* register_offsets */ + rtos_embkernel_Cortex_M_stack_offsets /* register_offsets */ }; diff --git a/src/rtos/rtos_embkernel_stackings.h b/src/rtos/rtos_embkernel_stackings.h index 5c2f5bd7..5bbcb461 100644 --- a/src/rtos/rtos_embkernel_stackings.h +++ b/src/rtos/rtos_embkernel_stackings.h @@ -27,6 +27,6 @@ #include "rtos.h" -extern const struct rtos_register_stacking rtos_embkernel_Cortex_M3_stacking; +extern const struct rtos_register_stacking rtos_embkernel_Cortex_M_stacking; #endif /* ifndef INCLUDED_RTOS_EMBKERNEL_STACKINGS_H_ */ |