diff options
| author |   Cédric Le Goater <clg@kaod.org> | 2024-07-17 08:30:21 +0200 |
|---|---|---|
| committer |   Cédric Le Goater <clg@redhat.com> | 2024-07-21 07:46:38 +0200 |
| commit | 621845a9e38215977432cff8c946b78f6820c6b5 (patch) | |
| tree | ac0dfa1089631105329e606d802eb03cb1c3e2c8 | |
| parent | aspeed: Add boot-from-eMMC HW strapping bit to rainier-bmc machine (diff) | |
| download | qemu-621845a9e38215977432cff8c946b78f6820c6b5.tar.xz qemu-621845a9e38215977432cff8c946b78f6820c6b5.zip | |
aspeed: Introduce a 'hw_strap1' machine attribute
To change default behavior of a machine and boot from eMMC, future
changes will add a machine option to let the user configure the
boot-from-eMMC HW strapping bit. Add a new machine attribute first.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Tested-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
| -rw-r--r-- | hw/arm/aspeed.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index a8f5c14ae5..9939559f6d 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -46,6 +46,7 @@ struct AspeedMachineState { uint32_t uart_chosen; char *fmc_model; char *spi_model; + uint32_t hw_strap1; }; /* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ @@ -393,7 +394,7 @@ static void aspeed_machine_init(MachineState *machine) } } - object_property_set_int(OBJECT(bmc->soc), "hw-strap1", amc->hw_strap1, + object_property_set_int(OBJECT(bmc->soc), "hw-strap1", bmc->hw_strap1, &error_abort); object_property_set_int(OBJECT(bmc->soc), "hw-strap2", amc->hw_strap2, &error_abort); @@ -1077,7 +1078,10 @@ static void aspeed_set_mmio_exec(Object *obj, bool value, Error **errp) static void aspeed_machine_instance_init(Object *obj) { + AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(obj); + ASPEED_MACHINE(obj)->mmio_exec = false; + ASPEED_MACHINE(obj)->hw_strap1 = amc->hw_strap1; } static char *aspeed_get_fmc_model(Object *obj, Error **errp) |