Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
---
roms/Makefile | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/roms/Makefile b/roms/Makefile
index be20fe4..569b450 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -43,17 +43,6 @@ aarch64_cross_prefix := $(call find-cross-prefix,aarch64)
# tag our seabios builds
SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org"
-#
-# EfiRom utility is shipped with edk2 / tianocore, in BaseTools/
-#
-# We need that to combine multiple images (legacy bios,
-# efi ia32, efi x64) into a single rom binary.
-#
-# We try to find it in the path. You can also pass the location on
-# the command line, i.e. "make EFIROM=/path/to/EfiRom efirom"
-#
-EFIROM ?= $(shell which EfiRom 2>/dev/null)
-
default:
@echo "nothing is build by default"
@echo "available build targets:"
@@ -62,8 +51,7 @@ default:
@echo " lgplvgabios -- update vgabios binaries (lgpl)"
@echo " sgabios -- update sgabios binaries"
@echo " pxerom -- update nic roms (bios only)"
- @echo " efirom -- update nic roms (bios+efi, this needs"
- @echo " the EfiRom utility from edk2 / tianocore)"
+ @echo " efirom -- update nic roms (bios+efi)"
@echo " slof -- update slof.bin"
@echo " skiboot -- update skiboot.lid"
@echo " u-boot.e500 -- update u-boot.e500"
@@ -119,8 +107,9 @@ pxe-rom-%: build-pxe-roms
efirom: $(patsubst %,efi-rom-%,$(pxerom_variants))
-efi-rom-%: build-pxe-roms build-efi-roms
- $(EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \
+efi-rom-%: build-pxe-roms build-efi-roms edk2-tools
+ edk2/BaseTools/Source/C/bin/EfiRom \
+ -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \
-b ipxe/src/bin/$(VID)$(DID).rom \
-ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \
-ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \
@@ -168,6 +157,9 @@ edk2-arm:
edk2-aarch64:
sh ./compile-edk2.sh aarch64 $(aarch64_cross_prefix)
+edk2-tools:
+ make -C edk2/BaseTools
+
edk2-clean:
make -C edk2/BaseTools clean
rm -rf edk2/Build
--
1.8.3.1
