No need to use an intermediate 'flash-size' property in the
SoC object. Alias the property, so when the machine (here
microbit) sets the value on the SoC, it is propagated to
the flash object.
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
hw/arm/microbit.c | 5 ++++-
hw/arm/nrf51_soc.c | 10 +---------
hw/nvram/nrf51_nvm.c | 6 +++++-
include/hw/arm/nrf51_soc.h | 1 -
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
index 50df362088..79b5574884 100644
--- a/hw/arm/microbit.c
+++ b/hw/arm/microbit.c
@@ -36,6 +36,7 @@ static void microbit_init(MachineState *machine)
MicrobitMachineState *s = MICROBIT_MACHINE(machine);
MemoryRegion *system_memory = get_system_memory();
MemoryRegion *mr;
+ int64_t flash_size;
object_initialize_child(OBJECT(machine), "nrf51", &s->nrf51,
TYPE_NRF51_SOC);
@@ -43,6 +44,8 @@ static void microbit_init(MachineState *machine)
object_property_set_link(OBJECT(&s->nrf51), "memory",
OBJECT(system_memory), &error_fatal);
sysbus_realize(SYS_BUS_DEVICE(&s->nrf51), &error_fatal);
+ flash_size = object_property_get_int(OBJECT(&s->nrf51),
+ "flash-size", &error_abort);
/*
* Overlap the TWI stub device into the SoC. This is a microbit-specific
@@ -57,7 +60,7 @@ static void microbit_init(MachineState *machine)
mr, -1);
armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
- 0, s->nrf51.flash_size);
+ 0, flash_size);
}
static void microbit_machine_class_init(ObjectClass *oc, void *data)
diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index 34da0d62f0..cc4a636c51 100644
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -24,9 +24,7 @@
* are supported in the future, add a sub-class of NRF51SoC for
* the specific variants
*/
-#define NRF51822_FLASH_PAGES 256
#define NRF51822_SRAM_PAGES 16
-#define NRF51822_FLASH_SIZE (NRF51822_FLASH_PAGES * NRF51_PAGE_SIZE)
#define NRF51822_SRAM_SIZE (NRF51822_SRAM_PAGES * NRF51_PAGE_SIZE)
#define BASE_TO_IRQ(base) ((base >> 12) & 0x1F)
@@ -122,11 +120,6 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error
**errp)
BASE_TO_IRQ(NRF51_RNG_BASE)));
/* UICR, FICR, NVMC, FLASH */
- if (!object_property_set_uint(OBJECT(&s->nvm), "flash-size",
- s->flash_size, errp)) {
- return;
- }
-
if (!sysbus_realize(SYS_BUS_DEVICE(&s->nvm), errp)) {
return;
}
@@ -199,6 +192,7 @@ static void nrf51_soc_init(Object *obj)
object_initialize_child(obj, "rng", &s->rng, TYPE_NRF51_RNG);
object_initialize_child(obj, "nvm", &s->nvm, TYPE_NRF51_NVM);
+ object_property_add_alias(obj, "flash-size", OBJECT(&s->nvm),
"flash-size");
object_initialize_child(obj, "gpio", &s->gpio, TYPE_NRF51_GPIO);
@@ -215,8 +209,6 @@ static Property nrf51_soc_properties[] = {
DEFINE_PROP_LINK("memory", NRF51State, board_memory, TYPE_MEMORY_REGION,
MemoryRegion *),
DEFINE_PROP_UINT32("sram-size", NRF51State, sram_size, NRF51822_SRAM_SIZE),
- DEFINE_PROP_UINT32("flash-size", NRF51State, flash_size,
- NRF51822_FLASH_SIZE),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c
index 7f1db8c423..bfae028fcd 100644
--- a/hw/nvram/nrf51_nvm.c
+++ b/hw/nvram/nrf51_nvm.c
@@ -26,6 +26,9 @@
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
+#define NRF51822_FLASH_PAGES 256
+#define NRF51822_FLASH_SIZE (NRF51822_FLASH_PAGES * NRF51_PAGE_SIZE)
+
/*
* FICR Registers Assignments
* CODEPAGESIZE 0x010
@@ -358,7 +361,8 @@ static void nrf51_nvm_reset(DeviceState *dev)
}
static Property nrf51_nvm_properties[] = {
- DEFINE_PROP_UINT32("flash-size", NRF51NVMState, flash_size, 0x40000),
+ DEFINE_PROP_UINT32("flash-size", NRF51NVMState,
+ flash_size, NRF51822_FLASH_SIZE),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h
index e52a56e75e..8cf0c21614 100644
--- a/include/hw/arm/nrf51_soc.h
+++ b/include/hw/arm/nrf51_soc.h
@@ -45,7 +45,6 @@ struct NRF51State {
MemoryRegion twi;
uint32_t sram_size;
- uint32_t flash_size;
MemoryRegion *board_memory;
--
2.38.1
