On 30 June 2015 at 15:56, Zeng, Star <star.z...@intel.com> wrote: > Got the point. I was really not familiar with the *.dsc.inc in platform > packages. Sorry about that. > > Check the attached updated patch, please. I really want to resend the whole > serial patches again since other patches have passed the review. >
Yes, that looks fine. Reviewed-by: Ard Biesheuvel <ard.biesheu...@linaro.org> I would also like to thank you for using the Git setup that Laszlo suggested. Having diff lines like @@ -123,6 +124,9 @@ [LibraryClasses.common] makes life as a reviewer very easy! Thanks, Ard. > -----Original Message----- > From: Ard Biesheuvel [mailto:ard.biesheu...@linaro.org] > Sent: Tuesday, June 30, 2015 9:25 PM > To: edk2-devel@lists.sourceforge.net > Subject: Re: [edk2] [PATCH V4 11/21] ArmPlatformPkg: Add TpmMeasurementLib > and AuthVariableLib library mapping > > On 30 June 2015 at 11:01, Star Zeng <star.z...@intel.com> wrote: >> These library classes are now linked with >> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> to optionally support secure variables. >> >> For ArmPlatformPkg, secure boot is not currently enabled, so we map >> these libraries to the NULL versions that don't support secure variables. >> >> Cc: Olivier Martin <olivier.mar...@arm.com> >> Cc: Leif Lindholm <leif.lindh...@linaro.org> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Star Zeng <star.z...@intel.com> >> --- >> ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc | 7 ++++++- >> ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc | 7 ++++++- >> ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc | 7 ++++++- >> ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc | 7 ++++++- >> ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc | 7 ++++++- >> ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc | 7 ++++++- >> ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc | 7 ++++++- >> ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc | 7 ++++++- >> ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc | 7 ++++++- >> ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc | 7 ++++++- >> 10 files changed, 60 insertions(+), 10 deletions(-) >> > > Since none of these platforms implement UEFI Secure Boot, you could probably > just add these two library resolutions to the [LibraryClasses.common] > sections of > > ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc > ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc > > since these two are included by all .DSCs that you modify here. > > -- > Ard. > > > >> diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc >> b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc >> index b5b959a..68cd4f7 100644 >> --- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc >> +++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc >> @@ -1,5 +1,6 @@ >> # >> # Copyright (c) 2013-2015, ARM Limited. All rights reserved. >> +# Copyright (c) 2015, Intel Corporation. All rights reserved. >> # >> # This program and the accompanying materials >> # are licensed and made available under the terms and conditions of the >> BSD License >> @@ -222,7 +223,11 @@ [Components.common] >> MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf >> EmbeddedPkg/SerialDxe/SerialDxe.inf >> >> - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { >> + <LibraryClasses> >> + >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf >> + >> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf >> + } >> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf >> >> # >> diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc >> b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc >> index a64f2df..4fb2a79 100644 >> --- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc >> +++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc >> @@ -1,5 +1,6 @@ >> # >> # Copyright (c) 2011-2014, ARM Limited. All rights reserved. >> +# Copyright (c) 2015, Intel Corporation. All rights reserved. >> # >> # This program and the accompanying materials >> # are licensed and made available under the terms and conditions of the >> BSD License >> @@ -194,7 +195,11 @@ [Components.common] >> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >> MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf >> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >> - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { >> + <LibraryClasses> >> + >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf >> + >> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf >> + } >> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf >> EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf >> >> diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc >> b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc >> index a4bffb3..9449a0a 100644 >> --- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc >> +++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc >> @@ -1,5 +1,6 @@ >> # >> # Copyright (c) 2011-2014, ARM Limited. All rights reserved. >> +# Copyright (c) 2015, Intel Corporation. All rights reserved. >> # >> # This program and the accompanying materials >> # are licensed and made available under the terms and conditions of the >> BSD License >> @@ -194,7 +195,11 @@ [Components.common] >> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >> MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf >> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >> - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { >> + <LibraryClasses> >> + >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf >> + >> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf >> + } >> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf >> EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf >> >> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc >> b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc >> index a00a80f..0d935ac 100644 >> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc >> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc >> @@ -1,5 +1,6 @@ >> # >> # Copyright (c) 2012-2015, ARM Limited. All rights reserved. >> +# Copyright (c) 2015, Intel Corporation. All rights reserved. >> # >> # This program and the accompanying materials >> # are licensed and made available under the terms and conditions of the >> BSD License >> @@ -234,7 +235,11 @@ [Components.common] >> MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf >> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >> - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { >> + <LibraryClasses> >> + >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf >> + >> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf >> + } >> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf >> >> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf >> EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf >> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc >> b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc >> index de11713..8763dc0 100644 >> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc >> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc >> @@ -1,5 +1,6 @@ >> # >> # Copyright (c) 2011-2015, ARM Limited. All rights reserved. >> +# Copyright (c) 2015, Intel Corporation. All rights reserved. >> # >> # This program and the accompanying materials >> # are licensed and made available under the terms and conditions of the >> BSD License >> @@ -265,7 +266,11 @@ [Components.common] >> MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf >> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >> - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { >> + <LibraryClasses> >> + >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf >> + >> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf >> + } >> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf >> >> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf >> EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf >> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc >> b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc >> index bfdc96b..15cab9e 100644 >> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc >> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc >> @@ -1,5 +1,6 @@ >> # >> # Copyright (c) 2011-2015, ARM Limited. All rights reserved. >> +# Copyright (c) 2015, Intel Corporation. All rights reserved. >> # >> # This program and the accompanying materials >> # are licensed and made available under the terms and conditions of the >> BSD License >> @@ -265,7 +266,11 @@ [Components.common] >> MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf >> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >> - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { >> + <LibraryClasses> >> + >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf >> + >> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf >> + } >> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf >> >> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf >> EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf >> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc >> b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc >> index bee8f95..56d2ad3 100644 >> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc >> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc >> @@ -1,5 +1,6 @@ >> # >> # Copyright (c) 2011-2015, ARM Limited. All rights reserved. >> +# Copyright (c) 2015, Intel Corporation. All rights reserved. >> # >> # This program and the accompanying materials >> # are licensed and made available under the terms and conditions of the >> BSD License >> @@ -245,7 +246,11 @@ [Components.common] >> MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf >> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >> - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { >> + <LibraryClasses> >> + >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf >> + >> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf >> + } >> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf >> >> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf >> EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf >> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc >> b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc >> index 5f85b28..b5b6783 100644 >> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc >> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc >> @@ -1,5 +1,6 @@ >> # >> # Copyright (c) 2011-2015, ARM Limited. All rights reserved. >> +# Copyright (c) 2015, Intel Corporation. All rights reserved. >> # >> # This program and the accompanying materials >> # are licensed and made available under the terms and conditions of the >> BSD License >> @@ -247,7 +248,11 @@ [Components.common] >> MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf >> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >> - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { >> + <LibraryClasses> >> + >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf >> + >> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf >> + } >> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf >> >> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf >> EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf >> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc >> b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc >> index 14d0cf5..741b413 100644 >> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc >> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc >> @@ -1,5 +1,6 @@ >> # >> # Copyright (c) 2011-2015, ARM Limited. All rights reserved. >> +# Copyright (c) 2015, Intel Corporation. All rights reserved. >> # >> # This program and the accompanying materials >> # are licensed and made available under the terms and conditions of the >> BSD License >> @@ -248,7 +249,11 @@ [Components.common] >> MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf >> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >> - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { >> + <LibraryClasses> >> + >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf >> + >> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf >> + } >> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf >> >> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf >> EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf >> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc >> b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc >> index 280fb72..e9a8646 100644 >> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc >> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc >> @@ -1,5 +1,6 @@ >> # >> # Copyright (c) 2011-2015, ARM Limited. All rights reserved. >> +# Copyright (c) 2015, Intel Corporation. All rights reserved. >> # >> # This program and the accompanying materials >> # are licensed and made available under the terms and conditions of the >> BSD License >> @@ -240,7 +241,11 @@ [Components.common] >> MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf >> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >> - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >> + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { >> + <LibraryClasses> >> + >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf >> + >> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf >> + } >> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf >> >> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf >> EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf >> -- >> 1.9.5.msysgit.0 >> >> >> ------------------------------------------------------------------------------ >> Don't Limit Your Business. Reach for the Cloud. >> GigeNET's Cloud Solutions provide you with the tools and support that >> you need to offload your IT needs and focus on growing your business. >> Configured For All Businesses. Start Your Cloud Today. >> https://www.gigenetcloud.com/ >> _______________________________________________ >> edk2-devel mailing list >> edk2-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/edk2-devel > > ------------------------------------------------------------------------------ > Don't Limit Your Business. Reach for the Cloud. > GigeNET's Cloud Solutions provide you with the tools and support that > you need to offload your IT needs and focus on growing your business. > Configured For All Businesses. Start Your Cloud Today. > https://www.gigenetcloud.com/ > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/edk2-devel ------------------------------------------------------------------------------ Don't Limit Your Business. Reach for the Cloud. GigeNET's Cloud Solutions provide you with the tools and support that you need to offload your IT needs and focus on growing your business. Configured For All Businesses. Start Your Cloud Today. https://www.gigenetcloud.com/ _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
