diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-12 11:12:36 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-12 11:12:36 +0000 |
| commit | eda1df0345f5a1e337e30367124dcb0e802bdfde (patch) | |
| tree | cf157ff5e5082285cbc924076b4c2837cb91001e /hw/xtensa/xtfpga.c | |
| parent | bc76b7148993269608c19fd3f2fc6ed3e22bf838 (diff) | |
| parent | e33763be7cd3769c9ae48e67d775348863fdabdb (diff) | |
| download | qemu-eda1df0345f5a1e337e30367124dcb0e802bdfde.zip qemu-eda1df0345f5a1e337e30367124dcb0e802bdfde.tar.gz qemu-eda1df0345f5a1e337e30367124dcb0e802bdfde.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-pflash-2019-03-11' into staging
Pflash and firmware configuration patches for 2019-03-11
# gpg: Signature made Mon 11 Mar 2019 21:59:12 GMT
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-pflash-2019-03-11: (27 commits)
docs/interop/firmware.json: Prefer -machine to if=pflash
pc: Support firmware configuration with -blockdev
pc_sysfw: Pass PCMachineState to pc_system_firmware_init()
pc_sysfw: Remove unused PcSysFwDevice
pflash_cfi01: Add pflash_cfi01_get_blk() helper
vl: Create block backends before setting machine properties
vl: Factor configure_blockdev() out of main()
vl: Improve legibility of BlockdevOptions queue
sysbus: Fix latent bug with onboard devices
vl: Fix latent bug with -global and onboard devices
qom: Move compat_props machinery from qdev to QOM
qdev: Fix latent bug with compat_props and onboard devices
pflash: Clean up after commit 368a354f02b, part 2
pflash: Clean up after commit 368a354f02b, part 1
mips_malta: Clean up definition of flash memory size somewhat
hw/mips/malta: Restrict 'bios_size' variable scope
hw/mips/malta: Remove fl_sectors variable
mips_malta: Delete disabled, broken DEBUG_BOARD_INIT code
r2d: Fix flash memory size, sector size, width, device ID
ppc405_boards: Don't size flash memory to match backing image
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/xtensa/xtfpga.c')
| -rw-r--r-- | hw/xtensa/xtfpga.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index ab3e52b..e05ef75 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -162,12 +162,12 @@ static void xtfpga_net_init(MemoryRegion *address_space, memory_region_add_subregion(address_space, buffers, ram); } -static pflash_t *xtfpga_flash_init(MemoryRegion *address_space, - const XtfpgaBoardDesc *board, - DriveInfo *dinfo, int be) +static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, + const XtfpgaBoardDesc *board, + DriveInfo *dinfo, int be) { SysBusDevice *s; - DeviceState *dev = qdev_create(NULL, "cfi.pflash01"); + DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI01); qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(dinfo), &error_abort); @@ -181,7 +181,7 @@ static pflash_t *xtfpga_flash_init(MemoryRegion *address_space, s = SYS_BUS_DEVICE(dev); memory_region_add_subregion(address_space, board->flash->base, sysbus_mmio_get_region(s, 0)); - return OBJECT_CHECK(pflash_t, (dev), "cfi.pflash01"); + return PFLASH_CFI01(dev); } static uint64_t translate_phys_addr(void *opaque, uint64_t addr) @@ -229,7 +229,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) XtensaMxPic *mx_pic = NULL; qemu_irq *extints; DriveInfo *dinfo; - pflash_t *flash = NULL; + PFlashCFI01 *flash = NULL; QemuOpts *machine_opts = qemu_get_machine_opts(); const char *kernel_filename = qemu_opt_get(machine_opts, "kernel"); const char *kernel_cmdline = qemu_opt_get(machine_opts, "append"); |