Reviewed-by: Benjamin You <benjamin....@intel.com> > -----Original Message----- > From: Zeng, Star > Sent: Tuesday, January 15, 2019 6:30 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star <star.z...@intel.com>; Ma, Maurice <maurice...@intel.com>; > Agyeman, Prince <prince.agye...@intel.com>; You, Benjamin > <benjamin....@intel.com> > Subject: [PATCH V3 16/17] CorebootPayloadPkg: Use merged variable driver for > emulated NV mode > > 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: Maurice Ma <maurice...@intel.com> > Cc: Prince Agyeman <prince.agye...@intel.com> > Cc: Benjamin You <benjamin....@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng <star.z...@intel.com> > --- > CorebootPayloadPkg/CorebootPayloadPkg.fdf | 4 ++-- > CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 11 +++++++++-- > CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 11 +++++++++-- > 3 files changed, 20 insertions(+), 6 deletions(-) > > diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf > b/CorebootPayloadPkg/CorebootPayloadPkg.fdf > index 741a5c232ed8..0c24f96a1561 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf > +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf > @@ -3,7 +3,7 @@ > # > # Provides drivers and definitions to create uefi payload for coreboot. > # > -# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR> > # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this > distribution. > # The full text of the license may be found at > @@ -109,7 +109,7 @@ [FV.DXEFV] > INF > MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterR > untimeDxe.inf > INF > MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.in > f > INF > PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe > .inf > -INF > MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.i > nf > +INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > > INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > index 467d4fcdb422..98d6073866f0 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > @@ -3,7 +3,7 @@ > # > # Provides drivers and definitions to create uefi payload for coreboot. > # > -# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR> > # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this > distribution. > # The full text of the license may be found at > @@ -203,6 +203,9 @@ [LibraryClasses] > > DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDe > bugLibReportStatusCode.inf > LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf > + > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibN > ull.inf > + > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmM > easurementLibNull.inf > + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > > [LibraryClasses.IA32.SEC] > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > @@ -277,6 +280,10 @@ [PcdsFixedAtBuild] > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000 > > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x8000 > gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x10000 > + # > + # Make VariableRuntimeDxe work at emulated non-volatile variable mode. > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE > > gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0 > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, > 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, > 0x31 } > @@ -417,7 +424,7 @@ [Components.IA32] > > MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterR > untimeDxe.inf > > MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.in > f > > PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe > .inf > - > MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.i > nf > + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > > # > # Following are the DXE drivers > diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > index 673bd26c7973..608a288c425f 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > @@ -3,7 +3,7 @@ > # > # Provides drivers and definitions to create uefi payload for coreboot. > # > -# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR> > # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this > distribution. > # The full text of the license may be found at > @@ -203,6 +203,9 @@ [LibraryClasses] > > DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDe > bugLibReportStatusCode.inf > LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf > + > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibN > ull.inf > + > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmM > easurementLibNull.inf > + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > > [LibraryClasses.IA32.SEC] > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > @@ -277,6 +280,10 @@ [PcdsFixedAtBuild] > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000 > > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x8000 > gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x10000 > + # > + # Make VariableRuntimeDxe work at emulated non-volatile variable mode. > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE > > gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0 > gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE > @@ -418,7 +425,7 @@ [Components.X64] > > MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterR > untimeDxe.inf > > MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.in > f > > PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe > .inf > - > MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.i > nf > + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > > # > # Following are the DXE drivers > -- > 2.7.0.windows.1
_______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
