auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spelling of ARM Cortex

Browse Source 
It's Cortex-Xn, not Cortex Xn or cortex xn or cortex-xn or CORTEX-Xn
or CortexXn. Further it's Cortex-M0+, not M0plus.

Cf. http://www.arm.com/products/processors/index.php

Consistently write it the official way, so that it stops propagating.
Originally spotted in the documentation, it mainly affects code comments
but also Atmel SAM3/SAM4/SAMV, NiietCM4 and SiM3x flash driver output.

Found via:

  git grep -i "Cortex "
  git grep -i "Cortex-" | grep -v "Cortex-" | grep -v ".cpu"
  git grep -i "CortexM"

Change-Id: Ic7b6ca85253e027f6f0f751c628d1a2a391fe914
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-on: http://openocd.zylin.com/3483
Tested-by: jenkins
Reviewed-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Andreas Färber
2016-05-14 20:21:49 +02:00
committed by Freddie Chopin
parent f630fac2e7
commit 0c8ec7c826
45 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/flash/nor/at91sam3.c
View File

@@ -2482,7 +2482,7 @@ static const char *const eproc_names[] = {
_unknown, /* 0 */
"arm946es", /* 1 */
"arm7tdmi", /* 2 */
"cortex-m3", /* 3 */
"Cortex-M3", /* 3 */
"arm920t", /* 4 */
"arm926ejs", /* 5 */
_unknown, /* 6 */

6
src/flash/nor/at91sam4.c
View File

@@ -1407,11 +1407,11 @@ static const char *const eproc_names[] = {
_unknown, /* 0 */
"arm946es", /* 1 */
"arm7tdmi", /* 2 */
"cortex-m3", /* 3 */
"Cortex-M3", /* 3 */
"arm920t", /* 4 */
"arm926ejs", /* 5 */
"cortex-a5", /* 6 */
"cortex-m4", /* 7 */
"Cortex-A5", /* 6 */
"Cortex-M4", /* 7 */
_unknown, /* 8 */
_unknown, /* 9 */
_unknown, /* 10 */

2
src/flash/nor/atsamv.c
View File

@@ -355,7 +355,7 @@ static int samv_probe(struct flash_bank *bank)
uint8_t eproc = (device_id >> 5) & 0x7;
if (eproc != 0) {
LOG_ERROR("unexpected eproc code: %d was expecting 0 (cortex-m7)", eproc);
LOG_ERROR("unexpected eproc code: %d was expecting 0 (Cortex-M7)", eproc);
return ERROR_FAIL;
}

6
src/flash/nor/efm32.c
View File

@@ -144,11 +144,11 @@ static int efm32x_read_info(struct flash_bank *bank,
return ret;
if (((cpuid >> 4) & 0xfff) == 0xc23) {
/* Cortex M3 device */
/* Cortex-M3 device */
} else if (((cpuid >> 4) & 0xfff) == 0xc24) {
/* Cortex M4 device(WONDER GECKO) */
/* Cortex-M4 device (WONDER GECKO) */
} else if (((cpuid >> 4) & 0xfff) == 0xc60) {
/* Cortex M0plus device */
/* Cortex-M0+ device */
} else {
LOG_ERROR("Target is not Cortex-Mx Device");
return ERROR_FAIL;

2
src/flash/nor/niietcm4.c
View File

@@ -1719,7 +1719,7 @@ static int niietcm4_auto_probe(struct flash_bank *bank)
static int get_niietcm4_info(struct flash_bank *bank, char *buf, int buf_size)
{
struct niietcm4_flash_bank *niietcm4_info = bank->driver_priv;
LOG_INFO("\nNIIET Cortex M4F %s\n%s", niietcm4_info->chip_name, niietcm4_info->chip_brief);
LOG_INFO("\nNIIET Cortex-M4F %s\n%s", niietcm4_info->chip_name, niietcm4_info->chip_brief);
snprintf(buf, buf_size, " ");
return ERROR_OK;

4
src/flash/nor/sim3x.c
View File

@@ -748,7 +748,7 @@ static int sim3x_read_info(struct flash_bank *bank)
}
if (((cpuid >> 4) & 0xfff) != 0xc23) {
LOG_ERROR("Target is not CortexM3");
LOG_ERROR("Target is not Cortex-M3");
return ERROR_FAIL;
}
@@ -1009,7 +1009,7 @@ COMMAND_HANDLER(sim3x_lock)
return ret;
if ((val & CPUID_CHECK_VALUE_MASK) != CPUID_CHECK_VALUE) {
LOG_ERROR("Target is not ARM CortexM3 or is already locked");
LOG_ERROR("Target is not ARM Cortex-M3 or is already locked");
return ERROR_FAIL;
}
} else {

2
src/jtag/drivers/openjtag.c
View File

@@ -32,7 +32,7 @@
***************************************************************************/
/***************************************************************************
* Version 1.0 Tested on a MCBSTM32 board using a Cortex M3 (stm32f103x), *
* Version 1.0 Tested on a MCBSTM32 board using a Cortex-M3 (stm32f103x), *
* GDB and Eclipse under Linux (Ubuntu 10.04) *
* *
***************************************************************************/

2
src/jtag/drivers/stlink_usb.c
View File

@@ -1164,7 +1164,7 @@ static int stlink_usb_step(void *handle)
if (h->jtag_api == STLINK_JTAG_API_V2) {
/* TODO: this emulates the v1 api, it should really use a similar auto mask isr
* that the cortex-m3 currently does. */
* that the Cortex-M3 currently does. */
stlink_usb_write_debug_reg(handle, DCB_DHCSR, DBGKEY|C_HALT|C_MASKINTS|C_DEBUGEN);
stlink_usb_write_debug_reg(handle, DCB_DHCSR, DBGKEY|C_STEP|C_MASKINTS|C_DEBUGEN);
return stlink_usb_write_debug_reg(handle, DCB_DHCSR, DBGKEY|C_HALT|C_DEBUGEN);

4
src/rtos/ChibiOS.c
View File

@@ -226,7 +226,7 @@ static int ChibiOS_update_stacking(struct rtos *rtos)
/* Sometimes the stacking can not be determined only by looking at the
* target name but only a runtime.
*
* For example, this is the case for cortex-m4 targets and ChibiOS which
* For example, this is the case for Cortex-M4 targets and ChibiOS which
* only stack the FPU registers if it is enabled during ChibiOS build.
*
* Terminating which stacking is used is target depending.
@@ -248,7 +248,7 @@ static int ChibiOS_update_stacking(struct rtos *rtos)
struct ChibiOS_params *param;
param = (struct ChibiOS_params *) rtos->rtos_specific_params;
/* Check for armv7m with *enabled* FPU, i.e. a Cortex M4 */
/* Check for armv7m with *enabled* FPU, i.e. a Cortex-M4 */
struct armv7m_common *armv7m_target = target_to_armv7m(rtos->target);
if (is_armv7m(armv7m_target)) {
if (armv7m_target->fp_feature == FPv4_SP) {

2
src/rtos/FreeRTOS.c
View File

@@ -430,7 +430,7 @@ static int FreeRTOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, ch
thread_id + param->thread_stack_offset,
stack_ptr);
/* Check for armv7m with *enabled* FPU, i.e. a Cortex M4F */
/* Check for armv7m with *enabled* FPU, i.e. a Cortex-M4F */
int cm4_fpu_enabled = 0;
struct armv7m_common *armv7m_target = target_to_armv7m(rtos->target);
if (is_armv7m(armv7m_target)) {

2
src/rtos/mqx.c
View File

@@ -109,7 +109,7 @@ static int mqx_valid_address_check(
enum mqx_arch arch_type = ((struct mqx_params *)rtos->rtos_specific_params)->target_arch;
const char * targetname = ((struct mqx_params *)rtos->rtos_specific_params)->target_name;
/* Cortex M address range */
/* Cortex-M address range */
if (arch_type == mqx_arch_cortexm) {
if (
/* code and sram area */

2
src/rtos/rtos_standard_stackings.c
View File

@@ -182,7 +182,7 @@ int64_t rtos_generic_stack_align8(struct target *target,
stacking, stack_ptr, 8);
}
/* The Cortex M3 will indicate that an alignment adjustment
/* The Cortex-M3 will indicate that an alignment adjustment
* has been done on the stack by setting bit 9 of the stacked xPSR
* register. In this case, we can just add an extra 4 bytes to get
* to the program stack. Note that some places in the ARM documentation

2
src/target/armv7a.c
View File

@@ -177,7 +177,7 @@ done:
return retval;
}
/* method adapted to cortex A : reused arm v4 v5 method*/
/* method adapted to Cortex-A : reused ARM v4 v5 method */
int armv7a_mmu_translate_va(struct target *target, uint32_t va, uint32_t *val)
{
uint32_t first_lvl_descriptor = 0x0;

4
src/target/cortex_a.c
View File

@@ -18,7 +18,7 @@
* michel.jaouen@stericsson.com : smp minimum support *
* *
* Copyright (C) Broadcom 2012 *
* ehunter@broadcom.com : Cortex R4 support *
* ehunter@broadcom.com : Cortex-R4 support *
* *
* Copyright (C) 2013 Kamal Dasu *
* kdasu.kdev@gmail.com *
@@ -2664,7 +2664,7 @@ out:
/*
* Cortex-A Memory access
*
* This is same Cortex M3 but we must also use the correct
* This is same Cortex-M3 but we must also use the correct
* ap number for every access.
*/

2
src/target/cortex_m.c
View File

@@ -1932,7 +1932,7 @@ int cortex_m_examine(struct target *target)
}
LOG_DEBUG("cpuid: 0x%8.8" PRIx32 "", cpuid);
/* test for floating point feature on cortex-m4 */
/* test for floating point feature on Cortex-M4 */
if (i == 4) {
target_read_u32(target, MVFR0, &mvfr0);
target_read_u32(target, MVFR1, &mvfr1);