diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 5f3c3e382d..f4e56d7e2c 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -30,6 +30,7 @@
   SUPPORTED_ARCHITECTURES        = IA32
   BUILD_TARGETS                  = DEBUG
   SKUID_IDENTIFIER               = DEFAULT
+  FLASH_DEFINITION               = $(WORKSPACE)/Nt32Pkg/Nt32Pkg.fdf
 
   DEBUG_ICC_IA32_DLINK_FLAGS                  = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE
   DEBUG_VS2003_IA32_DLINK_FLAGS               = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE
@@ -396,7 +397,6 @@
   $(WORKSPACE)/Nt32Pkg/BootModePei/BootMode.inf
   $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf
 # $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf
   $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocol.inf
   $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.inf
   $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.inf
diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
new file mode 100644
index 0000000000..1471c5bb53
--- /dev/null
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -0,0 +1,206 @@
+# This is NT32 FDF file
+# $(BUILD_NUMBER) The number may be specified in the platform description (DSC) file¡¯s [Defines] section, BUILD_NUMBER element. 
+
+[FD.Fv_Recovery]
+BaseAddress   = 0x0|PcdFdBaseAddress
+Size          = 0x002a0000
+ErasePolarity = 1
+BlockSize     = 0x10000
+NumBlocks     = 0x2a
+
+0x00000000|0x00280000
+PcdFlashFvRecoveryBase|PcdFlashFvRecoverySize
+FV = FvRecovery
+
+0x00280000|0x0000c000
+PcdFlashNvStorageBase|PcdFlashNvStorageSize
+DATA = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x8d, 0x2b, 0xf1, 0xff, 0x96, 0x76, 0x8b, 0x4c, 
+  0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50, 
+  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x5f, 0x46, 0x56, 0x48, 0xff, 0x8c, 0xff, 0xff, 
+  0x48, 0x00, 0x3b, 0x7c, 0x00, 0x00, 0x00, 0x01, 
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x24, 0x56, 0x53, 0x53, 0xb8, 0xbf, 0x00, 0x00, 
+  0x5a, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+}
+
+0x0028c000|0x00002000
+PcdFlashNvStorageEventLogBase|PcdFlashNvStorageEventLogSize
+
+0x0028e000|0x00002000
+PcdFlashNvStorageFtwWorkingBase|PcdFlashNvStorageFtwWorkingSize
+DATA = { 
+  0x8d, 0x2b, 0xf1, 0xff, 0x96, 0x76, 0x8b, 0x4c, 
+  0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50, 
+  0xd2, 0x5f, 0x05, 0x9e, 0xfe, 0xff, 0xff, 0xff, 
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0x1f, 0x00, 0x00 
+}
+
+0x00290000|0x00010000
+PcdFlashNvStorageFtwSpareBase|PcdFlashNvStorageFtwSpareBase
+
+[FV.FvRecovery]
+BlockSize     = 0x10000
+NumBlocks     = 0x28
+FvAlignment        = 16
+ERASE_POLARITY     = 1
+MEMORY_MAPPED      = TRUE
+STICKY_WRITE       = TRUE
+LOCK_CAP           = TRUE
+LOCK_STATUS        = TRUE
+WRITE_DISABLED_CAP = TRUE
+WRITE_ENABLED_CAP  = TRUE
+WRITE_STATUS       = TRUE
+WRITE_LOCK_CAP     = TRUE
+WRITE_LOCK_STATUS  = TRUE
+READ_DISABLED_CAP  = TRUE
+READ_ENABLED_CAP   = TRUE
+READ_STATUS        = TRUE
+READ_LOCK_CAP      = TRUE
+READ_LOCK_STATUS   = TRUE
+
+INF  $(WORKSPACE)/Nt32Pkg/BootModePei/BootMode.inf
+INF  $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf
+#INF  $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
+INF  $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocol.inf
+INF  $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.inf
+INF  $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.inf
+INF  $(WORKSPACE)/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.inf
+INF  $(WORKSPACE)/Nt32Pkg/WinNtConsoleDxe/WinNtConsole.inf
+INF  $(WORKSPACE)/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.inf
+INF  $(WORKSPACE)/Nt32Pkg/WinNtGopDxe/WinNtGop.inf
+INF  $(WORKSPACE)/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.inf
+INF  $(WORKSPACE)/Nt32Pkg/TimerDxe/Timer.inf
+INF  $(WORKSPACE)/Nt32Pkg/ResetRuntimeDxe/Reset.inf
+INF  $(WORKSPACE)/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
+INF  $(WORKSPACE)/Nt32Pkg/MonotonicCounterRuntimeDxe/Metronome.inf
+INF  $(WORKSPACE)/Nt32Pkg/CpuRuntimeDxe/Cpu.inf
+INF  $(WORKSPACE)/Nt32Pkg/FvbServicesRuntimeDxe/Nt32Fwh.inf
+#INF  $(WORKSPACE)/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf
+INF  $(WORKSPACE)/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/Ebc/Dxe/Ebc.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/RuntimeDxe/Runtime.inf
+INF  $(WORKSPACE)/MdeModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/Variable.inf
+INF  $(WORKSPACE)/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf
+INF  $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.inf
+INF  $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.inf
+INF  $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.inf
+INF  $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/IdeBus.inf
+INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.inf
+INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.inf
+INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
+INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
+INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf
+INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf
+#INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf
+INF  $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.inf     ##This driver follows UEFI specification definition
+INF  $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.inf    ##This driver follows UEFI specification definition
+FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 CHECKSUM {
+    SECTION COMPRESS PI_STD {
+      SECTION GUIDED { 
+        SECTION PE32 = EdkShellBinPkg/FullShell/ia32/Shell_Full.efi
+      }
+    }
+  }
+FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F CHECKSUM {
+    SECTION COMPRESS PI_STD {
+      SECTION GUIDED {
+        SECTION PE32 = FatBinPkg/Fat/Ia32/Fat.efi
+      }
+    }
+  }
+FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D CHECKSUM {
+    SECTION COMPRESS PI_STD { 
+      SECTION GUIDED {
+        SECTION RAW = EdkNt32Pkg/Logo/Logo.bmp
+      }
+    } 
+  } 
+
+[Rule.Common.PEI_CORE]
+  FILE PEI_CORE = $(NAMED_GUID) CheckSum {
+    PE32                $(INF_OUTPUT)/$(MODULE_NAME).efi
+    UI Optional         $(MODULE_NAME)
+    VERSION Optional    BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)
+  }
+
+[Rule.Common.PEIM]
+  FILE PEIM = $(NAMED_GUID) CheckSum {
+     PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).Depex
+     PE32                      $(INF_OUTPUT)/$(MODULE_NAME).efi     
+     UI Optional               $(MODULE_NAME)
+     VERSION Optional          BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)
+  } 
+
+[Rule.Common.DXE_CORE]
+  FILE DXE_CORE = $(NAMED_GUID) CheckSum {
+    COMPRESS PI_STD {
+      PE32                      $(INF_OUTPUT)/$(MODULE_NAME).efi     
+      UI Optional               $(MODULE_NAME)
+      VERSION Optional          BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)
+    }    
+  }
+
+[Rule.Common.UEFI_DRIVER]
+  FILE DRIVER = $(NAMED_GUID) CheckSum {
+    COMPRESS PI_STD {
+      GUIDED {
+        DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex
+        PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi 
+        UI Optional            $(MODULE_NAME)
+        VERSION Optional       BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)
+      }
+    }
+  } 
+
+[Rule.Common.DXE_DRIVER]
+  FILE DRIVER = $(NAMED_GUID) CheckSum {
+    COMPRESS PI_STD {
+      GUIDED {
+        DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex
+        PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi 
+        UI Optional            $(MODULE_NAME)
+        VERSION Optional       BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)
+      }
+    }
+  } 
+
+[Rule.Common.DXE_RUNTIME_DRIVER]
+  FILE DRIVER = $(NAMED_GUID) CheckSum {
+    COMPRESS PI_STD {
+      GUIDED {
+        DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex
+        PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi 
+        UI Optional            $(MODULE_NAME)
+        VERSION Optional       BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)
+      }
+    }
+  } 
+
+[Rule.Common.UEFI_APPLICATION]
+  FILE APPLICATION = $(NAMED_GUID) CheckSum {
+    COMPRESS PI_STD {
+      GUIDED {
+        PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi 
+        UI Optional            $(MODULE_NAME)
+        VERSION Optional       BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)
+      }
+    }
+  } 
+  
\ No newline at end of file