From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgmy1-0001cT-8Q for qemu-devel@nongnu.org; Mon, 05 Sep 2016 02:01:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgmxv-0001tx-Gl for qemu-devel@nongnu.org; Mon, 05 Sep 2016 02:01:12 -0400 Received: from 15.mo7.mail-out.ovh.net ([87.98.180.21]:40925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgmxv-0001ti-79 for qemu-devel@nongnu.org; Mon, 05 Sep 2016 02:01:07 -0400 Received: from player759.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id A35C91000250 for ; Mon, 5 Sep 2016 08:01:06 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Mon, 5 Sep 2016 08:00:08 +0200 Message-Id: <1473055209-18864-10-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 09/10] arm: add support for an ast2500 evaluation board 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?= The ast2500 eval board has a hardware strapping register value of 0xF100C2E6 which we use for a definition of AST2500_EVB_HW_STRAP1 below. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Andrew Jeffery Reviewed-by: Peter Maydell --- Changes since v3: - fixed trailing comma. hw/arm/aspeed.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index c08213c04e3f..2af9fe934441 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -38,6 +38,7 @@ typedef struct AspeedBoardConfig { =20 enum { PALMETTO_BMC, + AST2500_EVB, }; =20 #define PALMETTO_BMC_HW_STRAP1 ( = \ @@ -53,8 +54,19 @@ enum { SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | = \ SCU_AST2400_HW_STRAP_BOOT_MODE(AST2400_SPI_BOOT)) =20 +#define AST2500_EVB_HW_STRAP1 (( = \ + AST2500_HW_STRAP1_DEFAULTS | = \ + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | = \ + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | = \ + SCU_AST2500_HW_STRAP_UART_DEBUG | = \ + SCU_AST2500_HW_STRAP_DDR4_ENABLE | = \ + SCU_HW_STRAP_MAC1_RGMII | = \ + SCU_HW_STRAP_MAC0_RGMII) & = \ + ~SCU_HW_STRAP_2ND_BOOT_WDT) + static const AspeedBoardConfig aspeed_boards[] =3D { [PALMETTO_BMC] =3D { "ast2400-a0", PALMETTO_BMC_HW_STRAP1 }, + [AST2500_EVB] =3D { "ast2500-a1", AST2500_EVB_HW_STRAP1 }, }; =20 static void aspeed_board_init_flashes(AspeedSMCState *s, const char *fla= shtype, @@ -143,9 +155,34 @@ static const TypeInfo palmetto_bmc_type =3D { .class_init =3D palmetto_bmc_class_init, }; =20 +static void ast2500_evb_init(MachineState *machine) +{ + aspeed_board_init(machine, &aspeed_boards[AST2500_EVB]); +} + +static void ast2500_evb_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->desc =3D "Aspeed AST2500 EVB (ARM1176)"; + mc->init =3D ast2500_evb_init; + mc->max_cpus =3D 1; + mc->no_sdcard =3D 1; + mc->no_floppy =3D 1; + mc->no_cdrom =3D 1; + mc->no_parallel =3D 1; +} + +static const TypeInfo ast2500_evb_type =3D { + .name =3D MACHINE_TYPE_NAME("ast2500-evb"), + .parent =3D TYPE_MACHINE, + .class_init =3D ast2500_evb_class_init, +}; + static void aspeed_machine_init(void) { type_register_static(&palmetto_bmc_type); + type_register_static(&ast2500_evb_type); } =20 type_init(aspeed_machine_init) --=20 2.7.4