From patchwork Wed Nov 23 13:24:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9443525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 068A6600BA for ; Wed, 23 Nov 2016 14:39:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECA7A265B9 for ; Wed, 23 Nov 2016 14:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFF6826BE9; Wed, 23 Nov 2016 14:39:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6C260265B9 for ; Wed, 23 Nov 2016 14:39:13 +0000 (UTC) Received: from localhost ([::1]:34235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c9Yhb-0003pl-Qm for patchwork-qemu-devel@patchwork.kernel.org; Wed, 23 Nov 2016 09:39:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c9XXs-0000Tu-ET for qemu-devel@nongnu.org; Wed, 23 Nov 2016 08:25:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c9XXm-0005N8-Mu for qemu-devel@nongnu.org; Wed, 23 Nov 2016 08:25:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53366) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c9XXm-0005KS-GT for qemu-devel@nongnu.org; Wed, 23 Nov 2016 08:24:58 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A2B37EBB4 for ; Wed, 23 Nov 2016 13:24:57 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uANDOtpu009389; Wed, 23 Nov 2016 08:24:56 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 9652A80E6E; Wed, 23 Nov 2016 14:24:52 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 23 Nov 2016 14:24:44 +0100 Message-Id: <1479907484-4988-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1479907484-4988-1-git-send-email-kraxel@redhat.com> References: <1479907484-4988-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 23 Nov 2016 13:24:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RfC PATCH 3/3] edk2: use EfiRom utility from edk2 submodule X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Gerd Hoffmann --- 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