Reviewed-by: Ruiyu Ni <ruiyu...@intel.com> > -----Original Message----- > From: Zeng, Star > Sent: Friday, June 26, 2015 4:38 PM > To: edk2-devel@lists.sourceforge.net > Cc: Ni, Ruiyu > Subject: [PATCH V2 15/24] Nt32Pkg: Use the merged Variable driver. > > Cc: Ruiyu Ni <ruiyu...@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Star Zeng <star.z...@intel.com> > --- > Nt32Pkg/Nt32Pkg.dsc | 8 +------- > Nt32Pkg/Nt32Pkg.fdf | 8 +------- > 2 files changed, 2 insertions(+), 14 deletions(-) > > diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc > index 2344d9a..a8e5590 100644 > --- a/Nt32Pkg/Nt32Pkg.dsc > +++ b/Nt32Pkg/Nt32Pkg.dsc > @@ -326,11 +326,7 @@ > Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf > > > MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf > -!if $(SECURE_BOOT_ENABLE) == TRUE > - SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf > -!else > MdeModulePkg/Universal/Variable/Pei/VariablePei.inf > -!endif > > Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf > Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf > @@ -373,11 +369,9 @@ > > MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportSta > tusCodeRouterRuntimeDxe.inf > > MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan > dlerRuntimeDxe.inf > > Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCod > eHandlerDxe.inf > + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > !if $(SECURE_BOOT_ENABLE) == TRUE > - SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf > > SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi > gDxe.inf > -!else > - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > !endif > MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > > MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCount > erRuntimeDxe.inf > diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf > index 1eedb75..b46580e 100644 > --- a/Nt32Pkg/Nt32Pkg.fdf > +++ b/Nt32Pkg/Nt32Pkg.fdf > @@ -184,11 +184,7 @@ INF > Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf > INF Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf > > INF > MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf > -!if $(SECURE_BOOT_ENABLE) == TRUE > -INF SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf > -!else > INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf > -!endif > > INF > Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf > INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf > @@ -223,11 +219,9 @@ INF Nt32Pkg/TimerDxe/TimerDxe.inf > INF > MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportSta > tusCodeRouterRuntimeDxe.inf > INF > MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan > dlerRuntimeDxe.inf > INF > Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCod > eHandlerDxe.inf > +INF > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > !if $(SECURE_BOOT_ENABLE) == TRUE > -INF > SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf > INF > SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi > gDxe.inf > -!else > -INF > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > !endif > INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > INF > MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCount > erRuntimeDxe.inf > -- > 1.9.5.msysgit.0
------------------------------------------------------------------------------ Monitor 25 network devices or servers for free with OpManager! OpManager is web-based network management software that monitors network devices and physical & virtual servers, alerts via email & sms for fault. Monitor 25 devices for free with no restriction. Download now http://ad.doubleclick.net/ddm/clk/292181274;119417398;o _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
