From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web10.5082.1582814471778587364 for ; Thu, 27 Feb 2020 06:41:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=m6jh68qS; spf=pass (domain: linaro.org, ip: 209.85.221.46, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f46.google.com with SMTP id j7so3600781wrp.13 for ; Thu, 27 Feb 2020 06:41:11 -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=rrfxsOJdlmTquPjP9D5YcG+ZAPJmGNYmXT5xwNlIQIg=; b=m6jh68qSbKxhyumZGaplIX+DIGO1qOua1uRmkr8misc7MrbFDad6ryFxiwDMKu7kyk 2ysRy8yLTr7SqtGQvUUCprajyc0/FwH51td5qSIuwJQvLX1dInm4RHvwOGYYF6MR+KjC vV6LQNdaYaJAGVhYK9+tBH7JnR/7Qmk8/DdKC6f6wQi/lj7kt26fGMR3WE55OH1uwm/+ dLX6FAidWxPX55QaZ8eDunINCAomCUKDPgnlXi0GV2FisJTdhMR645x8sXq4jYge4vG4 HiDMwZV/SX5jY7/R19W7dOg2A/gWLp2Y8ezMiDMXmq21Rq/dQlKnrl9h8EhiLr0vLRMV wn5g== 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=rrfxsOJdlmTquPjP9D5YcG+ZAPJmGNYmXT5xwNlIQIg=; b=YZqwckEjOxCBOiOYFUKGJBRcrU3YA3yiZTBiGkM/bknolA/G4WAGW/5Dgb5kt3SsMU wjiCC7XCbRF1vwVNrxjxp91T3z3iLrusyGE5/j1gPQliSY8QLIseZU+eXE4fNmoFlYnp WI6icdgkdKrvDGycrWPITNVh1SBg7z13gO/p87Zq48S4wON90svW6mqnMG/C695YZOSg +WDxZE2V28jCemFdoWTmSoK06P/3Qf6GVhzee1UVkCO86AiirFv7FDi6kiVYDAo+J5OX +0EsKSOzBJT20CV90NF0YtqAQeCowacNQY4LCuyk+cHsvM7T0f5hVDVLopAg2xe6RSea AOrw== X-Gm-Message-State: APjAAAXOjSJ2vjyxs1tcDOpIl4aYwNBjaI2PU0l0WSuDczVSlutUuewo M0XwRHcbPx17qPEC46zLrb5HnmDG9ek= X-Google-Smtp-Source: APXvYqyWDa6YECm+ioYHTU5yAadGNGwpYDJihfxsbuFTc8QvIZqeG5SPZPR8keiJJIyxBfmXGLL1xQ== X-Received: by 2002:adf:de12:: with SMTP id b18mr5076878wrm.268.1582814470139; Thu, 27 Feb 2020 06:41:10 -0800 (PST) Return-Path: Received: from localhost.localdomain (aaubervilliers-682-1-29-142.w90-88.abo.wanadoo.fr. [90.88.192.142]) by smtp.gmail.com with ESMTPSA id k7sm8273575wrq.12.2020.02.27.06.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 06:41:09 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, eric.auger@redhat.com, philmd@redhat.com, marcandre.lureau@redhat.com, stefanb@linux.ibm.com, leif@nuviainc.com Subject: [PATCH v4 08/11] ArmVirtPkg: unshare TpmMeasurementLib resolution between platforms Date: Thu, 27 Feb 2020 15:40:53 +0100 Message-Id: <20200227144056.56988-9-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227144056.56988-1-ard.biesheuvel@linaro.org> References: <20200227144056.56988-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In preparation of conditializing the choice of resolution based on TPM2_ENABLE for ArmVirtQemu, move the TpmMeasurementLib out of the shared .DSC include and into the individual DSCs. Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirt.dsc.inc | 1 - ArmVirtPkg/ArmVirtQemu.dsc | 1 + ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 + ArmVirtPkg/ArmVirtXen.dsc | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 8f9617359607..0a28d3a610d6 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -172,7 +172,6 @@ [LibraryClasses.common] !else AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf !endif - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 8950116dacab..2f0aac5f1cb8 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -74,6 +74,7 @@ [LibraryClasses.common] PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf !if $(TPM2_ENABLE) == TRUE Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 720f8fa78b3d..37e19dfbd0db 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -73,6 +73,7 @@ [LibraryClasses.common] PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf [LibraryClasses.common.DXE_DRIVER] ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index baa21f389947..8a489b253684 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -47,6 +47,7 @@ [LibraryClasses] BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf [LibraryClasses.common.UEFI_DRIVER] UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf -- 2.20.1