qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@kaod.org>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org,
	"Cédric Le Goater" <clg@kaod.org>
Subject: [Qemu-devel] [PATCH v4 09/10] arm: add support for an ast2500 evaluation board
Date: Mon,  5 Sep 2016 08:00:08 +0200	[thread overview]
Message-ID: <1473055209-18864-10-git-send-email-clg@kaod.org> (raw)
In-Reply-To: <1473055209-18864-1-git-send-email-clg@kaod.org>

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édric Le Goater <clg@kaod.org>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
 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 {
 
 enum {
     PALMETTO_BMC,
+    AST2500_EVB,
 };
 
 #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))
 
+#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[] = {
     [PALMETTO_BMC] = { "ast2400-a0", PALMETTO_BMC_HW_STRAP1 },
+    [AST2500_EVB]  = { "ast2500-a1", AST2500_EVB_HW_STRAP1 },
 };
 
 static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,
@@ -143,9 +155,34 @@ static const TypeInfo palmetto_bmc_type = {
     .class_init = palmetto_bmc_class_init,
 };
 
+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 = 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)
-- 
2.7.4

  parent reply	other threads:[~2016-09-05  6:01 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-05  5:59 [Qemu-devel] [PATCH v4 00/10] arm: add ast2500 support Cédric Le Goater
2016-09-05  6:00 ` [Qemu-devel] [PATCH v4 01/10] ast2400: rename the Aspeed SoC files to aspeed_soc Cédric Le Goater
2016-09-05  6:00 ` [Qemu-devel] [PATCH v4 02/10] ast2400: replace ast2400 with aspeed_soc Cédric Le Goater
2016-09-05  6:00 ` [Qemu-devel] [PATCH v4 03/10] aspeed-soc: provide a framework to add new SoCs Cédric Le Goater
2016-09-05  6:00 ` [Qemu-devel] [PATCH v4 04/10] palmetto-bmc: rename the Aspeed board file to aspeed.c Cédric Le Goater
2016-09-05  6:00 ` [Qemu-devel] [PATCH v4 05/10] palmetto-bmc: replace palmetto_bmc with aspeed Cédric Le Goater
2016-09-05  6:00 ` [Qemu-devel] [PATCH v4 06/10] palmetto-bmc: add board specific configuration Cédric Le Goater
2016-09-05  6:00 ` [Qemu-devel] [PATCH v4 07/10] hw/misc: use macros to define hw-strap1 register on the AST2400 Aspeed SoC Cédric Le Goater
2016-09-05  6:00 ` [Qemu-devel] [PATCH v4 08/10] aspeed: add a ast2500 SoC and support to the SCU and SDMC controllers Cédric Le Goater
2016-09-05  6:00 ` Cédric Le Goater [this message]
2016-09-05  6:00 ` [Qemu-devel] [PATCH v4 10/10] palmetto-bmc: remove extra no_sdcard assignement Cédric Le Goater
2016-09-05 16:21 ` [Qemu-devel] [PATCH v4 00/10] arm: add ast2500 support Peter Maydell

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=1473055209-18864-10-git-send-email-clg@kaod.org \
    --to=clg@kaod.org \
    --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).