[29/32] hw/arm/aspeed: Load eMMC first boot area as a boot rom

Commit Message

Cédric Le Goater July 3, 2023, 1:25 p.m. UTC

Signed-off-by: Cédric Le Goater <[e-mail]>
---
 hw/arm/aspeed.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 4f028b704751..2cb51ffd8d49 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -360,6 +360,7 @@  static void aspeed_machine_init(MachineState *machine)
     AspeedSoCClass *sc;
     int i;
     NICInfo *nd = &nd_table[0];
+    DriveInfo *emmc0 = NULL;
 
     object_initialize_child(OBJECT(machine), "soc", &bmc->soc, amc->soc_name);
 
@@ -435,9 +436,8 @@  static void aspeed_machine_init(MachineState *machine)
     }
 
     if (bmc->soc.emmc.num_slots) {
-        sdhci_attach_drive(&bmc->soc.emmc.slots[0],
-                           drive_get(IF_SD, 0, bmc->soc.sdhci.num_slots),
-                           true);
+        emmc0 = drive_get(IF_SD, 0, bmc->soc.sdhci.num_slots);
+        sdhci_attach_drive(&bmc->soc.emmc.slots[0], emmc0, true);
     }
 
     if (!bmc->mmio_exec) {
@@ -447,6 +447,8 @@  static void aspeed_machine_init(MachineState *machine)
         if (fmc0) {
             uint64_t rom_size = memory_region_size(&bmc->soc.spi_boot);
             aspeed_install_boot_rom(bmc, fmc0, rom_size);
+        } else if (emmc0) {
+            aspeed_install_boot_rom(bmc, blk_by_legacy_dinfo(emmc0), 64 * KiB);
         }
     }