EmulatorPkg: Use FaultTolerantWritePei driver.
authorStar Zeng <star.zeng@intel.com>
Wed, 3 Jul 2013 09:24:07 +0000 (09:24 +0000)
committerlzeng14 <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524>
Wed, 3 Jul 2013 09:24:07 +0000 (09:24 +0000)
1. The signature of working block header needs to be updated to gEdkiiWorkingBlockSignatureGuid because FTW write header and record has be updated and exposed to support crossing archs.
2. PEI variable has been updated to depend on FaultTolerantWritePei to robustly handle crashes during Reclaim(), so add FaultTolerantWritePei.inf in *.dsc and *.fdf.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14457 6f19259b-4bc3-4df7-8a09-765794883524

EmulatorPkg/EmulatorPkg.dsc
EmulatorPkg/EmulatorPkg.fdf

index ae318bd..f1cb780 100644 (file)
@@ -4,7 +4,7 @@
 # The Emulation Platform can be used to debug individual modules, prior to creating\r
 # a real platform. This also provides an example for how an DSC is created.\r
 #\r
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
 # Portions copyright (c) 2010 - 2011, Apple Inc. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials\r
 \r
   IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
   EmulatorPkg/BootModePei/BootModePei.inf\r
+  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf\r
   MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
   EmulatorPkg/AutoScanPei/AutoScanPei.inf\r
   EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf\r
index 28ca843..23f2fd3 100644 (file)
@@ -1,7 +1,7 @@
 ## @file\r
 # This is Emulator FDF file with UEFI HII features enabled\r
 #\r
-# Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>\r
 # Portions copyright (c) 2009 - 2011, Apple Inc. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials\r
@@ -71,12 +71,12 @@ gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase|gEmulatorPkgTokenSpa
 gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
 #NV_FTW_WORKING\r
 DATA = {\r
-  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEfiSystemNvDataFvGuid         =\r
-  #  { 0xFFF12B8D, 0x7696, 0x4C8B, { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}\r
-  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,\r
-  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,\r
+  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid         =\r
+  #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95 }}\r
+  0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49,\r
+  0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95,\r
   # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved\r
-  0x77, 0x13, 0x9B, 0xD7, 0xFE, 0xFF, 0xFF, 0xFF,\r
+  0xE2, 0x33, 0xF2, 0x03, 0xFE, 0xFF, 0xFF, 0xFF,\r
   # WriteQueueSize: UINT64\r
   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
@@ -129,6 +129,7 @@ INF  EmulatorPkg/AutoScanPei/AutoScanPei.inf
 INF  EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf\r
 INF  EmulatorPkg/FlashMapPei/FlashMapPei.inf\r
 INF  EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf\r
+INF  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf\r
 INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r