Commit 3284aa12 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/lersek/tags/edk2-pull-2019-04-22' into staging 



Advance the roms/edk2 submodule to the "edk2-stable201903" release, and
build and capture platform firmware binaries from that release. The
binaries are meant to be used by both end-users and by the "BIOS tables"
unit tests in qtest ("make check").

# gpg: Signature made Mon 22 Apr 2019 19:20:08 BST
# gpg:                using RSA key D39DA71E0D496CFA
# gpg: Good signature from "Laszlo Ersek <lersek@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: F5D9 660F 1BA5 F310 A95A  C5E0 466A EAE0 6125 3988
#      Subkey fingerprint: B3A5 5D3F 88A8 90ED 2E63  3E8D D39D A71E 0D49 6CFA

* remotes/lersek/tags/edk2-pull-2019-04-22:
  MAINTAINERS: add the "EDK2 Firmware" subsystem
  Makefile: install the edk2 firmware images and their descriptors
  tests: add missing dependency to build QTEST_QEMU_BINARY, round 2
  pc-bios: document the edk2 firmware images; add firmware descriptors
  pc-bios: add edk2 firmware binaries and variable store templates
  roms: build edk2 firmware binaries and variable store templates
  roms/Makefile: replace the $(EDK2_EFIROM) target with "edk2-basetools"
  roms/edk2-funcs.sh: add the qemu_edk2_get_thread_count() function
  roms/edk2: advance to tag edk2-stable201903
  tests/uefi-test-tools/build.sh: work around TianoCore#1607
  roms/edk2-funcs.sh: require gcc-4.8+ for building i386 and x86_64
  roms: lift "edk2-funcs.sh" from "tests/uefi-test-tools/build.sh"

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c4e9f845 6739df3f

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
*.gcno

*.gcov

/pc-bios/bios-pq/status

/pc-bios/edk2-*.fd

/pc-bios/vgabios-pq/status

/pc-bios/optionrom/linuxboot.asm

/pc-bios/optionrom/linuxboot.bin

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -2224,6 +2224,18 @@ F: include/hw/i2c/smbus_master.h 
F: include/hw/i2c/smbus_slave.h

F: include/hw/i2c/smbus_eeprom.h



EDK2 Firmware

M: Laszlo Ersek <lersek@redhat.com>

M: Philippe Mathieu-Daudé <philmd@redhat.com>

S: Supported

F: pc-bios/descriptors/??-edk2-*.json

F: pc-bios/edk2-*

F: roms/Makefile.edk2

F: roms/edk2

F: roms/edk2-*

F: tests/data/uefi-boot-images/

F: tests/uefi-test-tools/



Usermode Emulation

------------------

Overall

Makefile

+28 −1
Original line number Diff line number Diff line
@@ -296,6 +296,10 @@ ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Makefile 
$(KEYCODEMAP_GEN): .git-submodule-status

$(KEYCODEMAP_CSV): .git-submodule-status



edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2))

pc-bios/edk2-%.fd: pc-bios/edk2-%.fd.bz2

	$(call quiet-command,bzip2 -d -c $< > $@,"BUNZIP2",$<)



# Don't try to regenerate Makefile or configure

# We don't generate any of them

Makefile: ;
@@ -445,6 +449,7 @@ $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) 
$(SOFTMMU_SUBDIR_RULES): $(crypto-obj-y)

$(SOFTMMU_SUBDIR_RULES): $(io-obj-y)

$(SOFTMMU_SUBDIR_RULES): config-all-devices.mak

$(SOFTMMU_SUBDIR_RULES): $(edk2-decompressed)



subdir-%:

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)
@@ -633,6 +638,7 @@ clean: 
		! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \

		! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \

		-exec rm {} +

	rm -f $(edk2-decompressed)

	rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~

	rm -f fsdev/*.pod scsi/*.pod

	rm -f qemu-img-cmds.h
@@ -723,9 +729,14 @@ spapr-rtas.bin slof.bin skiboot.lid \ 
palcode-clipper \

u-boot.e500 u-boot-sam460-20100605.bin \

qemu_vga.ndrv \

edk2-licenses.txt \

hppa-firmware.img



DESCS=50-edk2-i386-secure.json 50-edk2-x86_64-secure.json \

60-edk2-aarch64.json 60-edk2-arm.json 60-edk2-i386.json 60-edk2-x86_64.json

else

BLOBS=

DESCS=

endif



# Note that we manually filter-out the non-Sphinx documentation which
@@ -786,7 +797,8 @@ endif 


ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512



install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir

install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \

	$(if $(INSTALL_BLOBS),$(edk2-decompressed))

ifneq ($(TOOLS),)

	$(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))

endif
@@ -808,6 +820,21 @@ ifneq ($(BLOBS),) 
	set -e; for x in $(BLOBS); do \

		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \

	done

endif

ifdef INSTALL_BLOBS

	set -e; for x in $(edk2-decompressed); do \

		$(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)"; \

	done

endif

ifneq ($(DESCS),)

	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware"

	set -e; tmpf=$$(mktemp); trap 'rm -f -- "$$tmpf"' EXIT; \

	for x in $(DESCS); do \

		sed -e 's,@DATADIR@,$(DESTDIR)$(qemu_datadir),' \

			"$(SRC_PATH)/pc-bios/descriptors/$$x" > "$$tmpf"; \

		$(INSTALL_DATA) "$$tmpf" \

			"$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \

	done

endif

	for s in $(ICON_SIZES); do \

		mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps"; \

configure

+1 −0
Original line number Diff line number Diff line
@@ -7892,6 +7892,7 @@ for bios_file in \ 
    $source_path/pc-bios/*.img \

    $source_path/pc-bios/openbios-* \

    $source_path/pc-bios/u-boot.* \

    $source_path/pc-bios/edk2-*.fd.bz2 \

    $source_path/pc-bios/palcode-*

do

    LINKS="$LINKS pc-bios/$(basename $bios_file)"

pc-bios/README

+11 −0
Original line number Diff line number Diff line
@@ -50,3 +50,14 @@ 


- QemuMacDrivers (https://github.com/ozbenh/QemuMacDrivers) is a project to

  provide virtualised drivers for PPC MacOS guests.



- The "edk2-*.fd.bz2" images are platform firmware binaries and matching UEFI

  variable store templates built from the TianoCore community's EFI Development

  Kit II project

  <https://github.com/tianocore/tianocore.github.io/wiki/EDK-II>. The images

  were built at git tag "edk2-stable201903". The firmware binaries bundle parts

  of the OpenSSL project, at git tag "OpenSSL_1_1_0j" (the OpenSSL tag is a

  function of the edk2 tag). Licensing information is given in

  "edk2-licenses.txt". The image files are described by the JSON documents in

  the "pc-bios/descriptors" directory, which conform to the

  "docs/interop/firmware.json" schema.