Roll back 4348 version for wrong check in.

[mirror_edk2.git] / Nt32Pkg / Nt32Pkg.fdf

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 248dc6a1f468bc7c5b968431787bbf8268f42b9f..8809805d242e57e5bd53ccbf327b04c35ad02c9d 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -80,7 +80,6 @@ DATA = {
 \r
 0x00290000|0x00010000\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
-FV = FvDxe\r
 \r
 ################################################################################\r
 #\r
@@ -92,8 +91,7 @@ FV = FvDxe
 # module statements.\r
 #\r
 ################################################################################\r
-[FV.FvDxe]\r
-BlockSize          = 0x10000\r
+[FV.FvRecovery]\r
 FvAlignment        = 16         #FV alignment and FV attributes setting.\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -111,42 +109,48 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-#INF  MdeModulePkg/Core/Dxe/DxeMain.inf\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
+################################################################################\r
+#\r
+# The INF statements point to EDK component and EDK II module INF files, which will be placed into this FV image.\r
+# Parsing tools will scan the INF file to determine the type of component or module.\r
+# The component or module type is used to reference the standard rules\r
+# defined elsewhere in the FDF file.\r
+#\r
+# The format for INF statements is:\r
+# INF $(PathAndInfFileName)\r
+#\r
+################################################################################\r
+  ##\r
+  #  PEI Phase modules\r
+  ##\r
+  ##\r
+  #  PEI Apriori file example, more PEIM module added later.\r
+  ##\r
+APRIORI PEI {\r
+  INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
+  INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\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
+APRIORI DXE {\r
+  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  INF  Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
   }\r
 \r
-[FV.FvMain]\r
-BlockSize          = 0x10000\r
-FvAlignment        = 16         #FV alignment and FV attributes setting.\r
-ERASE_POLARITY     = 1\r
-MEMORY_MAPPED      = TRUE\r
-STICKY_WRITE       = TRUE\r
-LOCK_CAP           = TRUE\r
-LOCK_STATUS        = TRUE\r
-WRITE_DISABLED_CAP = TRUE\r
-WRITE_ENABLED_CAP  = TRUE\r
-WRITE_STATUS       = TRUE\r
-WRITE_LOCK_CAP     = TRUE\r
-WRITE_LOCK_STATUS  = TRUE\r
-READ_DISABLED_CAP  = TRUE\r
-READ_ENABLED_CAP   = TRUE\r
-READ_STATUS        = TRUE\r
-READ_LOCK_CAP      = TRUE\r
-READ_LOCK_STATUS   = TRUE\r
+INF  MdeModulePkg/Core/Pei/PeiMain.inf\r
+INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
+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  Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf\r
+INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
-#INF  MdeModulePkg/Core/Dxe/DxeMain.inf\r
+  ##\r
+  #  DXE Phase modules\r
+  ##\r
+INF  MdeModulePkg/Core/Dxe/DxeMain.inf\r
 INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
 INF  Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
 INF  Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
@@ -191,83 +195,6 @@ INF  Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf
 INF  IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
 INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r
 \r
-\r
-[FV.FvRecovery]\r
-FvAlignment        = 16         #FV alignment and FV attributes setting.\r
-ERASE_POLARITY     = 1\r
-MEMORY_MAPPED      = TRUE\r
-STICKY_WRITE       = TRUE\r
-LOCK_CAP           = TRUE\r
-LOCK_STATUS        = TRUE\r
-WRITE_DISABLED_CAP = TRUE\r
-WRITE_ENABLED_CAP  = TRUE\r
-WRITE_STATUS       = TRUE\r
-WRITE_LOCK_CAP     = TRUE\r
-WRITE_LOCK_STATUS  = TRUE\r
-READ_DISABLED_CAP  = TRUE\r
-READ_ENABLED_CAP   = TRUE\r
-READ_STATUS        = TRUE\r
-READ_LOCK_CAP      = TRUE\r
-READ_LOCK_STATUS   = TRUE\r
-\r
-################################################################################\r
-#\r
-# The INF statements point to EDK component and EDK II module INF files, which will be placed into this FV image.\r
-# Parsing tools will scan the INF file to determine the type of component or module.\r
-# The component or module type is used to reference the standard rules\r
-# defined elsewhere in the FDF file.\r
-#\r
-# The format for INF statements is:\r
-# INF $(PathAndInfFileName)\r
-#\r
-################################################################################\r
-  ##\r
-  #  PEI Phase modules\r
-  ##\r
-  ##\r
-  #  PEI Apriori file example, more PEIM module added later.\r
-  ##\r
-APRIORI PEI {\r
-  INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-  INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
-  }\r
-APRIORI DXE {\r
-  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-  INF  Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
-  }\r
-\r
-INF  MdeModulePkg/Core/Pei/PeiMain.inf\r
-INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-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  Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf\r
-#FILE PEIM = 86D70125-BAA3-4296-A62F-602BEBBB9081 {\r
-#    SECTION PEI_DEPEX = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/IA32/MdeModulePkg/Core/DxeIplPeim/DxeIpl/OUTPUT/DxeIpl.depex\r
-#    SECTION UI = "DxeIpl"\r
-#    SECTION PE32 = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/IA32/MdeModulePkg/Core/DxeIplPeim/DxeIpl/DEBUG/DxeIpl.efi\r
-#  }\r
-\r
-INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
-\r
-FILE FV_IMAGE = bdddaa2d-7f72-4a0d-b35a-bef1b64f6a09 {\r
-    SECTION PEI_DEPEX = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/IA32/MdeModulePkg/Core/Pei/PeiMain/OUTPUT/PeiMain.depex\r
-    SECTION DXE_DEPEX = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/IA32/MdeModulePkg/Core/Pei/PeiMain/OUTPUT/PeiMain.depex    \r
-    SECTION FV_IMAGE = FvMain\r
-  }\r
-  ##\r
-  #  DXE Phase modules\r
-  ##\r
-INF  MdeModulePkg/Core/Dxe/DxeMain.inf\r
-\r
-#FILE FV_IMAGE = cc00b922-8c49-4ea6-b6e9-17920bae36e0 {\r
-#    SECTION FV_IMAGE = FvDxe\r
-#  }\r
-\r
 ################################################################################\r
 #\r
 # FILE statements are provided so that a platform integrator can include\r
@@ -283,6 +210,21 @@ FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {
       }\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
+  }\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
+  }\r
+\r
 \r
 ################################################################################\r
 #\r
@@ -322,7 +264,7 @@ FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
      PEI_DEPEX PEI_DEPEX Optional        |.depex\r
-     PE32     PE32                       |.efi\r
+     PE32      PE32                      |.efi\r
      UI       STRING="$(MODULE_NAME)" Optional         \r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   \r
   }\r