From patchwork Tue Sep 8 07:29:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 305967 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90708C433E2 for ; Tue, 8 Sep 2020 07:35:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 06BA2218AC for ; Tue, 8 Sep 2020 07:35:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AUExA8aa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 06BA2218AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFY9n-0000Qg-50 for qemu-devel@archiver.kernel.org; Tue, 08 Sep 2020 03:35:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFY4l-0001Jx-Pa for qemu-devel@nongnu.org; Tue, 08 Sep 2020 03:29:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kFY4k-0003lz-0H for qemu-devel@nongnu.org; Tue, 08 Sep 2020 03:29:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599550196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NeOzfZxRrCb+8/H1zC/N+Q8LyzPvP3uJveuIN/oj5Vk=; b=AUExA8aaoNjiPS1Am1OmcHlFql3MIGwZF60uqgN+gkF7cl7Va3pHMeCPSzMagLlN48G0yE tLi57FmMXQhjaRJKBSt/AzGZ539l5Br6+xavaPqtur2wfYpTMUgMH69C3Y0kXrcE5GkCht mlPZOoi40luP1igWSNEaqqGwhMyKEcY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-243-MNLmh2oxOzGIZ__w7BjgTQ-1; Tue, 08 Sep 2020 03:29:54 -0400 X-MC-Unique: MNLmh2oxOzGIZ__w7BjgTQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0D71718B9ECB for ; Tue, 8 Sep 2020 07:29:54 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-112-122.ams2.redhat.com [10.36.112.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 397E47E30C; Tue, 8 Sep 2020 07:29:53 +0000 (UTC) From: Laszlo Ersek To: qemu devel list Subject: [PATCH 06/10] roms/Makefile.edk2: complete replacing TPM2*_ENABLE macros Date: Tue, 8 Sep 2020 09:29:35 +0200 Message-Id: <20200908072939.30178-7-lersek@redhat.com> In-Reply-To: <20200908072939.30178-1-lersek@redhat.com> References: <20200908072939.30178-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=lersek@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/08 02:10:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" At tag "edk2-stable202008", the TPM2_ENABLE and TPM2_CONFIG_ENABLE macros are useless (for IA32 and X64). Their roles have been absorbed by TPM_ENABLE and TPM_CONFIG_ENABLE, respectively. Remove the old build flags. Cc: Philippe Mathieu-Daudé Ref: https://bugs.launchpad.net/qemu/+bug/1852196 Signed-off-by: Laszlo Ersek --- roms/Makefile.edk2 | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 7c06645c95ca..8cdf337fc1e9 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -89,9 +89,7 @@ submodules: -D NETWORK_HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ -D TPM_ENABLE \ - -D TPM_CONFIG_ENABLE \ - -D TPM2_ENABLE \ - -D TPM2_CONFIG_ENABLE + -D TPM_CONFIG_ENABLE cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ ../pc-bios/edk2-i386-secure-code.fd: submodules @@ -104,8 +102,6 @@ submodules: -D NETWORK_TLS_ENABLE \ -D TPM_ENABLE \ -D TPM_CONFIG_ENABLE \ - -D TPM2_ENABLE \ - -D TPM2_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ -D SMM_REQUIRE cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ @@ -119,9 +115,7 @@ submodules: -D NETWORK_HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ -D TPM_ENABLE \ - -D TPM_CONFIG_ENABLE \ - -D TPM2_ENABLE \ - -D TPM2_CONFIG_ENABLE + -D TPM_CONFIG_ENABLE cp edk2/Build/OvmfX64/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ ../pc-bios/edk2-x86_64-secure-code.fd: submodules @@ -135,8 +129,6 @@ submodules: -D NETWORK_TLS_ENABLE \ -D TPM_ENABLE \ -D TPM_CONFIG_ENABLE \ - -D TPM2_ENABLE \ - -D TPM2_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ -D SMM_REQUIRE cp edk2/Build/Ovmf3264/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@