OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

palmetto-bmc: add board specific configuration

Browse Source 
aspeed_board_init() now uses a board identifier to customize some values
specific to the board.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1473438177-26079-7-git-send-email-clg@kaod.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Cédric Le Goater 2016-09-22 18:13:05 +01:00 committed by Peter Maydell
parent 74fb1f3807
commit c3ba99f723
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/arm/aspeed.c
View File

@ -31,6 +31,19 @@ typedef struct AspeedBoardState {
MemoryRegion ram; MemoryRegion ram;
} AspeedBoardState; } 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, static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,
Error **errp) Error **errp)
{ {
@ -57,13 +70,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; AspeedBoardState *bmc;
AspeedSoCClass *sc; AspeedSoCClass *sc;
bmc = g_new0(AspeedBoardState, 1); 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), object_property_add_child(OBJECT(machine), "soc", OBJECT(&bmc->soc),
&error_abort); &error_abort);
@ -74,7 +88,7 @@ static void aspeed_board_init(MachineState *machine)
&bmc->ram); &bmc->ram);
object_property_add_const_link(OBJECT(&bmc->soc), "ram", OBJECT(&bmc->ram), object_property_add_const_link(OBJECT(&bmc->soc), "ram", OBJECT(&bmc->ram),
&error_abort); &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); &error_abort);
object_property_set_bool(OBJECT(&bmc->soc), true, "realized", object_property_set_bool(OBJECT(&bmc->soc), true, "realized",
&error_abort); &error_abort);
@ -93,7 +107,7 @@ static void aspeed_board_init(MachineState *machine)
static void palmetto_bmc_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) static void palmetto_bmc_class_init(ObjectClass *oc, void *data)