Sync patches r14454, r14455, r14456, r14457, r14458, and r14462 from main trunk.

1. MdeModulePkg: Variable drivers robustly handle crashes during Reclaim().
2. SecurityPkg: Variable drivers robustly handle crashes during Reclaim().
3. Nt32Pkg: Use FaultTolerantWritePei driver.
4. EmulatorPkg: Use FaultTolerantWritePei driver.
5. OvmfPkg EmuVariableFvbRuntimeDxe: Let FaultTolerantWriteDxe to init working block header.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1@15341 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 9 insertions, 7 deletions

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 14dadacb89..702678cc24 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -4,7 +4,7 @@
 # The Emulation Platform can be used to debug individual modules, prior to creating

 #    a real platform. This also provides an example for how an DSC is created.

 #

-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2013, 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

@@ -259,6 +259,7 @@
   Nt32Pkg/BootModePei/BootModePei.inf

   Nt32Pkg/StallPei/StallPei.inf

   Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf

+  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

   MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

   Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf

   Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 51a8666f90..c219331c46 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -1,7 +1,7 @@
 ## @file

 # This is NT32 FDF file with UEFI HII features enabled

 #

-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2007 - 2013, 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

@@ -93,12 +93,12 @@ gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpa
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

 #NV_FTW_WORKING

 DATA = {

-  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEfiSystemNvDataFvGuid         =

-  #  { 0xFFF12B8D, 0x7696, 0x4C8B, { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}

-  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,

-  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,

+  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid         =

+  #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95 }}

+  0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49,

+  0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95,

   # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved

-  0x77, 0x13, 0x9B, 0xD7, 0xFE, 0xFF, 0xFF, 0xFF,

+  0xE2, 0x33, 0xF2, 0x03, 0xFE, 0xFF, 0xFF, 0xFF,

   # WriteQueueSize: UINT64

   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

 }

@@ -175,6 +175,7 @@ INF  Nt32Pkg/StallPei/StallPei.inf
 INF  Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf

 INF  Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf

 INF  Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf

+INF  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

 INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

 INF  Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf

 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf