diff options
Diffstat (limited to 'hw/arm/microbit.c')
| -rw-r--r-- | hw/arm/microbit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index 50df362..525443f 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -12,8 +12,8 @@ #include "qapi/error.h" #include "hw/boards.h" #include "hw/arm/boot.h" -#include "sysemu/sysemu.h" -#include "exec/address-spaces.h" +#include "system/system.h" +#include "system/address-spaces.h" #include "hw/arm/nrf51_soc.h" #include "hw/i2c/microbit_i2c.h" @@ -56,11 +56,11 @@ static void microbit_init(MachineState *machine) memory_region_add_subregion_overlap(&s->nrf51.container, NRF51_TWI_BASE, mr, -1); - armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, + armv7m_load_kernel(s->nrf51.armv7m.cpu, machine->kernel_filename, 0, s->nrf51.flash_size); } -static void microbit_machine_class_init(ObjectClass *oc, void *data) +static void microbit_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); |