| Message ID | 20180503090532.3113-3-joel@jms.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | arm: Add nRF51 SoC and micro:bit machine | expand |
On 3 May 2018 at 10:05, Joel Stanley <joel@jms.id.au> wrote: > This adds the base for a machine model of the BBC micro:bit: > > https://en.wikipedia.org/wiki/Micro_Bit > > This is a system with a nRF51 SoC containing the main processor, with > various peripherals on board. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > hw/arm/Makefile.objs | 2 +- > hw/arm/microbit.c | 33 +++++++++++++++++++++++++++++++++ > 2 files changed, 34 insertions(+), 1 deletion(-) > create mode 100644 hw/arm/microbit.c > > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs > index 1d7211850454..c01e7a1e39fb 100644 > --- a/hw/arm/Makefile.objs > +++ b/hw/arm/Makefile.objs > @@ -35,4 +35,4 @@ obj-$(CONFIG_MPS2) += mps2-tz.o > obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o > obj-$(CONFIG_IOTKIT) += iotkit.o > obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o > -obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o > +obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o microbit.o > diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c > new file mode 100644 > index 000000000000..b61d0747fe56 > --- /dev/null > +++ b/hw/arm/microbit.c > @@ -0,0 +1,33 @@ > +/* > + * BBC micro:bit machine > + * > + * Copyright 2018 Joel Stanley <joel@jms.id.au> > + * > + * This code is licensed under the GPL version 2 or later. See > + * the COPYING file in the top-level directory. Is there a datasheet URL? If so this is a good place to give it. > + */ > + > +#include "qemu/osdep.h" > +#include "qapi/error.h" > +#include "hw/boards.h" > + > +#include "hw/arm/nrf51_soc.h" > + > +static void microbit_init(MachineState *machine) > +{ > + DeviceState *dev; > + > + dev = qdev_create(NULL, TYPE_NRF51_SOC); > + if (machine->kernel_filename) { > + qdev_prop_set_string(dev, "kernel-filename", machine->kernel_filename); > + } > + object_property_set_bool(OBJECT(dev), true, "realized", &error_fatal); > +} > + > +static void microbit_machine_init(MachineClass *mc) > +{ > + mc->desc = "BBC micro:bit"; > + mc->init = microbit_init; > + mc->ignore_memory_transaction_failures = true; ignore_memory_transaction_failures is a flag for legacy machine models only; please don't set it for a new board model. (Instead, just provide stubs via unimplemented_device for any devices or areas of memory that need to exist for guest code to run.) thanks -- PMM
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 1d7211850454..c01e7a1e39fb 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -35,4 +35,4 @@ obj-$(CONFIG_MPS2) += mps2-tz.o obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o obj-$(CONFIG_IOTKIT) += iotkit.o obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o -obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o +obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o microbit.o diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c new file mode 100644 index 000000000000..b61d0747fe56 --- /dev/null +++ b/hw/arm/microbit.c @@ -0,0 +1,33 @@ +/* + * BBC micro:bit machine + * + * Copyright 2018 Joel Stanley <joel@jms.id.au> + * + * This code is licensed under the GPL version 2 or later. See + * the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/boards.h" + +#include "hw/arm/nrf51_soc.h" + +static void microbit_init(MachineState *machine) +{ + DeviceState *dev; + + dev = qdev_create(NULL, TYPE_NRF51_SOC); + if (machine->kernel_filename) { + qdev_prop_set_string(dev, "kernel-filename", machine->kernel_filename); + } + object_property_set_bool(OBJECT(dev), true, "realized", &error_fatal); +} + +static void microbit_machine_init(MachineClass *mc) +{ + mc->desc = "BBC micro:bit"; + mc->init = microbit_init; + mc->ignore_memory_transaction_failures = true; +} +DEFINE_MACHINE("microbit", microbit_machine_init);
This adds the base for a machine model of the BBC micro:bit: https://en.wikipedia.org/wiki/Micro_Bit This is a system with a nRF51 SoC containing the main processor, with various peripherals on board. Signed-off-by: Joel Stanley <joel@jms.id.au> --- hw/arm/Makefile.objs | 2 +- hw/arm/microbit.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 hw/arm/microbit.c -- 2.17.0