diff options
| author | Peter Maydell | 2021-07-15 14:44:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-07-15 14:44:00 +0200 |
| commit | f665574ac5b08284e5292f013235bef2e9d4e73d (patch) | |
| tree | 59384bd679856a5f8c786e80ae594e3406228366 /include | |
| parent | Merge remote-tracking branch 'remotes/cleber-gitlab/tags/python-next-pull-req... (diff) | |
| parent | MAINTAINERS: remove Laszlo Ersek's entries (diff) | |
| download | qemu-f665574ac5b08284e5292f013235bef2e9d4e73d.tar.gz qemu-f665574ac5b08284e5292f013235bef2e9d4e73d.tar.xz qemu-f665574ac5b08284e5292f013235bef2e9d4e73d.zip | |
Merge remote-tracking branch 'remotes/philmd/tags/fw-edk2-20210714' into staging
Patches related to EDK2/OVMF
- MAINTAINERS: remove Laszlo Ersek's entries
- Introduce X86_FW_OVMF Kconfig symbol
- pc_system_ovmf_table_find: Assert that flash was parsed, document
- gitlab-ci: Fix the jobs building EDK2 blobs
# gpg: Signature made Wed 14 Jul 2021 21:36:33 BST
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* remotes/philmd/tags/fw-edk2-20210714:
MAINTAINERS: remove Laszlo Ersek's entries
hw/i386: Introduce X86_FW_OVMF Kconfig symbol
hw/i386/pc: Document pc_system_ovmf_table_find
hw/i386/pc: pc_system_ovmf_table_find: Assert that flash was parsed
gitlab-ci: Extract EDK2 job rules to reusable section
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 87294f2632..0775f945d7 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -188,6 +188,7 @@ void pc_system_flash_cleanup_unused(PCMachineState *pcms); void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory); bool pc_system_ovmf_table_find(const char *entry, uint8_t **data, int *data_len); +void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); /* acpi-build.c */ |