diff options
| -rw-r--r-- | .gitlab-ci.d/edk2/Dockerfile | 4 | ||||
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | pc-bios/edk2-aarch64-code.fd.bz2 | bin | 1507722 -> 1161290 bytes | |||
| -rw-r--r-- | pc-bios/edk2-arm-code.fd.bz2 | bin | 1503187 -> 1161845 bytes | |||
| -rw-r--r-- | pc-bios/edk2-i386-code.fd.bz2 | bin | 1646741 -> 1282120 bytes | |||
| -rw-r--r-- | pc-bios/edk2-i386-secure-code.fd.bz2 | bin | 1860546 -> 1473677 bytes | |||
| -rw-r--r-- | pc-bios/edk2-x86_64-code.fd.bz2 | bin | 1680164 -> 1327522 bytes | |||
| -rw-r--r-- | pc-bios/edk2-x86_64-microvm.fd.bz2 | bin | 0 -> 1309407 bytes | |||
| -rw-r--r-- | pc-bios/edk2-x86_64-secure-code.fd.bz2 | bin | 1912112 -> 1513711 bytes | |||
| -rw-r--r-- | roms/Makefile.edk2 | 30 | ||||
| m--------- | roms/edk2 | 0 | ||||
| -rwxr-xr-x | roms/edk2-build.sh | 2 | ||||
| -rw-r--r-- | tests/data/acpi/virt/SSDT.memhp | bin | 736 -> 736 bytes |
13 files changed, 25 insertions, 13 deletions
diff --git a/.gitlab-ci.d/edk2/Dockerfile b/.gitlab-ci.d/edk2/Dockerfile index 13029310f6..bbe50ff832 100644 --- a/.gitlab-ci.d/edk2/Dockerfile +++ b/.gitlab-ci.d/edk2/Dockerfile @@ -1,7 +1,7 @@ # # Docker image to cross-compile EDK2 firmware binaries # -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> @@ -20,7 +20,7 @@ RUN apt update \ iasl \ make \ nasm \ - python \ + python3 \ uuid-dev \ && \ \ diff --git a/MAINTAINERS b/MAINTAINERS index f2e9ce1da2..b976a942dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3159,7 +3159,7 @@ F: docs/interop/firmware.json EDK2 Firmware M: Philippe Mathieu-Daudé <f4bug@amsat.org> -R: Gerd Hoffmann <kraxel@redhat.com> +M: Gerd Hoffmann <kraxel@redhat.com> S: Supported F: hw/i386/*ovmf* F: pc-bios/descriptors/??-edk2-*.json diff --git a/pc-bios/edk2-aarch64-code.fd.bz2 b/pc-bios/edk2-aarch64-code.fd.bz2 Binary files differindex 5bf311464a..0262f5bd8f 100644 --- a/pc-bios/edk2-aarch64-code.fd.bz2 +++ b/pc-bios/edk2-aarch64-code.fd.bz2 diff --git a/pc-bios/edk2-arm-code.fd.bz2 b/pc-bios/edk2-arm-code.fd.bz2 Binary files differindex 7a98069814..4ca97b43ea 100644 --- a/pc-bios/edk2-arm-code.fd.bz2 +++ b/pc-bios/edk2-arm-code.fd.bz2 diff --git a/pc-bios/edk2-i386-code.fd.bz2 b/pc-bios/edk2-i386-code.fd.bz2 Binary files differindex e7b1befe2c..6e02c9b995 100644 --- a/pc-bios/edk2-i386-code.fd.bz2 +++ b/pc-bios/edk2-i386-code.fd.bz2 diff --git a/pc-bios/edk2-i386-secure-code.fd.bz2 b/pc-bios/edk2-i386-secure-code.fd.bz2 Binary files differindex b5df5bed30..a4b1cc92bd 100644 --- a/pc-bios/edk2-i386-secure-code.fd.bz2 +++ b/pc-bios/edk2-i386-secure-code.fd.bz2 diff --git a/pc-bios/edk2-x86_64-code.fd.bz2 b/pc-bios/edk2-x86_64-code.fd.bz2 Binary files differindex e1654d4003..37bfb0dbed 100644 --- a/pc-bios/edk2-x86_64-code.fd.bz2 +++ b/pc-bios/edk2-x86_64-code.fd.bz2 diff --git a/pc-bios/edk2-x86_64-microvm.fd.bz2 b/pc-bios/edk2-x86_64-microvm.fd.bz2 Binary files differnew file mode 100644 index 0000000000..1d65c61ded --- /dev/null +++ b/pc-bios/edk2-x86_64-microvm.fd.bz2 diff --git a/pc-bios/edk2-x86_64-secure-code.fd.bz2 b/pc-bios/edk2-x86_64-secure-code.fd.bz2 Binary files differindex 767274c38c..76dc6d5aad 100644 --- a/pc-bios/edk2-x86_64-secure-code.fd.bz2 +++ b/pc-bios/edk2-x86_64-secure-code.fd.bz2 diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index fdae0b511f..485f2244b1 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -13,6 +13,7 @@ SHELL = /bin/bash +target = RELEASE toolchain = $(shell source ./edk2-funcs.sh && qemu_edk2_get_toolchain $(1)) licenses := \ @@ -32,6 +33,7 @@ flashdevs := \ i386-secure-code \ x86_64-code \ x86_64-secure-code \ + x86_64-microvm \ \ arm-vars \ i386-vars @@ -50,7 +52,7 @@ all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \ # we're building from a tarball and that they've already been fetched by # make-release/tarball scripts. submodules: - if test -d edk2/.git; then \ + if test -e edk2/.git; then \ cd edk2 && git submodule update --init --force -- \ ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \ BaseTools/Source/C/BrotliCompress/brotli \ @@ -73,7 +75,7 @@ submodules: -D NETWORK_TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE - cp edk2/Build/ArmVirtQemu-AARCH64/DEBUG_$(call toolchain,aarch64)/FV/QEMU_EFI.fd \ + cp edk2/Build/ArmVirtQemu-AARCH64/$(target)_$(call toolchain,aarch64)/FV/QEMU_EFI.fd \ $@ truncate --size=64M $@ @@ -87,7 +89,7 @@ submodules: -D NETWORK_TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE - cp edk2/Build/ArmVirtQemu-ARM/DEBUG_$(call toolchain,arm)/FV/QEMU_EFI.fd \ + cp edk2/Build/ArmVirtQemu-ARM/$(target)_$(call toolchain,arm)/FV/QEMU_EFI.fd \ $@ truncate --size=64M $@ @@ -101,7 +103,7 @@ submodules: -D NETWORK_TLS_ENABLE \ -D TPM_ENABLE \ -D TPM_CONFIG_ENABLE - cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ + cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ ../pc-bios/edk2-i386-secure-code.fd: submodules +./edk2-build.sh \ @@ -115,7 +117,7 @@ submodules: -D TPM_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ -D SMM_REQUIRE - cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ + cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ ../pc-bios/edk2-x86_64-code.fd: submodules +./edk2-build.sh \ @@ -127,7 +129,7 @@ submodules: -D NETWORK_TLS_ENABLE \ -D TPM_ENABLE \ -D TPM_CONFIG_ENABLE - cp edk2/Build/OvmfX64/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ + cp edk2/Build/OvmfX64/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ ../pc-bios/edk2-x86_64-secure-code.fd: submodules +./edk2-build.sh \ @@ -142,15 +144,25 @@ submodules: -D TPM_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ -D SMM_REQUIRE - cp edk2/Build/Ovmf3264/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ + cp edk2/Build/Ovmf3264/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ + +../pc-bios/edk2-x86_64-microvm.fd: submodules + +./edk2-build.sh \ + x86_64 \ + --arch=X64 \ + --platform=OvmfPkg/Microvm/MicrovmX64.dsc \ + -D NETWORK_IP6_ENABLE \ + -D NETWORK_HTTP_BOOT_ENABLE \ + -D NETWORK_TLS_ENABLE + cp edk2/Build/MicrovmX64/$(target)_$(call toolchain,x86_64)/FV/MICROVM.fd $@ ../pc-bios/edk2-arm-vars.fd: ../pc-bios/edk2-arm-code.fd - cp edk2/Build/ArmVirtQemu-ARM/DEBUG_$(call toolchain,arm)/FV/QEMU_VARS.fd \ + cp edk2/Build/ArmVirtQemu-ARM/$(target)_$(call toolchain,arm)/FV/QEMU_VARS.fd \ $@ truncate --size=64M $@ ../pc-bios/edk2-i386-vars.fd: ../pc-bios/edk2-i386-code.fd - cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_VARS.fd $@ + cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_VARS.fd $@ # The license file accumulates several individual licenses from under edk2, # prefixing each individual license with a header (generated by "tail") that diff --git a/roms/edk2 b/roms/edk2 -Subproject 06dc822d045c2bb42e497487935485302486e15 +Subproject b24306f15daa2ff8510b06702114724b33895d3 diff --git a/roms/edk2-build.sh b/roms/edk2-build.sh index d5391c7637..ea79dc27a2 100755 --- a/roms/edk2-build.sh +++ b/roms/edk2-build.sh @@ -50,6 +50,6 @@ qemu_edk2_set_cross_env "$emulation_target" build \ --cmd-len=65536 \ -n "$edk2_thread_count" \ - --buildtarget=DEBUG \ + --buildtarget=RELEASE \ --tagname="$edk2_toolchain" \ "${args[@]}" diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp Binary files differindex 375d7b6fc8..4c363a6d95 100644 --- a/tests/data/acpi/virt/SSDT.memhp +++ b/tests/data/acpi/virt/SSDT.memhp |