From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmJC-0007pq-Fl for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:29:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSmJ8-0005vI-Dd for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:29:10 -0400 Received: from 18.mo7.mail-out.ovh.net ([188.165.56.163]:44589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmJ8-0005ul-3I for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:29:06 -0400 Received: from player796.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id 8AC5B1010457 for ; Thu, 28 Jul 2016 16:29:05 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Thu, 28 Jul 2016 16:28:15 +0200 Message-Id: <1469716099-8975-6-git-send-email-clg@kaod.org> In-Reply-To: <1469716099-8975-1-git-send-email-clg@kaod.org> References: <1469716099-8975-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 v2 5/9] 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, Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= aspeed_init() now uses a board identifier to customize some values specific to the board, ram base, board revision number, etc. Signed-off-by: C=C3=A9dric Le Goater --- Changes since v1: - changed aspeed_init() prototype to use a 'const AspeedBoardConfig *' - fixed white space issues =20 hw/arm/aspeed.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 8a3ff5568575..80be55ab293f 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -22,8 +22,6 @@ #include "sysemu/blockdev.h" =20 static struct arm_boot_info aspeed_binfo =3D { - .loader_start =3D AST2400_SDRAM_BASE, - .board_id =3D 0, .nb_cpus =3D 1, }; =20 @@ -32,6 +30,21 @@ typedef struct AspeedBoardState { MemoryRegion ram; } AspeedBoardState; =20 +typedef struct AspeedBoardConfig { + uint32_t hw_strap1; + uint32_t silicon_rev; + hwaddr sdram_base; +} AspeedBoardConfig; + +enum { + PALMETTO_BMC +}; + +static const AspeedBoardConfig aspeed_boards[] =3D { + [PALMETTO_BMC] =3D { 0x120CE416, AST2400_A0_SILICON_REV, + AST2400_SDRAM_BASE }, +}; + static void aspeed_init_flashes(AspeedSMCState *s, const char *flashtype= , Error **errp) { @@ -58,7 +71,7 @@ static void aspeed_init_flashes(AspeedSMCState *s, cons= t char *flashtype, } } =20 -static void aspeed_init(MachineState *machine) +static void aspeed_init(MachineState *machine, const AspeedBoardConfig *= cfg) { AspeedBoardState *bmc; =20 @@ -68,13 +81,13 @@ static void aspeed_init(MachineState *machine) &error_abort); =20 memory_region_allocate_system_memory(&bmc->ram, NULL, "ram", ram_siz= e); - memory_region_add_subregion(get_system_memory(), AST2400_SDRAM_BASE, + memory_region_add_subregion(get_system_memory(), cfg->sdram_base, &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", - &error_abort); - object_property_set_int(OBJECT(&bmc->soc), AST2400_A0_SILICON_REV, + object_property_set_int(OBJECT(&bmc->soc), cfg->hw_strap1, + "hw-strap1", &error_abort); + object_property_set_int(OBJECT(&bmc->soc), cfg->silicon_rev, "silicon-rev", &error_abort); object_property_set_bool(OBJECT(&bmc->soc), true, "realized", &error_abort); @@ -86,13 +99,15 @@ static void aspeed_init(MachineState *machine) aspeed_binfo.initrd_filename =3D machine->initrd_filename; aspeed_binfo.kernel_cmdline =3D machine->kernel_cmdline; aspeed_binfo.ram_size =3D ram_size; + aspeed_binfo.loader_start =3D cfg->sdram_base, + aspeed_binfo.board_id =3D cfg->silicon_rev, arm_load_kernel(ARM_CPU(first_cpu), &aspeed_binfo); } =20 static void palmetto_bmc_init(MachineState *machine) { machine->cpu_model =3D "arm926"; - aspeed_init(machine); + aspeed_init(machine, &aspeed_boards[PALMETTO_BMC]); } =20 static void palmetto_bmc_class_init(ObjectClass *oc, void *data) --=20 2.1.4