Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
legoater committed Sep 1, 2023
1 parent 9ab26b0 commit 8285490
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions hw/arm/aspeed.c
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 8285490

Please sign in to comment.