Hi Star, This set looks like a good cleanup.
This patch also need an added resolution for SynchronizationLib. (MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf should be fine.) The same modification will also be needed in edk2-platforms for Platform/Hisilicon/HiKey and HiKey960. Regards, Leif On Mon, Jan 14, 2019 at 11:19:53PM +0800, Star Zeng wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1323 > Merge EmuVariable and Real variable driver. > > The real variable driver has been updated to support emulated > variable NV mode and the EmuVariableRuntimeDxe will be removed > later, so use merged variable driver for emulated NV mode. > > Cc: Leif Lindholm <[email protected]> > Cc: Ard Biesheuvel <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng <[email protected]> > --- > BeagleBoardPkg/BeagleBoardPkg.dsc | 13 +++++++++++-- > BeagleBoardPkg/BeagleBoardPkg.fdf | 4 ++-- > 2 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc > b/BeagleBoardPkg/BeagleBoardPkg.dsc > index 6dabfa905ae9..479b1504825a 100644 > --- a/BeagleBoardPkg/BeagleBoardPkg.dsc > +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc > @@ -2,7 +2,7 @@ > # Beagle board package. > # > # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR> > -# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR> > # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR> > # > # This program and the accompanying materials > @@ -137,6 +137,10 @@ [LibraryClasses.common] > > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf > > + > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf > + > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > + > [LibraryClasses.common.SEC] > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > > ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > @@ -345,6 +349,11 @@ [PcdsFixedAtBuild.common] > > gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE > > + # > + # Make VariableRuntimeDxe work at emulated non-volatile variable mode. > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE > + > > ################################################################################ > # > # Components Section - list of all EDK II Modules needed by this Platform > @@ -376,7 +385,7 @@ [Components.common] > MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > - MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf > + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf > > MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf > diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf > b/BeagleBoardPkg/BeagleBoardPkg.fdf > index 83d85fce4070..42d6bad0c73b 100644 > --- a/BeagleBoardPkg/BeagleBoardPkg.fdf > +++ b/BeagleBoardPkg/BeagleBoardPkg.fdf > @@ -1,7 +1,7 @@ > # FLASH layout file for Beagle board. > # > # Copyright (c) 2009, Apple Inc. All rights reserved.<BR> > -# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR> > # Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR> > # > # This program and the accompanying materials > @@ -106,7 +106,7 @@ [FV.FvMain] > INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > - INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf > + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf > > INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf > -- > 2.7.0.windows.1 > _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
