diff options
| author | Cédric Le Goater <clg@kaod.org> | 2023-06-07 06:39:41 +0200 |
|---|---|---|
| committer | Cédric Le Goater <clg@kaod.org> | 2023-09-01 11:40:04 +0200 |
| commit | 8285490b2b2a2c064e2e85df4b73b58194ce0445 (patch) | |
| tree | 89f29d6014d7275d6c83f4b84460a213152d274f /hw/arm | |
| parent | 9ab26b0eb14c818cf9d32e0881e99009df647076 (diff) | |
| download | qemu-8285490b2b2a2c064e2e85df4b73b58194ce0445.zip qemu-8285490b2b2a2c064e2e85df4b73b58194ce0445.tar.gz qemu-8285490b2b2a2c064e2e85df4b73b58194ce0445.tar.bz2 | |
aspeed: Get the BlockBackend of FMC0 from the flash device
and get rid of an unnecessary drive_get(IF_MTD) call.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/aspeed.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 271512c..f8ba675 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -15,6 +15,7 @@ #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/arm/aspeed_eeprom.h" +#include "hw/block/flash.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/misc/pca9552.h" @@ -436,11 +437,12 @@ static void aspeed_machine_init(MachineState *machine) } if (!bmc->mmio_exec) { - DriveInfo *mtd0 = drive_get(IF_MTD, 0, 0); + DeviceState *dev = ssi_get_cs(bmc->soc.fmc.spi, 0); + BlockBackend *fmc0 = dev ? m25p80_get_blk(dev) : NULL; - if (mtd0) { + if (fmc0) { uint64_t rom_size = memory_region_size(&bmc->soc.spi_boot); - aspeed_install_boot_rom(bmc, blk_by_legacy_dinfo(mtd0), rom_size); + aspeed_install_boot_rom(bmc, fmc0, rom_size); } } |