From: "Cédric Le Goater" <clg@kaod.org>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org,
"Andrew Jeffery" <andrew@aj.id.au>,
"Cédric Le Goater" <clg@kaod.org>
Subject: [Qemu-devel] [PATCH v2 8/9] arm: add support for an ast2500 evaluation board
Date: Thu, 28 Jul 2016 16:28:18 +0200 [thread overview]
Message-ID: <1469716099-8975-9-git-send-email-clg@kaod.org> (raw)
In-Reply-To: <1469716099-8975-1-git-send-email-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
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 */
--
2.1.4
next prev parent reply other threads:[~2016-07-28 14:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-28 14:28 [Qemu-devel] [PATCH v2 0/9] arm: add ast2500 support Cédric Le Goater
2016-07-28 14:28 ` [Qemu-devel] [PATCH v2 1/9] palmetto-bmc: rename file to aspeed.c Cédric Le Goater
2016-07-28 14:28 ` [Qemu-devel] [PATCH v2 2/9] palmetto-bmc: add a "silicon-rev" property at the soc level Cédric Le Goater
2016-07-28 14:28 ` [Qemu-devel] [PATCH v2 3/9] palmetto-bmc: replace palmetto_bmc with aspeed Cédric Le Goater
2016-07-28 14:28 ` [Qemu-devel] [PATCH v2 4/9] ast2400: use machine cpu_model to initialize the soc cpu Cédric Le Goater
2016-07-28 14:28 ` [Qemu-devel] [PATCH v2 5/9] palmetto-bmc: add board specific configuration Cédric Le Goater
2016-07-28 14:28 ` [Qemu-devel] [PATCH v2 6/9] hw/misc: use macros to define hw-strap1 register on Aspeed SOC Cédric Le Goater
2016-07-28 14:28 ` [Qemu-devel] [PATCH v2 7/9] aspeed: add ast2500 support to scu and sdmc controllers Cédric Le Goater
2016-07-28 14:28 ` Cédric Le Goater [this message]
2016-07-28 14:28 ` [Qemu-devel] [PATCH v2 9/9] palmetto-bmc: remove extra no_sdcard assignement Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469716099-8975-9-git-send-email-clg@kaod.org \
--to=clg@kaod.org \
--cc=andrew@aj.id.au \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).