[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 5/9] palmetto-bmc: add board specific configuration
From: |
Cédric Le Goater |
Subject: |
[Qemu-arm] [PATCH v2 5/9] palmetto-bmc: add board specific configuration |
Date: |
Thu, 28 Jul 2016 16:28:15 +0200 |
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édric Le Goater <address@hidden>
---
Changes since v1:
- changed aspeed_init() prototype to use a 'const AspeedBoardConfig *'
- fixed white space issues
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"
static struct arm_boot_info aspeed_binfo = {
- .loader_start = AST2400_SDRAM_BASE,
- .board_id = 0,
.nb_cpus = 1,
};
@@ -32,6 +30,21 @@ typedef struct AspeedBoardState {
MemoryRegion ram;
} AspeedBoardState;
+typedef struct AspeedBoardConfig {
+ uint32_t hw_strap1;
+ uint32_t silicon_rev;
+ hwaddr sdram_base;
+} AspeedBoardConfig;
+
+enum {
+ PALMETTO_BMC
+};
+
+static const AspeedBoardConfig aspeed_boards[] = {
+ [PALMETTO_BMC] = { 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, const char
*flashtype,
}
}
-static void aspeed_init(MachineState *machine)
+static void aspeed_init(MachineState *machine, const AspeedBoardConfig *cfg)
{
AspeedBoardState *bmc;
@@ -68,13 +81,13 @@ static void aspeed_init(MachineState *machine)
&error_abort);
memory_region_allocate_system_memory(&bmc->ram, NULL, "ram", ram_size);
- 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 = machine->initrd_filename;
aspeed_binfo.kernel_cmdline = machine->kernel_cmdline;
aspeed_binfo.ram_size = ram_size;
+ aspeed_binfo.loader_start = cfg->sdram_base,
+ aspeed_binfo.board_id = cfg->silicon_rev,
arm_load_kernel(ARM_CPU(first_cpu), &aspeed_binfo);
}
static void palmetto_bmc_init(MachineState *machine)
{
machine->cpu_model = "arm926";
- aspeed_init(machine);
+ aspeed_init(machine, &aspeed_boards[PALMETTO_BMC]);
}
static void palmetto_bmc_class_init(ObjectClass *oc, void *data)
--
2.1.4
- [Qemu-arm] [PATCH v2 0/9] arm: add ast2500 support, Cédric Le Goater, 2016/07/28
- [Qemu-arm] [PATCH v2 1/9] palmetto-bmc: rename file to aspeed.c, Cédric Le Goater, 2016/07/28
- [Qemu-arm] [PATCH v2 2/9] palmetto-bmc: add a "silicon-rev" property at the soc level, Cédric Le Goater, 2016/07/28
- [Qemu-arm] [PATCH v2 3/9] palmetto-bmc: replace palmetto_bmc with aspeed, Cédric Le Goater, 2016/07/28
- [Qemu-arm] [PATCH v2 4/9] ast2400: use machine cpu_model to initialize the soc cpu, Cédric Le Goater, 2016/07/28
- [Qemu-arm] [PATCH v2 5/9] palmetto-bmc: add board specific configuration,
Cédric Le Goater <=
- [Qemu-arm] [PATCH v2 6/9] hw/misc: use macros to define hw-strap1 register on Aspeed SOC, Cédric Le Goater, 2016/07/28
- [Qemu-arm] [PATCH v2 7/9] aspeed: add ast2500 support to scu and sdmc controllers, Cédric Le Goater, 2016/07/28
- [Qemu-arm] [PATCH v2 8/9] arm: add support for an ast2500 evaluation board, Cédric Le Goater, 2016/07/28
- [Qemu-arm] [PATCH v2 9/9] palmetto-bmc: remove extra no_sdcard assignement, Cédric Le Goater, 2016/07/28