arm: Consistently use "Cortex-Axx", not "Cortex Axx"
The official punctuation for Arm CPU names uses a hyphen, like "Cortex-A9". We mostly follow this, but in a few places usage without the hyphen has crept in. Fix those so we consistently use the same way of writing the CPU name. This commit was created with: git grep -z -l 'Cortex ' | xargs -0 sed -i 's/Cortex /Cortex-/' Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-id: 20210527095152.10968-1-peter.maydell@linaro.org
This commit is contained in:
parent
7cda214952
commit
f548f20176
@ -5,7 +5,7 @@ The QEMU Aspeed machines model BMCs of various OpenPOWER systems and
|
|||||||
Aspeed evaluation boards. They are based on different releases of the
|
Aspeed evaluation boards. They are based on different releases of the
|
||||||
Aspeed SoC : the AST2400 integrating an ARM926EJ-S CPU (400MHz), the
|
Aspeed SoC : the AST2400 integrating an ARM926EJ-S CPU (400MHz), the
|
||||||
AST2500 with an ARM1176JZS CPU (800MHz) and more recently the AST2600
|
AST2500 with an ARM1176JZS CPU (800MHz) and more recently the AST2600
|
||||||
with dual cores ARM Cortex A7 CPUs (1.2GHz).
|
with dual cores ARM Cortex-A7 CPUs (1.2GHz).
|
||||||
|
|
||||||
The SoC comes with RAM, Gigabit ethernet, USB, SD/MMC, USB, SPI, I2C,
|
The SoC comes with RAM, Gigabit ethernet, USB, SD/MMC, USB, SPI, I2C,
|
||||||
etc.
|
etc.
|
||||||
@ -24,7 +24,7 @@ AST2500 SoC based machines :
|
|||||||
|
|
||||||
AST2600 SoC based machines :
|
AST2600 SoC based machines :
|
||||||
|
|
||||||
- ``ast2600-evb`` Aspeed AST2600 Evaluation board (Cortex A7)
|
- ``ast2600-evb`` Aspeed AST2600 Evaluation board (Cortex-A7)
|
||||||
- ``tacoma-bmc`` OpenPOWER Witherspoon POWER9 AST2600 BMC
|
- ``tacoma-bmc`` OpenPOWER Witherspoon POWER9 AST2600 BMC
|
||||||
|
|
||||||
Supported devices
|
Supported devices
|
||||||
|
@ -3,19 +3,19 @@ Nuvoton iBMC boards (``npcm750-evb``, ``quanta-gsj``)
|
|||||||
|
|
||||||
The `Nuvoton iBMC`_ chips (NPCM7xx) are a family of ARM-based SoCs that are
|
The `Nuvoton iBMC`_ chips (NPCM7xx) are a family of ARM-based SoCs that are
|
||||||
designed to be used as Baseboard Management Controllers (BMCs) in various
|
designed to be used as Baseboard Management Controllers (BMCs) in various
|
||||||
servers. They all feature one or two ARM Cortex A9 CPU cores, as well as an
|
servers. They all feature one or two ARM Cortex-A9 CPU cores, as well as an
|
||||||
assortment of peripherals targeted for either Enterprise or Data Center /
|
assortment of peripherals targeted for either Enterprise or Data Center /
|
||||||
Hyperscale applications. The former is a superset of the latter, so NPCM750 has
|
Hyperscale applications. The former is a superset of the latter, so NPCM750 has
|
||||||
all the peripherals of NPCM730 and more.
|
all the peripherals of NPCM730 and more.
|
||||||
|
|
||||||
.. _Nuvoton iBMC: https://www.nuvoton.com/products/cloud-computing/ibmc/
|
.. _Nuvoton iBMC: https://www.nuvoton.com/products/cloud-computing/ibmc/
|
||||||
|
|
||||||
The NPCM750 SoC has two Cortex A9 cores and is targeted for the Enterprise
|
The NPCM750 SoC has two Cortex-A9 cores and is targeted for the Enterprise
|
||||||
segment. The following machines are based on this chip :
|
segment. The following machines are based on this chip :
|
||||||
|
|
||||||
- ``npcm750-evb`` Nuvoton NPCM750 Evaluation board
|
- ``npcm750-evb`` Nuvoton NPCM750 Evaluation board
|
||||||
|
|
||||||
The NPCM730 SoC has two Cortex A9 cores and is targeted for Data Center and
|
The NPCM730 SoC has two Cortex-A9 cores and is targeted for Data Center and
|
||||||
Hyperscale applications. The following machines are based on this chip :
|
Hyperscale applications. The following machines are based on this chip :
|
||||||
|
|
||||||
- ``quanta-gsj`` Quanta GSJ server BMC
|
- ``quanta-gsj`` Quanta GSJ server BMC
|
||||||
|
@ -10,7 +10,7 @@ Supported devices
|
|||||||
|
|
||||||
The SABRE Lite machine supports the following devices:
|
The SABRE Lite machine supports the following devices:
|
||||||
|
|
||||||
* Up to 4 Cortex A9 cores
|
* Up to 4 Cortex-A9 cores
|
||||||
* Generic Interrupt Controller
|
* Generic Interrupt Controller
|
||||||
* 1 Clock Controller Module
|
* 1 Clock Controller Module
|
||||||
* 1 System Reset Controller
|
* 1 System Reset Controller
|
||||||
|
@ -947,7 +947,7 @@ static void aspeed_machine_ast2600_evb_class_init(ObjectClass *oc, void *data)
|
|||||||
MachineClass *mc = MACHINE_CLASS(oc);
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||||||
AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
|
AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
|
||||||
|
|
||||||
mc->desc = "Aspeed AST2600 EVB (Cortex A7)";
|
mc->desc = "Aspeed AST2600 EVB (Cortex-A7)";
|
||||||
amc->soc_name = "ast2600-a1";
|
amc->soc_name = "ast2600-a1";
|
||||||
amc->hw_strap1 = AST2600_EVB_HW_STRAP1;
|
amc->hw_strap1 = AST2600_EVB_HW_STRAP1;
|
||||||
amc->hw_strap2 = AST2600_EVB_HW_STRAP2;
|
amc->hw_strap2 = AST2600_EVB_HW_STRAP2;
|
||||||
@ -966,7 +966,7 @@ static void aspeed_machine_tacoma_class_init(ObjectClass *oc, void *data)
|
|||||||
MachineClass *mc = MACHINE_CLASS(oc);
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||||||
AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
|
AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
|
||||||
|
|
||||||
mc->desc = "OpenPOWER Tacoma BMC (Cortex A7)";
|
mc->desc = "OpenPOWER Tacoma BMC (Cortex-A7)";
|
||||||
amc->soc_name = "ast2600-a1";
|
amc->soc_name = "ast2600-a1";
|
||||||
amc->hw_strap1 = TACOMA_BMC_HW_STRAP1;
|
amc->hw_strap1 = TACOMA_BMC_HW_STRAP1;
|
||||||
amc->hw_strap2 = TACOMA_BMC_HW_STRAP2;
|
amc->hw_strap2 = TACOMA_BMC_HW_STRAP2;
|
||||||
@ -1003,7 +1003,7 @@ static void aspeed_machine_rainier_class_init(ObjectClass *oc, void *data)
|
|||||||
MachineClass *mc = MACHINE_CLASS(oc);
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||||||
AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
|
AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
|
||||||
|
|
||||||
mc->desc = "IBM Rainier BMC (Cortex A7)";
|
mc->desc = "IBM Rainier BMC (Cortex-A7)";
|
||||||
amc->soc_name = "ast2600-a1";
|
amc->soc_name = "ast2600-a1";
|
||||||
amc->hw_strap1 = RAINIER_BMC_HW_STRAP1;
|
amc->hw_strap1 = RAINIER_BMC_HW_STRAP1;
|
||||||
amc->hw_strap2 = RAINIER_BMC_HW_STRAP2;
|
amc->hw_strap2 = RAINIER_BMC_HW_STRAP2;
|
||||||
|
@ -67,7 +67,7 @@ static void mcimx6ul_evk_init(MachineState *machine)
|
|||||||
|
|
||||||
static void mcimx6ul_evk_machine_init(MachineClass *mc)
|
static void mcimx6ul_evk_machine_init(MachineClass *mc)
|
||||||
{
|
{
|
||||||
mc->desc = "Freescale i.MX6UL Evaluation Kit (Cortex A7)";
|
mc->desc = "Freescale i.MX6UL Evaluation Kit (Cortex-A7)";
|
||||||
mc->init = mcimx6ul_evk_init;
|
mc->init = mcimx6ul_evk_init;
|
||||||
mc->max_cpus = FSL_IMX6UL_NUM_CPUS;
|
mc->max_cpus = FSL_IMX6UL_NUM_CPUS;
|
||||||
mc->default_ram_id = "mcimx6ul-evk.ram";
|
mc->default_ram_id = "mcimx6ul-evk.ram";
|
||||||
|
@ -67,7 +67,7 @@ static void mcimx7d_sabre_init(MachineState *machine)
|
|||||||
|
|
||||||
static void mcimx7d_sabre_machine_init(MachineClass *mc)
|
static void mcimx7d_sabre_machine_init(MachineClass *mc)
|
||||||
{
|
{
|
||||||
mc->desc = "Freescale i.MX7 DUAL SABRE (Cortex A7)";
|
mc->desc = "Freescale i.MX7 DUAL SABRE (Cortex-A7)";
|
||||||
mc->init = mcimx7d_sabre_init;
|
mc->init = mcimx7d_sabre_init;
|
||||||
mc->max_cpus = FSL_IMX7_NUM_CPUS;
|
mc->max_cpus = FSL_IMX7_NUM_CPUS;
|
||||||
mc->default_ram_id = "mcimx7d-sabre.ram";
|
mc->default_ram_id = "mcimx7d-sabre.ram";
|
||||||
|
@ -299,7 +299,7 @@ static void npcm750_evb_machine_class_init(ObjectClass *oc, void *data)
|
|||||||
|
|
||||||
npcm7xx_set_soc_type(nmc, TYPE_NPCM750);
|
npcm7xx_set_soc_type(nmc, TYPE_NPCM750);
|
||||||
|
|
||||||
mc->desc = "Nuvoton NPCM750 Evaluation Board (Cortex A9)";
|
mc->desc = "Nuvoton NPCM750 Evaluation Board (Cortex-A9)";
|
||||||
mc->init = npcm750_evb_init;
|
mc->init = npcm750_evb_init;
|
||||||
mc->default_ram_size = 512 * MiB;
|
mc->default_ram_size = 512 * MiB;
|
||||||
};
|
};
|
||||||
@ -311,7 +311,7 @@ static void gsj_machine_class_init(ObjectClass *oc, void *data)
|
|||||||
|
|
||||||
npcm7xx_set_soc_type(nmc, TYPE_NPCM730);
|
npcm7xx_set_soc_type(nmc, TYPE_NPCM730);
|
||||||
|
|
||||||
mc->desc = "Quanta GSJ (Cortex A9)";
|
mc->desc = "Quanta GSJ (Cortex-A9)";
|
||||||
mc->init = quanta_gsj_init;
|
mc->init = quanta_gsj_init;
|
||||||
mc->default_ram_size = 512 * MiB;
|
mc->default_ram_size = 512 * MiB;
|
||||||
};
|
};
|
||||||
|
@ -105,7 +105,7 @@ static void sabrelite_init(MachineState *machine)
|
|||||||
|
|
||||||
static void sabrelite_machine_init(MachineClass *mc)
|
static void sabrelite_machine_init(MachineClass *mc)
|
||||||
{
|
{
|
||||||
mc->desc = "Freescale i.MX6 Quad SABRE Lite Board (Cortex A9)";
|
mc->desc = "Freescale i.MX6 Quad SABRE Lite Board (Cortex-A9)";
|
||||||
mc->init = sabrelite_init;
|
mc->init = sabrelite_init;
|
||||||
mc->max_cpus = FSL_IMX6_NUM_CPUS;
|
mc->max_cpus = FSL_IMX6_NUM_CPUS;
|
||||||
mc->ignore_memory_transaction_failures = true;
|
mc->ignore_memory_transaction_failures = true;
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#define NPCM7XX_CLOCK_REF_HZ (25000000)
|
#define NPCM7XX_CLOCK_REF_HZ (25000000)
|
||||||
|
|
||||||
/* Register Field Definitions */
|
/* Register Field Definitions */
|
||||||
#define NPCM7XX_CLK_WDRCR_CA9C BIT(0) /* Cortex A9 Cores */
|
#define NPCM7XX_CLK_WDRCR_CA9C BIT(0) /* Cortex-A9 Cores */
|
||||||
|
|
||||||
#define PLLCON_LOKI BIT(31)
|
#define PLLCON_LOKI BIT(31)
|
||||||
#define PLLCON_LOKS BIT(30)
|
#define PLLCON_LOKS BIT(30)
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The Allwinner H3 is a System on Chip containing four ARM Cortex A7
|
* The Allwinner H3 is a System on Chip containing four ARM Cortex-A7
|
||||||
* processor cores. Features and specifications include DDR2/DDR3 memory,
|
* processor cores. Features and specifications include DDR2/DDR3 memory,
|
||||||
* SD/MMC storage cards, 10/100/1000Mbit Ethernet, USB 2.0, HDMI and
|
* SD/MMC storage cards, 10/100/1000Mbit Ethernet, USB 2.0, HDMI and
|
||||||
* various I/O modules.
|
* various I/O modules.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user