From patchwork Tue Sep 8 07:29:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 11762719 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8CE29746 for ; Tue, 8 Sep 2020 07:32:24 +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 4C9BC218AC for ; Tue, 8 Sep 2020 07:32:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Kfm9iuib" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C9BC218AC 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:52478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFY75-0005pT-ES for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 Sep 2020 03:32:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFY4h-0001Bn-8q for qemu-devel@nongnu.org; Tue, 08 Sep 2020 03:29:55 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:54720 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kFY4e-0003k2-Fp for qemu-devel@nongnu.org; Tue, 08 Sep 2020 03:29:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599550191; 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=tnr1pI1n8EI25hLmY8tM6ZUgIEhmTjcSrt1jUFrneW8=; b=Kfm9iuibRtbEYG/N7n6h8OWPJ5tZfPW0M/SZGKEtffOOxrpCm6gsDHP3WwuF9S4/4M8A2C TSfonSLzjH3e/ltI9u/1awbdY9zH1/KNiIUcS5livYH7EPnH+19U+et+AeXXnVR7aYtVCU g+m91YgL/wIeqZTSfzBPQrdxwUrnBF0= 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-33-hzqgVeXANk-hkoqb5N3BAA-1; Tue, 08 Sep 2020 03:29:49 -0400 X-MC-Unique: hzqgVeXANk-hkoqb5N3BAA-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 C374080734C for ; Tue, 8 Sep 2020 07:29:48 +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 EC22C7E30C; Tue, 8 Sep 2020 07:29:47 +0000 (UTC) From: Laszlo Ersek To: qemu devel list Subject: [PATCH 03/10] roms/Makefile.edk2: prepare for replacing TPM2*_ENABLE macros Date: Tue, 8 Sep 2020 09:29:32 +0200 Message-Id: <20200908072939.30178-4-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.003 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=lersek@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/08 03:00:34 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_H2=-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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Ekd2 commit 07952a962a40 ("OvmfPkg: rename TPM2 config prefix to TPM", 2020-03-04), part of edk2-stable202005, renamed OVMF's TPM2*_ENABLE build flags to TPM*_ENABLE. Going forward, the TPM*_ENABLE flags would activate both TPM1.2 and TPM2.0 support. In order to build OVMF at edk2-stable202008 without losing currently enabled functionality, insert the new flags as no-ops now. We'll remove the old flags after advancing with the edk2 submodule. Cc: Philippe Mathieu-Daudé Ref: https://bugs.launchpad.net/qemu/+bug/1852196 Signed-off-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daudé --- roms/Makefile.edk2 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 33a074d3a4c2..7c06645c95ca 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -88,6 +88,8 @@ submodules: -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ + -D TPM_ENABLE \ + -D TPM_CONFIG_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ @@ -100,6 +102,8 @@ submodules: -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ + -D TPM_ENABLE \ + -D TPM_CONFIG_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ @@ -114,6 +118,8 @@ submodules: -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ + -D TPM_ENABLE \ + -D TPM_CONFIG_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE cp edk2/Build/OvmfX64/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ @@ -127,6 +133,8 @@ submodules: -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ + -D TPM_ENABLE \ + -D TPM_CONFIG_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \