Remove BaseMemoryTest PPI and related producers and consumers.

[mirror_edk2.git] / Nt32Pkg / Nt32Pkg.fdf

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index c3cd1e91548eb03d8cd04050af37dcefab47285c..db0244487a67e9ea165b7cc045ccd6fae2b2a3a6 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -24,7 +24,7 @@
 # existing system flash.\r
 #\r
 ################################################################################\r
-[FD.Fv_Recovery]\r
+[FD.Nt32]\r
 BaseAddress   = 0x0|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFdBaseAddress  #The base address of the FLASH Device.\r
 Size          = 0x002a0000                                           #The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
@@ -52,33 +52,54 @@ FV = FvRecovery
 \r
 0x00280000|0x0000c000\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
+#NV_VARIABLE_STORE\r
 DATA = {\r
+  ## This is the EFI_FIRMWARE_VOLUME_HEADER\r
+  # ZeroVector []\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-  0x8d, 0x2b, 0xf1, 0xff, 0x96, 0x76, 0x8b, 0x4c,\r
-  0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50,\r
+  # FileSystemGuid: 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
+  # FvLength: 0x20000\r
   0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-  0x5f, 0x46, 0x56, 0x48, 0xff, 0x8c, 0xff, 0xff,\r
-  0x48, 0x00, 0x3b, 0x7c, 0x00, 0x00, 0x00, 0x01,\r
+  #Signature "_FVH"       #Attributes\r
+  0x5f, 0x46, 0x56, 0x48, 0xff, 0xfe, 0x04, 0x00,\r
+  #HeaderLength #CheckSum #ExtHeaderOffset #Reserved #Revision\r
+  0x48, 0x00, 0x36, 0x09, 0x00, 0x00, 0x00, 0x02,\r
+  #Blockmap[0]: 2 Blocks * 0x10000 Bytes / Block\r
   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,\r
+  #Blockmap[1]: End\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-  0x24, 0x56, 0x53, 0x53, 0xb8, 0xbf, 0x00, 0x00,\r
-  0x5a, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
+  ## This is the VARIABLE_STORE_HEADER\r
+  #Signature: "$VSS"      #Size: 0xc000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) - 0x48 (HeaderLength) = 0xBFB8\r
+                                # This can speed up the Variable Dispatch a bit.\r
+  0x24, 0x56, 0x53, 0x53, 0xB8, 0xBF, 0x00, 0x00,\r
+  #FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32\r
+  0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r
 0x0028c000|0x00002000\r
+#NV_EVENT_LOG\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize\r
 \r
 0x0028e000|0x00002000\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
+#NV_FTW_WORKING\r
 DATA = {\r
-  0x8d, 0x2b, 0xf1, 0xff, 0x96, 0x76, 0x8b, 0x4c,\r
-  0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50,\r
-  0xd2, 0x5f, 0x05, 0x9e, 0xfe, 0xff, 0xff, 0xff,\r
-  0xff, 0xff, 0xff, 0xff, 0xe0, 0x1f, 0x00, 0x00\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
+  # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved\r
+  0x77, 0x13, 0x9B, 0xD7, 0xFE, 0xFF, 0xFF, 0xFF,\r
+  # WriteQueueSize: UINT64\r
+  0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r
 0x00290000|0x00010000\r
+#NV_FTW_SPARE\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
 \r
 ################################################################################\r
@@ -140,10 +161,9 @@ INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf
 INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
 INF  Nt32Pkg/BootModePei/BootModePei.inf\r
 INF  Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf\r
-INF  MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf\r
-INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
 INF  Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf\r
 INF  Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf\r
+INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
 INF  Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf\r
 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
@@ -164,7 +184,7 @@ INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 INF  Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf\r
 INF  Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf\r
-INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
 INF  MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf\r
 INF  IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf\r
 INF  Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf\r
@@ -195,8 +215,6 @@ INF  Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf
 INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
 INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r
 \r
-INF  RichfordPlatformPkg/SetupDxe/SetupDxe.inf\r
-\r
 ################################################################################\r
 #\r
 # FILE statements are provided so that a platform integrator can include\r
@@ -208,23 +226,17 @@ INF  RichfordPlatformPkg/SetupDxe/SetupDxe.inf
 FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {\r
     SECTION COMPRESS PI_STD {\r
       SECTION GUIDED {\r
-        SECTION PE32 = EdkShellBinPkg/FullShell/ia32/Shell_Full.efi\r
+        SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi\r
       }\r
     }\r
   }\r
+\r
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
-    SECTION COMPRESS PI_STD {\r
-      SECTION GUIDED {\r
-        SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi\r
-      }\r
-    }\r
+    SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi\r
   }\r
+\r
 FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
-    SECTION COMPRESS PI_STD {\r
-      SECTION GUIDED {\r
-        SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-      }\r
-    }\r
+    SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
 \r
 \r
@@ -272,7 +284,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
   }\r
 \r
 [Rule.Common.PEIM.TIANOCOMPRESSED]\r
-  FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {\r
+  FILE PEIM = $(NAMED_GUID) {\r
     PEI_DEPEX PEI_DEPEX Optional         |.depex\r
     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {\r
       PE32      PE32                     |.efi\r