[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/26] aspeed: Get the BlockBackend of FMC0 from the flash device
From: |
Cédric Le Goater |
Subject: |
[PULL 12/26] aspeed: Get the BlockBackend of FMC0 from the flash device |
Date: |
Fri, 1 Sep 2023 11:42:00 +0200 |
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>
---
hw/arm/aspeed.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 271512ce5ced..f8ba67531a00 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);
}
}
--
2.41.0
- [PULL 01/26] aspeed: Introduce helper for 32-bit hosts limitation, (continued)
- [PULL 01/26] aspeed: Introduce helper for 32-bit hosts limitation, Cédric Le Goater, 2023/09/01
- [PULL 02/26] hw/i2c/aspeed: Fix Tx count and Rx size error in buffer pool mode, Cédric Le Goater, 2023/09/01
- [PULL 03/26] hw/i2c/aspeed: Fix TXBUF transmission start position error, Cédric Le Goater, 2023/09/01
- [PULL 05/26] tests/avocado/machine_aspeed.py: Update SDK images, Cédric Le Goater, 2023/09/01
- [PULL 06/26] hw/ssi: Add a "cs" property to SSIPeripheral, Cédric Le Goater, 2023/09/01
- [PULL 04/26] hw/i2c/aspeed: Add support for buffer organization, Cédric Le Goater, 2023/09/01
- [PULL 07/26] hw/ssi: Introduce a ssi_get_cs() helper, Cédric Le Goater, 2023/09/01
- [PULL 09/26] hw/ssi: Check for duplicate CS indexes, Cédric Le Goater, 2023/09/01
- [PULL 08/26] aspeed/smc: Wire CS lines at reset, Cédric Le Goater, 2023/09/01
- [PULL 11/26] m25p80: Introduce an helper to retrieve the BlockBackend of a device, Cédric Le Goater, 2023/09/01
- [PULL 12/26] aspeed: Get the BlockBackend of FMC0 from the flash device,
Cédric Le Goater <=
- [PULL 13/26] hw/sd/sdcard: Return ILLEGAL for CMD19/CMD23 prior SD spec v3.01, Cédric Le Goater, 2023/09/01
- [PULL 15/26] hw/sd: When card is in wrong state, log which spec version is used, Cédric Le Goater, 2023/09/01
- [PULL 14/26] hw/sd: When card is in wrong state, log which state it is, Cédric Le Goater, 2023/09/01
- [PULL 10/26] aspeed: Create flash devices only when defaults are enabled, Cédric Le Goater, 2023/09/01
- [PULL 17/26] hw/sd: Introduce sd_cmd_handler type, Cédric Le Goater, 2023/09/01
- [PULL 16/26] hw/sd: Move proto_name to SDProto structure, Cédric Le Goater, 2023/09/01
- [PULL 18/26] hw/sd: Add sd_cmd_illegal() handler, Cédric Le Goater, 2023/09/01
- [PULL 19/26] hw/sd: Add sd_cmd_unimplemented() handler, Cédric Le Goater, 2023/09/01
- [PULL 21/26] hw/sd: Add sd_cmd_SEND_OP_CMD() handler, Cédric Le Goater, 2023/09/01
- [PULL 22/26] hw/sd: Add sd_cmd_ALL_SEND_CID() handler, Cédric Le Goater, 2023/09/01