mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aspeed: Load eMMC first boot area as a boot rom

Browse Source 
The first boot area partition (64K) of the eMMC device should contain
an initial boot loader (u-boot SPL). Load it as a ROM only if an eMMC
device is available to boot from but no flash device is.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Tested-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Cédric Le Goater 2024-07-17 08:30:16 +02:00 committed by Cédric Le Goater
parent dddfc771e0
commit 255aed8134
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/arm/aspeed.c
View File

@ -364,6 +364,7 @@ static void aspeed_machine_init(MachineState *machine)
AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine); AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine);
AspeedSoCClass *sc; AspeedSoCClass *sc;
int i; int i;
DriveInfo *emmc0 = NULL;
bmc->soc = ASPEED_SOC(object_new(amc->soc_name)); bmc->soc = ASPEED_SOC(object_new(amc->soc_name));
object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc)); object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc));
@ -440,9 +441,8 @@ static void aspeed_machine_init(MachineState *machine)
} }
if (bmc->soc->emmc.num_slots) { if (bmc->soc->emmc.num_slots) {
sdhci_attach_drive(&bmc->soc->emmc.slots[0], emmc0 = drive_get(IF_SD, 0, bmc->soc->sdhci.num_slots);
drive_get(IF_SD, 0, bmc->soc->sdhci.num_slots), sdhci_attach_drive(&bmc->soc->emmc.slots[0], emmc0, true);
true);
} }
if (!bmc->mmio_exec) { if (!bmc->mmio_exec) {
@ -452,6 +452,8 @@ static void aspeed_machine_init(MachineState *machine)
if (fmc0) { if (fmc0) {
uint64_t rom_size = memory_region_size(&bmc->soc->spi_boot); uint64_t rom_size = memory_region_size(&bmc->soc->spi_boot);
aspeed_install_boot_rom(bmc, fmc0, rom_size); aspeed_install_boot_rom(bmc, fmc0, rom_size);
} else if (emmc0) {
aspeed_install_boot_rom(bmc, blk_by_legacy_dinfo(emmc0), 64 * KiB);
} }
} }