From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.groups.io with SMTP id smtpd.web12.8719.1578494330608915036 for ; Wed, 08 Jan 2020 06:38:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=Qne6cLVa; spf=pass (domain: linaro.org, ip: 209.85.128.67, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f67.google.com with SMTP id u2so2758580wmc.3 for ; Wed, 08 Jan 2020 06:38:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=efUBYOSi+eoGp0jiYFQX6YD8qUNsF5n5xscudSNPwKw=; b=Qne6cLVa8L40ckfwjlvOAnn5dwmZt4bTOjT1Y4S9zfdle5H/m50j1ZhUIKzjwYt5PB 5jNxB3zFjt3kQ5pg9J25P+OSYZ2+5N3RPF7/RQEL6UvYqEZZyrf1TeptG6zB1bwXjQR3 JIdj2q9Fe4Ltwuf2rY6hdWaF50vzHfcKR73OxDjxO9ozKpPB9FA46tIEewAxBMbOjeyp WKTz1ywQ1+lyvzCtVf9HFjrezeYmga8/aB3CD0kkjiQqj6jQy+Z29VMpQg8EuZSwLEHY SB7Nuo03IKt4RJw9JE7C7IG/1ZRCdv2KpRuHEspA+rRqF+KqQ3pSlkgTqA6qJq9ZKCTu Iobg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=efUBYOSi+eoGp0jiYFQX6YD8qUNsF5n5xscudSNPwKw=; b=YjzSGNL6jd5KfzB84DBJLqm9x13vyNx1HUJW97pLyWYQhW7dUmzyLwOdVMCF64O1hQ R9BW1nNdeBykbqGJUv4ZsI3fnfS3NNK5ixWv1fNAvbcmlki5dQaOwiqcdrHm/EpM7KJa pCK/d/FcjRPCoW7StqDaFRrxzTDKZ0oSQkTZ+UVY5L99KB48nl9vyveCoOkPyo2wUcB8 bjghXw9EYfFmE+WDqRbkfHtds9G94gFmb9jR9tB0ROW4hMmobPc82jj31poo1eBpeKHF vdDpD8epx02/F6YrtUnnEzbmkbwXlfs76zEdO+q1tOevT+WAs1yT6Y9R3rHjym/lwxmN Lq+A== X-Gm-Message-State: APjAAAWnAzqIDgczRNCH0X9uoKUulCZwJlWbEp15brkwTO8nzOnW48Dg u/FJbslSdfpYn87G7xSxKfdlrpT4icjkfA== X-Google-Smtp-Source: APXvYqyuTp7pD9fZi9KrcGupUF879t1nDGhMDneYEtkigo7c7EKjgfKAKoRBEwU7RJ5qSQae5OQBYw== X-Received: by 2002:a1c:2187:: with SMTP id h129mr4449536wmh.44.1578494328899; Wed, 08 Jan 2020 06:38:48 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2a01:cb1d:112:6f00:30ac:cba9:9f83:e5db]) by smtp.gmail.com with ESMTPSA id r15sm3934848wmh.21.2020.01.08.06.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 06:38:48 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: philmd@redhat.com, lersek@redhat.com, Ard Biesheuvel Subject: [PATCH 1/2] OvmfPkg: reorganize TPM2 support in DSC/FDF files Date: Wed, 8 Jan 2020 15:38:42 +0100 Message-Id: <20200108143843.4198-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108143843.4198-1-ard.biesheuvel@linaro.org> References: <20200108143843.4198-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Put the TPM2 related DXE modules together in the DSC, and add a TPM2 support header comment while at it. Signed-off-by: Ard Biesheuvel --- OvmfPkg/OvmfPkgIa32.dsc | 9 ++++++--- OvmfPkg/OvmfPkgIa32X64.dsc | 9 ++++++--- OvmfPkg/OvmfPkgX64.dsc | 3 +++ OvmfPkg/OvmfPkgIa32.fdf | 3 +++ OvmfPkg/OvmfPkgIa32X64.fdf | 3 +++ OvmfPkg/OvmfPkgX64.fdf | 3 +++ 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 9a60eb8fe2b0..f9e0b4b5bc54 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -632,9 +632,6 @@ [Components] NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf } -!if $(TPM2_CONFIG_ENABLE) == TRUE - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf -!endif !endif # @@ -902,6 +899,9 @@ [Components] } !endif + # + # TPM2 support + # !if $(TPM2_ENABLE) == TRUE SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { @@ -914,4 +914,7 @@ [Components] NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf } +!if $(TPM2_CONFIG_ENABLE) == TRUE + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf +!endif !endif diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 1d1480b50b02..ee83bbaa5379 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -644,9 +644,6 @@ [Components.IA32] NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf } -!if $(TPM2_CONFIG_ENABLE) == TRUE - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf -!endif !endif [Components.X64] @@ -916,6 +913,9 @@ [Components.X64] } !endif + # + # TPM2 support + # !if $(TPM2_ENABLE) == TRUE SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { @@ -928,4 +928,7 @@ [Components.X64] NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf } +!if $(TPM2_CONFIG_ENABLE) == TRUE + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf +!endif !endif diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index c287a436f8ec..2b6106ff313f 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -914,6 +914,9 @@ [Components] } !endif + # + # TPM2 support + # !if $(TPM2_ENABLE) == TRUE SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 586bbff08585..63607551ed75 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -343,6 +343,9 @@ [FV.DXEFV] INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf !endif +# +# TPM2 support +# !if $(TPM2_ENABLE) == TRUE INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf !if $(TPM2_CONFIG_ENABLE) == TRUE diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index e49adc425fce..0488e5d95ffe 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -350,6 +350,9 @@ [FV.DXEFV] INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf !endif +# +# TPM2 support +# !if $(TPM2_ENABLE) == TRUE INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf !if $(TPM2_CONFIG_ENABLE) == TRUE diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index e49adc425fce..0488e5d95ffe 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -350,6 +350,9 @@ [FV.DXEFV] INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf !endif +# +# TPM2 support +# !if $(TPM2_ENABLE) == TRUE INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf !if $(TPM2_CONFIG_ENABLE) == TRUE -- 2.20.1