[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v6 3/3] arm: Add BBC micro:bit machine
From: |
Joel Stanley |
Subject: |
[Qemu-arm] [PATCH v6 3/3] arm: Add BBC micro:bit machine |
Date: |
Fri, 31 Aug 2018 15:09:20 -0700 |
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.
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Joel Stanley <address@hidden>
---
v2:
- Instead of setting kernel filename property, load the image directly
- Add link to hardware overview website
v3:
- Rebase microbit on m0 changes
- Remove hard-coded flash size and retrieve from the soc
- Add Stefan's reviewed-by
v5:
- move back to armv7m calls, as v4 of Stefan's patch removed the
m_profile changes
v6:
- MICROBITMachineState -> MicrobitMachineState
- Rework machine type init with PMM's suggestions
---
hw/arm/Makefile.objs | 2 +-
hw/arm/microbit.c | 67 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletion(-)
create mode 100644 hw/arm/microbit.c
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index ae4e20373b9e..5f88062c666d 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -37,4 +37,4 @@ obj-$(CONFIG_IOTKIT) += iotkit.o
obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o
obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.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..e7d74116a504
--- /dev/null
+++ b/hw/arm/microbit.c
@@ -0,0 +1,67 @@
+/*
+ * BBC micro:bit machine
+ * http://tech.microbit.org/hardware/
+ *
+ * Copyright 2018 Joel Stanley <address@hidden>
+ *
+ * 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/arm.h"
+#include "exec/address-spaces.h"
+
+#include "hw/arm/nrf51_soc.h"
+
+typedef struct {
+ MachineState parent;
+
+ NRF51State nrf51;
+} MicrobitMachineState;
+
+#define TYPE_MICROBIT_MACHINE MACHINE_TYPE_NAME("microbit")
+
+#define MICROBIT_MACHINE(obj) \
+ OBJECT_CHECK(MicrobitMachineState, obj, TYPE_MICROBIT_MACHINE)
+
+static void microbit_init(MachineState *machine)
+{
+ MicrobitMachineState *s = MICROBIT_MACHINE(machine);
+ MemoryRegion *system_memory = get_system_memory();
+ Object *soc = OBJECT(&s->nrf51);
+
+ sysbus_init_child_obj(OBJECT(machine), "nrf51", soc, sizeof(s->nrf51),
+ TYPE_NRF51_SOC);
+ object_property_set_link(soc, OBJECT(system_memory), "memory",
+ &error_fatal);
+ object_property_set_bool(soc, true, "realized", &error_fatal);
+
+ armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
+ NRF51_SOC(soc)->flash_size);
+}
+
+static void microbit_machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->desc = "BBC micro:bit";
+ mc->init = microbit_init;
+ mc->max_cpus = 1;
+}
+
+static const TypeInfo microbit_info = {
+ .name = TYPE_MICROBIT_MACHINE,
+ .parent = TYPE_MACHINE,
+ .instance_size = sizeof(MicrobitMachineState),
+ .class_init = microbit_machine_class_init,
+};
+
+static void microbit_machine_init(void)
+{
+ type_register_static(µbit_info);
+}
+
+type_init(microbit_machine_init);
--
2.17.1