From patchwork Thu Jul 28 14:28:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 653754 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s0ZL50b59z9t0q for ; Fri, 29 Jul 2016 00:41:17 +1000 (AEST) Received: from localhost ([::1]:53682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmUs-0001wn-P3 for incoming@patchwork.ozlabs.org; Thu, 28 Jul 2016 10:41:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmJY-0008Ch-Ov for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:29:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSmJT-00060w-5l for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:29:31 -0400 Received: from 7.mo7.mail-out.ovh.net ([46.105.43.131]:48746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmJS-00060n-VM for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:29:27 -0400 Received: from player796.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id 7F97B1010434 for ; Thu, 28 Jul 2016 16:29:21 +0200 (CEST) Received: from hermes.ibm.com (LFbn-1-2234-107.w90-76.abo.wanadoo.fr [90.76.55.107]) (Authenticated sender: clg@kaod.org) by player796.ha.ovh.net (Postfix) with ESMTPSA id 435855C0098; Thu, 28 Jul 2016 16:29:16 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: Peter Maydell Date: Thu, 28 Jul 2016 16:28:18 +0200 Message-Id: <1469716099-8975-9-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.1.4 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 X-Ovh-Tracer-Id: 1639591741863201553 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeltddrieejgdejjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 46.105.43.131 Subject: [Qemu-devel] [PATCH v2 8/9] arm: add support for an ast2500 evaluation board X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , qemu-arm@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Cédric Le Goater --- Changes since v1: - changed AST2500_EDK to AST2500_EVB - fixed white space issues - added AST2500_HW_STRAP1 hw/arm/aspeed.c | 31 ++++++++++++++++++++++++++++++- include/hw/arm/ast2400.h | 5 +++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index b5d34a3a0367..c8812cc358bb 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -37,12 +37,15 @@ typedef struct AspeedBoardConfig { } AspeedBoardConfig; enum { - PALMETTO_BMC + PALMETTO_BMC, + AST2500_EVB }; static const AspeedBoardConfig aspeed_boards[] = { [PALMETTO_BMC] = { AST2400_HW_STRAP1, AST2400_A0_SILICON_REV, AST2400_SDRAM_BASE }, + [AST2500_EVB] = { AST2500_HW_STRAP1, AST2500_A1_SILICON_REV, + AST2500_SDRAM_BASE }, }; static void aspeed_init_flashes(AspeedSMCState *s, const char *flashtype, @@ -130,9 +133,35 @@ static const TypeInfo palmetto_bmc_type = { .class_init = palmetto_bmc_class_init, }; +static void ast2500_evb_init(MachineState *machine) +{ + machine->cpu_model = "arm1176"; + aspeed_init(machine, &aspeed_boards[AST2500_EVB]); +} + +static void ast2500_evb_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->desc = "Aspeed AST2500 EVB (ARM1176)"; + mc->init = ast2500_evb_init; + mc->max_cpus = 1; + mc->no_sdcard = 1; + mc->no_floppy = 1; + mc->no_cdrom = 1; + mc->no_parallel = 1; +} + +static const TypeInfo ast2500_evb_type = { + .name = MACHINE_TYPE_NAME("ast2500-evb"), + .parent = TYPE_MACHINE, + .class_init = ast2500_evb_class_init, +}; + static void aspeed_machine_init(void) { type_register_static(&palmetto_bmc_type); + type_register_static(&ast2500_evb_type); } type_init(aspeed_machine_init) diff --git a/include/hw/arm/ast2400.h b/include/hw/arm/ast2400.h index e68807d475b7..2e6864f88790 100644 --- a/include/hw/arm/ast2400.h +++ b/include/hw/arm/ast2400.h @@ -41,4 +41,9 @@ typedef struct AST2400State { #define AST2400_SDRAM_BASE 0x40000000 +/* + * for Aspeed AST2500 SOC and higher + */ +#define AST2500_SDRAM_BASE 0x80000000 + #endif /* AST2400_H */