| Message ID | 20200227220149.6845-2-nieklinnenbank@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm/cubieboard: correct CPU type and add machine argument checks | expand |
On Thu, 27 Feb 2020 at 22:01, Niek Linnenbank <nieklinnenbank@gmail.com> wrote: > > The Cubieboard is a singleboard computer with an Allwinner A10 System-on-Chip [1]. > As documented in the Allwinner A10 User Manual V1.5 [2], the SoC has an ARM > Cortex-A8 processor. Currently the Cubieboard machine definition specifies the > ARM Cortex-A9 in its description and as the default CPU. > > This patch corrects the Cubieboard machine definition to use the ARM Cortex-A8. > > [1] http://docs.cubieboard.org/products/start#cubieboard1 > [2] https://linux-sunxi.org/File:Allwinner_A10_User_manual_V1.5.pdf > > Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com> > --- > hw/arm/cubieboard.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c > index 089f9a30c1..0195925c73 100644 > --- a/hw/arm/cubieboard.c > +++ b/hw/arm/cubieboard.c > @@ -68,8 +68,8 @@ static void cubieboard_init(MachineState *machine) > > static void cubieboard_machine_init(MachineClass *mc) > { > - mc->desc = "cubietech cubieboard (Cortex-A9)"; > - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9"); > + mc->desc = "cubietech cubieboard (Cortex-A8)"; > + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8"); > mc->init = cubieboard_init; > mc->block_default_type = IF_IDE; > mc->units_per_default_bus = 1; This is worth fixing, but I'm pretty sure it doesn't have any user-visible effects, because the CPU is created by hw/arm/allwinner-a10.c:aw_a10_init(), which always uses cortex-a8 regardless of what the user specified on the command line or what the mc->default_cpu_type is. Fixes: 8a863c8120994981a099 Reviewed-by: Peter Maydell <peter.maydell@linaro.org> if you tweak the commit message to mention that it wasn't a user-visible bug (but I'll do that myself if there isn't anything else in the series that means it needs a respin). thanks -- PMM
On 3/2/20 4:32 PM, Peter Maydell wrote: > On Thu, 27 Feb 2020 at 22:01, Niek Linnenbank <nieklinnenbank@gmail.com> wrote: >> >> The Cubieboard is a singleboard computer with an Allwinner A10 System-on-Chip [1]. >> As documented in the Allwinner A10 User Manual V1.5 [2], the SoC has an ARM >> Cortex-A8 processor. Currently the Cubieboard machine definition specifies the >> ARM Cortex-A9 in its description and as the default CPU. >> >> This patch corrects the Cubieboard machine definition to use the ARM Cortex-A8. >> >> [1] http://docs.cubieboard.org/products/start#cubieboard1 >> [2] https://linux-sunxi.org/File:Allwinner_A10_User_manual_V1.5.pdf >> >> Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com> >> --- >> hw/arm/cubieboard.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c >> index 089f9a30c1..0195925c73 100644 >> --- a/hw/arm/cubieboard.c >> +++ b/hw/arm/cubieboard.c >> @@ -68,8 +68,8 @@ static void cubieboard_init(MachineState *machine) >> >> static void cubieboard_machine_init(MachineClass *mc) >> { >> - mc->desc = "cubietech cubieboard (Cortex-A9)"; >> - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9"); >> + mc->desc = "cubietech cubieboard (Cortex-A8)"; >> + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8"); >> mc->init = cubieboard_init; >> mc->block_default_type = IF_IDE; >> mc->units_per_default_bus = 1; > > This is worth fixing, but I'm pretty sure it doesn't have > any user-visible effects, because the CPU is created by > hw/arm/allwinner-a10.c:aw_a10_init(), which always uses > cortex-a8 regardless of what the user specified on the command > line or what the mc->default_cpu_type is. It is worth fixing if we continue the MachineClass code cleanup Igor wants (moving the ram size / cpu type checks in the machine common code). > > Fixes: 8a863c8120994981a099 > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > if you tweak the commit message to mention that it > wasn't a user-visible bug (but I'll do that myself if there > isn't anything else in the series that means it needs a respin). > > thanks > -- PMM >
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index 089f9a30c1..0195925c73 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -68,8 +68,8 @@ static void cubieboard_init(MachineState *machine) static void cubieboard_machine_init(MachineClass *mc) { - mc->desc = "cubietech cubieboard (Cortex-A9)"; - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9"); + mc->desc = "cubietech cubieboard (Cortex-A8)"; + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8"); mc->init = cubieboard_init; mc->block_default_type = IF_IDE; mc->units_per_default_bus = 1;
The Cubieboard is a singleboard computer with an Allwinner A10 System-on-Chip [1]. As documented in the Allwinner A10 User Manual V1.5 [2], the SoC has an ARM Cortex-A8 processor. Currently the Cubieboard machine definition specifies the ARM Cortex-A9 in its description and as the default CPU. This patch corrects the Cubieboard machine definition to use the ARM Cortex-A8. [1] http://docs.cubieboard.org/products/start#cubieboard1 [2] https://linux-sunxi.org/File:Allwinner_A10_User_manual_V1.5.pdf Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com> --- hw/arm/cubieboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)