On 6/12/20 12:30 AM, Havard Skinnemoen wrote:
> 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
could you put the image on some site when ready ?
> qemu-system-arm -machine quanta-gsj -nographic \
> -bios ~/qemu/bootrom/npcm7xx_bootrom.bin \
> -drive file=${IMAGE},if=mtd,bus=0,unit=0,format=raw,snapshot=on
>
> Change-Id: I158a4d9952c0e90f2b1b7280443a7305b6ae57cf
> Reviewed-by: Tyrone Ting <kft...@nuvoton.com>
> Signed-off-by: Havard Skinnemoen <hskinnem...@google.com>
Reviewed-by: Cédric Le Goater <c...@kaod.org>
> ---
> hw/arm/npcm7xx_boards.c | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
> index 86e18af2d7..1ec772fa59 100644
> --- a/hw/arm/npcm7xx_boards.c
> +++ b/hw/arm/npcm7xx_boards.c
> @@ -18,6 +18,7 @@
> #include "hw/arm/boot.h"
> #include "hw/arm/npcm7xx.h"
> #include "hw/core/cpu.h"
> +#include "hw/qdev-properties.h"
> #include "qapi/error.h"
> #include "qemu/units.h"
>
> @@ -40,6 +41,20 @@ static void npcm7xx_load_kernel(MachineState *machine,
> NPCM7xxState *soc)
> arm_load_kernel(&soc->cpu[0], machine, &npcm7xx_binfo);
> }
>
> +static void npcm7xx_connect_flash(NPCM7xxFIUState *fiu, int cs_no,
> + const char *flash_type, DriveInfo *dinfo) {
> + DeviceState *flash;
> + qemu_irq flash_cs;
> +
> + flash = ssi_create_slave_no_init(fiu->spi, flash_type);
> + qdev_prop_set_drive(flash, "drive", blk_by_legacy_dinfo(dinfo),
> + &error_abort);
> + qdev_init_nofail(flash);
> +
> + flash_cs = qdev_get_gpio_in_named(flash, SSI_GPIO_CS, 0);
> + sysbus_connect_irq(SYS_BUS_DEVICE(fiu), cs_no, flash_cs);
> +}
> +
> static NPCM7xxState *npcm7xx_create_soc(MachineState *machine)
> {
> NPCM7xxMachineClass *nmc = NPCM7XX_MACHINE_GET_CLASS(machine);
> @@ -57,18 +72,30 @@ static NPCM7xxState *npcm7xx_create_soc(MachineState
> *machine)
> static void npcm750_evb_init(MachineState *machine)
> {
> NPCM7xxState *soc;
> + DriveInfo *dinfo;
>
> soc = npcm7xx_create_soc(machine);
>
> + dinfo = drive_get(IF_MTD, 0, 0);
> + if (dinfo) {
> + npcm7xx_connect_flash(&soc->fiu[0], 0, "w25q256", dinfo);
> + }
> +
> npcm7xx_load_kernel(machine, soc);
> }
>
> static void quanta_gsj_init(MachineState *machine)
> {
> NPCM7xxState *soc;
> + DriveInfo *dinfo;
>
> soc = npcm7xx_create_soc(machine);
>
> + dinfo = drive_get(IF_MTD, 0, 0);
> + if (dinfo) {
> + npcm7xx_connect_flash(&soc->fiu[0], 0, "mx25l25635e", dinfo);
> + }
> +
> npcm7xx_load_kernel(machine, soc);
> }
>
>
