[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 06/10] palmetto-bmc: add board specific confi
From: |
Andrew Jeffery |
Subject: |
Re: [Qemu-devel] [PATCH v3 06/10] palmetto-bmc: add board specific configuration |
Date: |
Wed, 03 Aug 2016 09:28:25 +0930 |
On Tue, 2016-08-02 at 19:15 +0200, Cédric Le Goater wrote:
> aspeed_board_init() now uses a board identifier to customize some values
> specific to the board.
>
> Signed-off-by: Cédric Le Goater <address@hidden>
Reviewed-by: Andrew Jeffery <address@hidden>
> ---
>
> Changes since v2:
>
> - removed silicon-rev and cpu-model. This is now in the SoC.
>
> Changes since v1:
>
> - changed aspeed_init() prototype to use a 'const AspeedBoardConfig *'
> - fixed white space issues
>
> hw/arm/aspeed.c | 22 ++++++++++++++++++----
> 1 file changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index ad0a062b5624..4226b8dcd95c 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -30,6 +30,19 @@ typedef struct AspeedBoardState {
> MemoryRegion ram;
> } AspeedBoardState;
>
> +typedef struct AspeedBoardConfig {
> + const char *soc_name;
> + uint32_t hw_strap1;
> +} AspeedBoardConfig;
> +
> +enum {
> + PALMETTO_BMC
> +};
> +
> +static const AspeedBoardConfig aspeed_boards[] = {
> + [PALMETTO_BMC] = { "ast2400-a0", 0x120CE416 },
> +};
> +
> static void aspeed_board_init_flashes(AspeedSMCState *s, const char
> *flashtype,
> Error **errp)
> {
> @@ -56,13 +69,14 @@ static void aspeed_board_init_flashes(AspeedSMCState *s,
> const char *flashtype,
> }
> }
>
> -static void aspeed_board_init(MachineState *machine)
> +static void aspeed_board_init(MachineState *machine,
> + const AspeedBoardConfig *cfg)
> {
> AspeedBoardState *bmc;
> AspeedSoCClass *sc;
>
> bmc = g_new0(AspeedBoardState, 1);
> - object_initialize(&bmc->soc, (sizeof(bmc->soc)), "ast2400-a0");
> + object_initialize(&bmc->soc, (sizeof(bmc->soc)), cfg->soc_name);
> object_property_add_child(OBJECT(machine), "soc", OBJECT(&bmc->soc),
> &error_abort);
>
> @@ -73,7 +87,7 @@ static void aspeed_board_init(MachineState *machine)
> &bmc->ram);
> object_property_add_const_link(OBJECT(&bmc->soc), "ram",
> OBJECT(&bmc->ram),
> &error_abort);
> - object_property_set_int(OBJECT(&bmc->soc), 0x120CE416, "hw-strap1",
> + object_property_set_int(OBJECT(&bmc->soc), cfg->hw_strap1, "hw-strap1",
> &error_abort);
> object_property_set_bool(OBJECT(&bmc->soc), true, "realized",
> &error_abort);
> @@ -93,7 +107,7 @@ static void aspeed_board_init(MachineState *machine)
>
> static void palmetto_bmc_init(MachineState *machine)
> {
> - aspeed_board_init(machine);
> + aspeed_board_init(machine, &aspeed_boards[PALMETTO_BMC]);
> }
>
> static void palmetto_bmc_class_init(ObjectClass *oc, void *data)
signature.asc
Description: This is a digitally signed message part
- Re: [Qemu-devel] [PATCH v3 03/10] aspeed-soc: provide a framework to add new SoCs, (continued)
[Qemu-devel] [PATCH v3 04/10] palmetto-bmc: rename the Aspeed board file to aspeed.c, Cédric Le Goater, 2016/08/02
[Qemu-devel] [PATCH v3 05/10] palmetto-bmc: replace palmetto_bmc with aspeed, Cédric Le Goater, 2016/08/02
[Qemu-devel] [PATCH v3 06/10] palmetto-bmc: add board specific configuration, Cédric Le Goater, 2016/08/02
[Qemu-devel] [PATCH v3 07/10] hw/misc: use macros to define hw-strap1 register on the AST2400 Aspeed SoC, Cédric Le Goater, 2016/08/02
[Qemu-devel] [PATCH v3 08/10] aspeed: add a AST2500 SoC and support to the SCU and SDMC controllers controllers, Cédric Le Goater, 2016/08/02
[Qemu-devel] [PATCH v3 09/10] arm: add support for an ast2500 evaluation board, Cédric Le Goater, 2016/08/02