hw/arm/aspeed: Add machine properties to define the flash models
PATCH 1/1 hw/arm/aspeed: Add machine properties to define the flash models
Some machines don't have much differences a part from the flash model being used. Introduce new machine properties to change them from the command line.
Cc 郁雷 <[email protected]>
Signed-off-by Cédric Le Goater <[email protected]>
--- hw/arm/aspeed.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-)
hw/arm/aspeed.c +43 -2
@@ -41,6 +41,8 @@ struct AspeedMachineState {MemoryRegion ram_container;MemoryRegion max_ram;bool mmio_exec; +char *fmc_model; +char *spi_model; };/* Palmetto hardware value: 0x120CE416 */
@@ -332,8 +334,10 @@ static void aspeed_machine_init(MachineState *machine) "max_ram", max_ram_size - ram_size);memory_region_add_subregion (&bmc->ram_container, ram_size, &bmc->max_ram); -aspeed_board_init_flashes (&bmc->soc.fmc, amc->fmc_model); -aspeed_board_init_flashes (&bmc->soc.spi[0 ], amc->spi_model); +aspeed_board_init_flashes (&bmc->soc.fmc, bmc->fmc_model ? + bmc->fmc_model : amc->fmc_model); +aspeed_board_init_flashes (&bmc->soc.spi[0 ], bmc->spi_model ? + bmc->spi_model : amc->spi_model);/* Install first FMC flash content as a boot rom. */ if (drive0) {
@@ -570,6 +574,34 @@ static void aspeed_machine_instance_init(Object *obj)ASPEED_MACHINE (obj)->mmio_exec = false; } +static char *aspeed_get_fmc_model (Object *obj,Error **errp) +{ +AspeedMachineState *bmc =ASPEED_MACHINE (obj); +return g_strdup (bmc->fmc_model); +} + +static void aspeed_set_fmc_model (Object *obj,const char *value,Error **errp) +{ +AspeedMachineState *bmc =ASPEED_MACHINE (obj); + +g_free (bmc->fmc_model); + bmc->fmc_model =g_strdup (value); +} + +static char *aspeed_get_spi_model (Object *obj,Error **errp) +{ +AspeedMachineState *bmc =ASPEED_MACHINE (obj); +return g_strdup (bmc->spi_model); +} + +static void aspeed_set_spi_model (Object *obj,const char *value,Error **errp) +{ +AspeedMachineState *bmc =ASPEED_MACHINE (obj); + +g_free (bmc->spi_model); + bmc->spi_model =g_strdup (value); +} +static void aspeed_machine_class_props_init (ObjectClass *oc) { object_class_property_add_bool(oc, "execute-in-place",
@@ -577,6 +609,15 @@ static void aspeed_machine_class_props_init(ObjectClass *oc) aspeed_set_mmio_exec);object_class_property_set_description (oc,"execute-in-place" ,"boot directly from CE0 flash device" ); + +object_class_property_add_str (oc,"fmc-model" , aspeed_get_fmc_model, + aspeed_set_fmc_model); +object_class_property_set_description (oc,"fmc-model" , +"Change the FMC Flash model" ); +object_class_property_add_str (oc,"spi-model" , aspeed_get_spi_model, + aspeed_set_spi_model); +object_class_property_set_description (oc,"spi-model" , +"Change the SPI Flash model" ); }static int aspeed_soc_num_cpus (const char *soc_name)
Signature · 1 line
2.25.4
Quoted 7 lines · Cédric Le Goater
Some machines don't have much differences a part from the flash model being used. Introduce new machine properties to change them from the command line.
Cc 郁雷 <[email protected]>Signed-off-by Cédric Le Goater <[email protected]>
Reviewed-by Joel Stanley <[email protected]>
A nice feature! Can you add an example command line in the commit message?
We have docs/system/arm/aspeed.rst where we could add the supported options and some examples of different sized flashes. I know of 16, 32, 64 and 128MB machines out there.
Cheers,
Joel