From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web12.31234.1635164164651784167 for ; Mon, 25 Oct 2021 05:16:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WZ0CWzda; spf=pass (domain: redhat.com, ip: 216.205.24.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635164163; 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=RGptFY5cqc2t4i/TVjM+kSQLv7t+dfaq19cVC+CDrzs=; b=WZ0CWzdaJekYlz5yN+FPxQZvWJPlzdSP8X/79ZdF7JiFzR9ygC0d7pQBsN4LISBgQGh52e b6w97Hb8ticcllkWTq9UpQQsCwp9Nk94ekR9o+WSsKpOP8lc5UxF8jN2oHFH7TLhdhwzt0 nHeqGPmVuBEilWJVWdJ+skd8qpo17Fc= 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-235-dCPecES1OpKH5XsDcjsiLA-1; Mon, 25 Oct 2021 08:15:59 -0400 X-MC-Unique: dCPecES1OpKH5XsDcjsiLA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 85F568735CF; Mon, 25 Oct 2021 12:15:57 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51E451882B; Mon, 25 Oct 2021 12:15:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3B9F31801A97; Mon, 25 Oct 2021 14:15:12 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Jordan Justen , Min Xu , Brijesh Singh , Jiewen Yao , Gerd Hoffmann , James Bottomley , Erdem Aktas , Tom Lendacky , Stefan Berger , Ard Biesheuvel Subject: [PATCH v2 5/5] OvmfPkg: add TPM 1.2 config menu Date: Mon, 25 Oct 2021 14:15:12 +0200 Message-Id: <20211025121512.120926-6-kraxel@redhat.com> In-Reply-To: <20211025121512.120926-1-kraxel@redhat.com> References: <20211025121512.120926-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" When building OVMF with TPM 1.2 support enabled do also include the configuration menu. Suggested-by: Stefan Berger Signed-off-by: Gerd Hoffmann --- OvmfPkg/OvmfTpmComponentsDxe.dsc.inc | 1 + OvmfPkg/OvmfTpmDxe.fdf.inc | 1 + 2 files changed, 2 insertions(+) diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc index 75ae09571e8c..cdcae42ad1dc 100644 --- a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +++ b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc @@ -20,6 +20,7 @@ Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf } + SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf !endif SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf { diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/OvmfTpmDxe.fdf.inc index 7fc2bf8590a4..5907d8a8f1f3 100644 --- a/OvmfPkg/OvmfTpmDxe.fdf.inc +++ b/OvmfPkg/OvmfTpmDxe.fdf.inc @@ -5,6 +5,7 @@ !if $(TPM2_ENABLE) == TRUE !if $(TPM1_ENABLE) == TRUE INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf +INF SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf !endif INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf -- 2.31.1