Remove ".intel_syntax", convert MASM to GAS.

[mirror_edk2.git] / Nt32Pkg / Nt32Pkg.fdf

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 41563deea9d86e7c128456c0b8a8e8a1670bbfb3..d5945cf2bf3a704a30e275d4bffe71e0384d4043 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -133,6 +133,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 6D99E806-3D38-42c2-A095-5F4300BFD7DC\r
 \r
 ################################################################################\r
 #\r
@@ -153,7 +154,7 @@ READ_LOCK_STATUS   = TRUE
   ##\r
 APRIORI PEI {\r
   INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-  INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
+  INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
   }\r
 APRIORI DXE {\r
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
@@ -162,7 +163,7 @@ APRIORI DXE {
 \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  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
 INF  Nt32Pkg/BootModePei/BootModePei.inf\r
 INF  Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf\r
 INF  Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf\r
@@ -189,13 +190,13 @@ INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 INF  Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf\r
 INF  Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf\r
 INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-INF  MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf\r
+INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
 INF  IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf\r
 INF  Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf\r
 INF  Nt32Pkg/TimerDxe/TimerDxe.inf\r
-INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf\r
+INF  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
-INF  MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf\r
+INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
@@ -207,18 +208,18 @@ INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
 INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
 INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
-INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
+INF  RuleOverride = TIANOCOMPRESSED MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 INF  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
-INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition\r
-INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf    ##This driver follows UEFI specification definition\r
+INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
+INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
 INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
 INF  Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf\r
 INF  Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf\r
 INF  Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf\r
 INF  Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf\r
 INF  Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf\r
-INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
 INF  MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf\r
+INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
 \r
 INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
 INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
@@ -239,19 +240,15 @@ INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
 # for binary shell, binary fat and logo module.\r
 #\r
 ################################################################################\r
-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
-      }\r
-    }\r
+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {\r
+    SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi\r
   }\r
 \r
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
     SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi\r
   }\r
 \r
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
 \r
@@ -299,16 +296,6 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   \r
   }\r
 \r
-[Rule.Common.PEIM.TIANOCOMPRESSED]\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
-      UI        STRING="$(MODULE_NAME)" Optional\r
-      VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
-    }\r
-  }\r
-\r
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
@@ -330,6 +317,16 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
     }\r
   }\r
 \r
+[Rule.Common.UEFI_DRIVER.TIANOCOMPRESSED]\r
+  FILE DRIVER = $(NAMED_GUID) {\r
+    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {\r
+      PE32     PE32                    |.efi\r
+      UI       STRING="$(MODULE_NAME)" Optional\r
+      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+    }\r
+  }\r
+\r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
     DXE_DEPEX    DXE_DEPEX Optional      |.depex\r