Re: [PATCH] hw/arm: add initial mori-bmc board

2022-02-18 Thread Peter Maydell
On Tue, 8 Feb 2022 at 23:31, Patrick Venture  wrote:
>
> This is the BMC attached to the OpenBMC Mori board.
>
> Signed-off-by: Patrick Venture 
> Reviewed-by: Chris Rauer 
> Reviewed-by: Ilkyun Choi 
> ---
>  docs/system/arm/nuvoton.rst |  1 +
>  hw/arm/npcm7xx_boards.c | 32 
>  2 files changed, 33 insertions(+)



Applied to target-arm.next, thanks.

-- PMM



[PATCH] hw/arm: add initial mori-bmc board

2022-02-08 Thread Patrick Venture
This is the BMC attached to the OpenBMC Mori board.

Signed-off-by: Patrick Venture 
Reviewed-by: Chris Rauer 
Reviewed-by: Ilkyun Choi 
---
 docs/system/arm/nuvoton.rst |  1 +
 hw/arm/npcm7xx_boards.c | 32 
 2 files changed, 33 insertions(+)

diff --git a/docs/system/arm/nuvoton.rst b/docs/system/arm/nuvoton.rst
index adf497e679..ef2792076a 100644
--- a/docs/system/arm/nuvoton.rst
+++ b/docs/system/arm/nuvoton.rst
@@ -21,6 +21,7 @@ Hyperscale applications. The following machines are based on 
this chip :
 - ``quanta-gbs-bmc``Quanta GBS server BMC
 - ``quanta-gsj``Quanta GSJ server BMC
 - ``kudo-bmc``  Fii USA Kudo server BMC
+- ``mori-bmc``  Fii USA Mori server BMC
 
 There are also two more SoCs, NPCM710 and NPCM705, which are single-core
 variants of NPCM750 and NPCM730, respectively. These are currently not
diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index d701e5cc55..0678a56156 100644
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -34,6 +34,7 @@
 #define QUANTA_GSJ_POWER_ON_STRAPS 0x1fff
 #define QUANTA_GBS_POWER_ON_STRAPS 0x17ff
 #define KUDO_BMC_POWER_ON_STRAPS 0x1fff
+#define MORI_BMC_POWER_ON_STRAPS 0x1fff
 
 static const char npcm7xx_default_bootrom[] = "npcm7xx_bootrom.bin";
 
@@ -429,6 +430,21 @@ static void kudo_bmc_init(MachineState *machine)
 npcm7xx_load_kernel(machine, soc);
 }
 
+static void mori_bmc_init(MachineState *machine)
+{
+NPCM7xxState *soc;
+
+soc = npcm7xx_create_soc(machine, MORI_BMC_POWER_ON_STRAPS);
+npcm7xx_connect_dram(soc, machine->ram);
+qdev_realize(DEVICE(soc), NULL, _fatal);
+
+npcm7xx_load_bootrom(machine, soc);
+npcm7xx_connect_flash(>fiu[1], 0, "mx66u51235f",
+  drive_get(IF_MTD, 3, 0));
+
+npcm7xx_load_kernel(machine, soc);
+}
+
 static void npcm7xx_set_soc_type(NPCM7xxMachineClass *nmc, const char *type)
 {
 NPCM7xxClass *sc = NPCM7XX_CLASS(object_class_by_name(type));
@@ -501,6 +517,18 @@ static void kudo_bmc_machine_class_init(ObjectClass *oc, 
void *data)
 mc->default_ram_size = 1 * GiB;
 };
 
+static void mori_bmc_machine_class_init(ObjectClass *oc, void *data)
+{
+NPCM7xxMachineClass *nmc = NPCM7XX_MACHINE_CLASS(oc);
+MachineClass *mc = MACHINE_CLASS(oc);
+
+npcm7xx_set_soc_type(nmc, TYPE_NPCM730);
+
+mc->desc = "Mori BMC (Cortex-A9)";
+mc->init = mori_bmc_init;
+mc->default_ram_size = 1 * GiB;
+}
+
 static const TypeInfo npcm7xx_machine_types[] = {
 {
 .name   = TYPE_NPCM7XX_MACHINE,
@@ -525,6 +553,10 @@ static const TypeInfo npcm7xx_machine_types[] = {
 .name   = MACHINE_TYPE_NAME("kudo-bmc"),
 .parent = TYPE_NPCM7XX_MACHINE,
 .class_init = kudo_bmc_machine_class_init,
+}, {
+.name   = MACHINE_TYPE_NAME("mori-bmc"),
+.parent = TYPE_NPCM7XX_MACHINE,
+.class_init = mori_bmc_machine_class_init,
 },
 };
 
-- 
2.35.0.263.gb82422642f-goog