[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 11/14] hw/arm: Wire up BMC boot flash for npcm750-evb and quan
From: |
Havard Skinnemoen |
Subject: |
[PATCH v9 11/14] hw/arm: Wire up BMC boot flash for npcm750-evb and quanta-gsj |
Date: |
Thu, 10 Sep 2020 22:20:58 -0700 |
This allows these NPCM7xx-based boards to boot from a flash image, e.g.
one built with OpenBMC. For example like this:
IMAGE=${OPENBMC}/build/tmp/deploy/images/gsj/image-bmc
qemu-system-arm -machine quanta-gsj -nographic \
-drive file=${IMAGE},if=mtd,bus=0,unit=0,format=raw,snapshot=on
Reviewed-by: Tyrone Ting <kfting@nuvoton.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Tested-by: Cédric Le Goater <clg@kaod.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Havard Skinnemoen <hskinnemoen@google.com>
---
hw/arm/npcm7xx_boards.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index b4c772d6b5..79e2e2744c 100644
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -20,6 +20,7 @@
#include "hw/arm/npcm7xx.h"
#include "hw/core/cpu.h"
#include "hw/loader.h"
+#include "hw/qdev-properties.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/units.h"
@@ -55,6 +56,22 @@ static void npcm7xx_load_bootrom(MachineState *machine,
NPCM7xxState *soc)
}
}
+static void npcm7xx_connect_flash(NPCM7xxFIUState *fiu, int cs_no,
+ const char *flash_type, DriveInfo *dinfo)
+{
+ DeviceState *flash;
+ qemu_irq flash_cs;
+
+ flash = qdev_new(flash_type);
+ if (dinfo) {
+ qdev_prop_set_drive(flash, "drive", blk_by_legacy_dinfo(dinfo));
+ }
+ qdev_realize_and_unref(flash, BUS(fiu->spi), &error_fatal);
+
+ flash_cs = qdev_get_gpio_in_named(flash, SSI_GPIO_CS, 0);
+ qdev_connect_gpio_out_named(DEVICE(fiu), "cs", cs_no, flash_cs);
+}
+
static void npcm7xx_connect_dram(NPCM7xxState *soc, MemoryRegion *dram)
{
memory_region_add_subregion(get_system_memory(), NPCM7XX_DRAM_BA, dram);
@@ -92,6 +109,7 @@ static void npcm750_evb_init(MachineState *machine)
qdev_realize(DEVICE(soc), NULL, &error_fatal);
npcm7xx_load_bootrom(machine, soc);
+ npcm7xx_connect_flash(&soc->fiu[0], 0, "w25q256", drive_get(IF_MTD, 0, 0));
npcm7xx_load_kernel(machine, soc);
}
@@ -104,6 +122,8 @@ static void quanta_gsj_init(MachineState *machine)
qdev_realize(DEVICE(soc), NULL, &error_fatal);
npcm7xx_load_bootrom(machine, soc);
+ npcm7xx_connect_flash(&soc->fiu[0], 0, "mx25l25635e",
+ drive_get(IF_MTD, 0, 0));
npcm7xx_load_kernel(machine, soc);
}
--
2.28.0.526.ge36021eeef-goog
- [PATCH v9 01/14] hw/misc: Add NPCM7xx System Global Control Registers device model, (continued)
- [PATCH v9 01/14] hw/misc: Add NPCM7xx System Global Control Registers device model, Havard Skinnemoen, 2020/09/11
- [PATCH v9 02/14] hw/misc: Add NPCM7xx Clock Controller device model, Havard Skinnemoen, 2020/09/11
- [PATCH v9 03/14] hw/timer: Add NPCM7xx Timer device model, Havard Skinnemoen, 2020/09/11
- [PATCH v9 04/14] hw/arm: Add NPCM730 and NPCM750 SoC models, Havard Skinnemoen, 2020/09/11
- [PATCH v9 05/14] hw/arm: Add two NPCM7xx-based machines, Havard Skinnemoen, 2020/09/11
- [PATCH v9 06/14] roms: Add virtual Boot ROM for NPCM7xx SoCs, Havard Skinnemoen, 2020/09/11
- [PATCH v9 07/14] hw/arm: Load -bios image as a boot ROM for npcm7xx, Havard Skinnemoen, 2020/09/11
- [PATCH v9 08/14] hw/nvram: NPCM7xx OTP device model, Havard Skinnemoen, 2020/09/11
- [PATCH v9 09/14] hw/mem: Stubbed out NPCM7xx Memory Controller model, Havard Skinnemoen, 2020/09/11
- [PATCH v9 10/14] hw/ssi: NPCM7xx Flash Interface Unit device model, Havard Skinnemoen, 2020/09/11
- [PATCH v9 11/14] hw/arm: Wire up BMC boot flash for npcm750-evb and quanta-gsj,
Havard Skinnemoen <=
- [PATCH v9 12/14] hw/arm/npcm7xx: add board setup stub for CPU and UART clocks, Havard Skinnemoen, 2020/09/11
- [PATCH v9 13/14] docs/system: Add Nuvoton machine documentation, Havard Skinnemoen, 2020/09/11
- [PATCH v9 14/14] tests/acceptance: console boot tests for quanta-gsj, Havard Skinnemoen, 2020/09/11
- Re: [PATCH v9 00/14] Add Nuvoton NPCM730/NPCM750 SoCs and two BMC machines, Philippe Mathieu-Daudé, 2020/09/11
- Re: [PATCH v9 00/14] Add Nuvoton NPCM730/NPCM750 SoCs and two BMC machines, Peter Maydell, 2020/09/14