From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgmxl-0001OT-Tl for qemu-devel@nongnu.org; Mon, 05 Sep 2016 02:01:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgmxi-0001ri-PH for qemu-devel@nongnu.org; Mon, 05 Sep 2016 02:00:57 -0400 Received: from 7.mo7.mail-out.ovh.net ([46.105.43.131]:57414) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgmxi-0001rc-FK for qemu-devel@nongnu.org; Mon, 05 Sep 2016 02:00:54 -0400 Received: from player759.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id AF4D01000246 for ; Mon, 5 Sep 2016 08:00:53 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Mon, 5 Sep 2016 08:00:05 +0200 Message-Id: <1473055209-18864-7-git-send-email-clg@kaod.org> In-Reply-To: <1473055209-18864-1-git-send-email-clg@kaod.org> References: <1473055209-18864-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 06/10] palmetto-bmc: add board specific configuration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= aspeed_board_init() now uses a board identifier to customize some values specific to the board. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Andrew Jeffery Reviewed-by: Peter Maydell --- Changes since v3: - added trailing comma to enum 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 3b901eaa6fb6..b4eb8049af97 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -31,6 +31,19 @@ typedef struct AspeedBoardState { MemoryRegion ram; } AspeedBoardState; =20 +typedef struct AspeedBoardConfig { + const char *soc_name; + uint32_t hw_strap1; +} AspeedBoardConfig; + +enum { + PALMETTO_BMC, +}; + +static const AspeedBoardConfig aspeed_boards[] =3D { + [PALMETTO_BMC] =3D { "ast2400-a0", 0x120CE416 }, +}; + static void aspeed_board_init_flashes(AspeedSMCState *s, const char *fla= shtype, Error **errp) { @@ -57,13 +70,14 @@ static void aspeed_board_init_flashes(AspeedSMCState = *s, const char *flashtype, } } =20 -static void aspeed_board_init(MachineState *machine) +static void aspeed_board_init(MachineState *machine, + const AspeedBoardConfig *cfg) { AspeedBoardState *bmc; AspeedSoCClass *sc; =20 bmc =3D 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); =20 @@ -74,7 +88,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-strap= 1", &error_abort); object_property_set_bool(OBJECT(&bmc->soc), true, "realized", &error_abort); @@ -93,7 +107,7 @@ static void aspeed_board_init(MachineState *machine) =20 static void palmetto_bmc_init(MachineState *machine) { - aspeed_board_init(machine); + aspeed_board_init(machine, &aspeed_boards[PALMETTO_BMC]); } =20 static void palmetto_bmc_class_init(ObjectClass *oc, void *data) --=20 2.7.4