mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-11 03:24:58 -06:00
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>
This commit is contained in:
parent
01ea09eb7a
commit
621845a9e3
1 changed files with 5 additions and 1 deletions
|
@ -46,6 +46,7 @@ struct AspeedMachineState {
|
||||||
uint32_t uart_chosen;
|
uint32_t uart_chosen;
|
||||||
char *fmc_model;
|
char *fmc_model;
|
||||||
char *spi_model;
|
char *spi_model;
|
||||||
|
uint32_t hw_strap1;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */
|
/* 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);
|
&error_abort);
|
||||||
object_property_set_int(OBJECT(bmc->soc), "hw-strap2", amc->hw_strap2,
|
object_property_set_int(OBJECT(bmc->soc), "hw-strap2", amc->hw_strap2,
|
||||||
&error_abort);
|
&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)
|
static void aspeed_machine_instance_init(Object *obj)
|
||||||
{
|
{
|
||||||
|
AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(obj);
|
||||||
|
|
||||||
ASPEED_MACHINE(obj)->mmio_exec = false;
|
ASPEED_MACHINE(obj)->mmio_exec = false;
|
||||||
|
ASPEED_MACHINE(obj)->hw_strap1 = amc->hw_strap1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *aspeed_get_fmc_model(Object *obj, Error **errp)
|
static char *aspeed_get_fmc_model(Object *obj, Error **errp)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue