| Message ID | ce8c6fc807907f6e7cce7bfefd8326de64635af6.1507059418.git.alistair.francis@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 03, 2017 at 01:05:11PM -0700, Alistair Francis wrote: > List all possible valid CPU options. > > Although the board only ever has a Cortex-M3 we mark the Cortex-M4 as > supported because the Netduino2 Plus supports the Cortex-M4 and the > Netduino2 Plus is similar to the Netduino2. > > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
On 10/03/2017 05:05 PM, Alistair Francis wrote: > List all possible valid CPU options. > > Although the board only ever has a Cortex-M3 we mark the Cortex-M4 as > supported because the Netduino2 Plus supports the Cortex-M4 and the > Netduino2 Plus is similar to the Netduino2. > > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > > RFC v2: > - Use a NULL terminated list > - Add the Cortex-M4 for testing > > > hw/arm/netduino2.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c > index f936017d4a..b68ecf2c08 100644 > --- a/hw/arm/netduino2.c > +++ b/hw/arm/netduino2.c > @@ -34,18 +34,25 @@ static void netduino2_init(MachineState *machine) > DeviceState *dev; > > dev = qdev_create(NULL, TYPE_STM32F205_SOC); > - qdev_prop_set_string(dev, "cpu-type", ARM_CPU_TYPE_NAME("cortex-m3")); > + qdev_prop_set_string(dev, "cpu-type", machine->cpu_type); > object_property_set_bool(OBJECT(dev), true, "realized", &error_fatal); > > armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, > FLASH_SIZE); > } > > +const char *netduino_valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-m3"), > + ARM_CPU_TYPE_NAME("cortex-m4"), > + NULL > + }; > + > static void netduino2_machine_init(MachineClass *mc) > { > mc->desc = "Netduino 2 Machine"; > mc->init = netduino2_init; > mc->ignore_memory_transaction_failures = true; > + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3"); > + mc->valid_cpu_types = netduino_valid_cpus; > } > > DEFINE_MACHINE("netduino2", netduino2_machine_init) >
On Tue, 3 Oct 2017 13:05:11 -0700 Alistair Francis <alistair.francis@xilinx.com> wrote: > List all possible valid CPU options. > > Although the board only ever has a Cortex-M3 we mark the Cortex-M4 as > supported because the Netduino2 Plus supports the Cortex-M4 and the > Netduino2 Plus is similar to the Netduino2. > > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> > --- > > RFC v2: > - Use a NULL terminated list > - Add the Cortex-M4 for testing > > > hw/arm/netduino2.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c > index f936017d4a..b68ecf2c08 100644 > --- a/hw/arm/netduino2.c > +++ b/hw/arm/netduino2.c > @@ -34,18 +34,25 @@ static void netduino2_init(MachineState *machine) > DeviceState *dev; > > dev = qdev_create(NULL, TYPE_STM32F205_SOC); > - qdev_prop_set_string(dev, "cpu-type", ARM_CPU_TYPE_NAME("cortex-m3")); > + qdev_prop_set_string(dev, "cpu-type", machine->cpu_type); > object_property_set_bool(OBJECT(dev), true, "realized", &error_fatal); > > armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, > FLASH_SIZE); > } > > +const char *netduino_valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-m3"), style nit, ^^^ put entries on new line with typical 4 space alignment > + ARM_CPU_TYPE_NAME("cortex-m4"), > + NULL > + }; > + > static void netduino2_machine_init(MachineClass *mc) > { > mc->desc = "Netduino 2 Machine"; > mc->init = netduino2_init; > mc->ignore_memory_transaction_failures = true; > + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3"); > + mc->valid_cpu_types = netduino_valid_cpus; > } > > DEFINE_MACHINE("netduino2", netduino2_machine_init)
On Wed, Oct 4, 2017 at 4:02 AM, Igor Mammedov <imammedo@redhat.com> wrote: > On Tue, 3 Oct 2017 13:05:11 -0700 > Alistair Francis <alistair.francis@xilinx.com> wrote: > >> List all possible valid CPU options. >> >> Although the board only ever has a Cortex-M3 we mark the Cortex-M4 as >> supported because the Netduino2 Plus supports the Cortex-M4 and the >> Netduino2 Plus is similar to the Netduino2. >> >> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> >> --- >> >> RFC v2: >> - Use a NULL terminated list >> - Add the Cortex-M4 for testing >> >> >> hw/arm/netduino2.c | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c >> index f936017d4a..b68ecf2c08 100644 >> --- a/hw/arm/netduino2.c >> +++ b/hw/arm/netduino2.c >> @@ -34,18 +34,25 @@ static void netduino2_init(MachineState *machine) >> DeviceState *dev; >> >> dev = qdev_create(NULL, TYPE_STM32F205_SOC); >> - qdev_prop_set_string(dev, "cpu-type", ARM_CPU_TYPE_NAME("cortex-m3")); >> + qdev_prop_set_string(dev, "cpu-type", machine->cpu_type); >> object_property_set_bool(OBJECT(dev), true, "realized", &error_fatal); >> >> armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, >> FLASH_SIZE); >> } >> >> +const char *netduino_valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-m3"), > style nit, ^^^ put entries on new line with typical 4 space alignment Do you mean like this? const char *netduino_valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-m3"), ARM_CPU_TYPE_NAME("cortex-m4"), NULL }; Thanks, Alistair >> + ARM_CPU_TYPE_NAME("cortex-m4"), >> + NULL >> + }; > >> + >> static void netduino2_machine_init(MachineClass *mc) >> { >> mc->desc = "Netduino 2 Machine"; >> mc->init = netduino2_init; >> mc->ignore_memory_transaction_failures = true; >> + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3"); >> + mc->valid_cpu_types = netduino_valid_cpus; >> } >> >> DEFINE_MACHINE("netduino2", netduino2_machine_init) >
>>> +const char *netduino_valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-m3"), >> style nit, ^^^ put entries on new line with typical 4 space alignment > > Do you mean like this? > > const char *netduino_valid_cpus[] = { > ARM_CPU_TYPE_NAME("cortex-m3"), > ARM_CPU_TYPE_NAME("cortex-m4"), > NULL }; I suppose he meant: static const char *netduino_valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-m3"), ARM_CPU_TYPE_NAME("cortex-m4"), NULL };
On Wed, 4 Oct 2017 19:21:09 -0300 Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > >>> +const char *netduino_valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-m3"), > >> style nit, ^^^ put entries on new line with typical 4 space alignment > > > > Do you mean like this? > > > > const char *netduino_valid_cpus[] = { > > ARM_CPU_TYPE_NAME("cortex-m3"), > > ARM_CPU_TYPE_NAME("cortex-m4"), > > NULL }; > > I suppose he meant: > > static const char *netduino_valid_cpus[] = { > ARM_CPU_TYPE_NAME("cortex-m3"), > ARM_CPU_TYPE_NAME("cortex-m4"), > NULL > }; Thanks, that's exactly what I've meant.
diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index f936017d4a..b68ecf2c08 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -34,18 +34,25 @@ static void netduino2_init(MachineState *machine) DeviceState *dev; dev = qdev_create(NULL, TYPE_STM32F205_SOC); - qdev_prop_set_string(dev, "cpu-type", ARM_CPU_TYPE_NAME("cortex-m3")); + qdev_prop_set_string(dev, "cpu-type", machine->cpu_type); object_property_set_bool(OBJECT(dev), true, "realized", &error_fatal); armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, FLASH_SIZE); } +const char *netduino_valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-m3"), + ARM_CPU_TYPE_NAME("cortex-m4"), + NULL + }; + static void netduino2_machine_init(MachineClass *mc) { mc->desc = "Netduino 2 Machine"; mc->init = netduino2_init; mc->ignore_memory_transaction_failures = true; + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3"); + mc->valid_cpu_types = netduino_valid_cpus; } DEFINE_MACHINE("netduino2", netduino2_machine_init)
List all possible valid CPU options. Although the board only ever has a Cortex-M3 we mark the Cortex-M4 as supported because the Netduino2 Plus supports the Cortex-M4 and the Netduino2 Plus is similar to the Netduino2. Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> --- RFC v2: - Use a NULL terminated list - Add the Cortex-M4 for testing hw/arm/netduino2.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)