| Message ID | 40f97ae32a6f21d8184c1cc46fad2defb302238d.1576227325.git.alistair@alistair23.me |
|---|---|
| State | New |
| Headers | show |
| Series | Add the STM32F405 and Netduino Plus 2 machine | expand |
On Sat, 14 Dec 2019 at 02:44, Alistair Francis <alistair@alistair23.me> wrote: > > Signed-off-by: Alistair Francis <alistair@alistair23.me> > --- > MAINTAINERS | 6 +++++ > hw/arm/Kconfig | 3 +++ > hw/arm/Makefile.objs | 1 + > hw/arm/netduinoplus2.c | 52 ++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 62 insertions(+) > create mode 100644 hw/arm/netduinoplus2.c > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 7bfdc3a7ac..881e7f56e7 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -105,6 +105,9 @@ config NETDUINOPLUS2 > bool > select STM32F405_SOC > > +config NETDUINOPLUS2 > + bool > + > config NSERIES > bool > select OMAP Something odd has happened here -- your patch 1/4 already had a stanza: +config NETDUINOPLUS2 + bool + select STM32F405_SOC so either that should be in this patch or this fragment here should just be deleted. Assuming you sort that out, Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On Tue, Dec 17, 2019 at 8:03 AM Peter Maydell <peter.maydell@linaro.org> wrote: > > On Sat, 14 Dec 2019 at 02:44, Alistair Francis <alistair@alistair23.me> wrote: > > > > Signed-off-by: Alistair Francis <alistair@alistair23.me> > > --- > > MAINTAINERS | 6 +++++ > > hw/arm/Kconfig | 3 +++ > > hw/arm/Makefile.objs | 1 + > > hw/arm/netduinoplus2.c | 52 ++++++++++++++++++++++++++++++++++++++++++ > > 4 files changed, 62 insertions(+) > > create mode 100644 hw/arm/netduinoplus2.c > > > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > > index 7bfdc3a7ac..881e7f56e7 100644 > > --- a/hw/arm/Kconfig > > +++ b/hw/arm/Kconfig > > @@ -105,6 +105,9 @@ config NETDUINOPLUS2 > > bool > > select STM32F405_SOC > > > > +config NETDUINOPLUS2 > > + bool > > + > > config NSERIES > > bool > > select OMAP > > Something odd has happened here -- your patch 1/4 already > had a stanza: > > +config NETDUINOPLUS2 > + bool > + select STM32F405_SOC > > so either that should be in this patch or this fragment here > should just be deleted. Good catch. It kind of makes sense to have that fragment in this patch, but then I don't see a nice way to build the flies as they are added, so I removed the fragment from this patch. > > Assuming you sort that out, > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Thanks Peter Alistair > > thanks > -- PMM
diff --git a/MAINTAINERS b/MAINTAINERS index 10230b3212..b9dd2a11bc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -828,6 +828,12 @@ M: Peter Maydell <peter.maydell@linaro.org> S: Maintained F: hw/arm/netduino2.c +Netduino Plus 2 +M: Alistair Francis <alistair@alistair23.me> +M: Peter Maydell <peter.maydell@linaro.org> +S: Maintained +F: hw/arm/netduinoplus2.c + SmartFusion2 M: Subbaraya Sundeep <sundeep.lkml@gmail.com> M: Peter Maydell <peter.maydell@linaro.org> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 7bfdc3a7ac..881e7f56e7 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -105,6 +105,9 @@ config NETDUINOPLUS2 bool select STM32F405_SOC +config NETDUINOPLUS2 + bool + config NSERIES bool select OMAP diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index d9d54da7cf..336f6dd374 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -11,6 +11,7 @@ obj-$(CONFIG_MAINSTONE) += mainstone.o obj-$(CONFIG_MICROBIT) += microbit.o obj-$(CONFIG_MUSICPAL) += musicpal.o obj-$(CONFIG_NETDUINO2) += netduino2.o +obj-$(CONFIG_NETDUINOPLUS2) += netduinoplus2.o obj-$(CONFIG_NSERIES) += nseries.o obj-$(CONFIG_SX1) += omap_sx1.o obj-$(CONFIG_CHEETAH) += palm.o diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c new file mode 100644 index 0000000000..e5e247edbe --- /dev/null +++ b/hw/arm/netduinoplus2.c @@ -0,0 +1,52 @@ +/* + * Netduino Plus 2 Machine Model + * + * Copyright (c) 2014 Alistair Francis <alistair@alistair23.me> + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/boards.h" +#include "hw/qdev-properties.h" +#include "qemu/error-report.h" +#include "hw/arm/stm32f405_soc.h" +#include "hw/arm/boot.h" + +static void netduinoplus2_init(MachineState *machine) +{ + DeviceState *dev; + + dev = qdev_create(NULL, TYPE_STM32F405_SOC); + qdev_prop_set_string(dev, "cpu-type", ARM_CPU_TYPE_NAME("cortex-m4")); + object_property_set_bool(OBJECT(dev), true, "realized", &error_fatal); + + armv7m_load_kernel(ARM_CPU(first_cpu), + machine->kernel_filename, + FLASH_SIZE); +} + +static void netduinoplus2_machine_init(MachineClass *mc) +{ + mc->desc = "Netduino Plus 2 Machine"; + mc->init = netduinoplus2_init; +} + +DEFINE_MACHINE("netduinoplus2", netduinoplus2_machine_init)
Signed-off-by: Alistair Francis <alistair@alistair23.me> --- MAINTAINERS | 6 +++++ hw/arm/Kconfig | 3 +++ hw/arm/Makefile.objs | 1 + hw/arm/netduinoplus2.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 hw/arm/netduinoplus2.c