X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Nt32Pkg%2FNt32.dsc;h=f26a8852cf672029975e6106d9538f7a15f2e787;hp=667284762eb36f6ad317f5caf74b843bacaf20ef;hb=4abb21937cec2be1db93c1c4ee994d0d40cbcaa2;hpb=c53dbcfc441e2b070b79dd773759bb1078b67b70

diff --git a/Nt32Pkg/Nt32.dsc b/Nt32Pkg/Nt32.dsc
index 667284762e..f26a8852cf 100644
--- a/Nt32Pkg/Nt32.dsc
+++ b/Nt32Pkg/Nt32.dsc
@@ -333,6 +333,8 @@
   PcdPerformanceLibraryPropertyMask|gEfiMdePkgTokenSpaceGuid|0
   PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiMdeModulePkgTokenSpaceGuid|0x08
   PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid|0x0
+  PcdMaxSizeNonPopulateCapsule|gEfiEdkModulePkgTokenSpaceGuid|0x0
+  PcdMaxSizePopulateCapsule|gEfiEdkModulePkgTokenSpaceGuid|0x0
 
 
 [PcdsFeatureFlag.IA32]
@@ -369,6 +371,7 @@
   PcdComponentName2Disable|gEfiMdePkgTokenSpaceGuid|TRUE
   PcdUefiLibMaxPrintBufferSize|gEfiMdePkgTokenSpaceGuid|320
   PcdDriverDiagnostics2Disable|gEfiMdePkgTokenSpaceGuid|TRUE
+  PcdSupportUpdateCapsuleRest|gEfiEdkModulePkgTokenSpaceGuid|FALSE
 
 ################################################################################
 #
@@ -403,14 +406,27 @@
 [Components.IA32]
   ${WORKSPACE}/Nt32Pkg/BootModePei/BootMode.inf
   $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf
-  ${WORKSPACE}/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPeim/WinNtThunkPPIToProtocolPeim.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPeim/WinNtAutoScan.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtConsoleDxe/WinNtConsole.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtGopDxe/WinNtGop.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.inf
+<<<<<<< .mine
+# ${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
+  $(WORKSPACE)\Nt32Pkg\WinNtBusDriverDxe\WinNtBusDriver.inf
+  $(WORKSPACE)\Nt32Pkg\WinNtConsoleDxe\WinNtConsole.inf
+  $(WORKSPACE)\Nt32Pkg\WinNtSimpleFileSystemDxe\WinNtSimpleFileSystem.inf
+  $(WORKSPACE)\Nt32Pkg\WinNtGopDxe\WinNtGop.inf
+  $(WORKSPACE)\Nt32Pkg\WinNtSerialIoDxe\WinNtSerialIo.inf
+#  $(WORKSPACE)\Nt32Pkg\TimerDxe\Timer.inf
+#  $(WORKSPACE)\Nt32Pkg\ResetRuntimeDxe\Reset.inf
+#  $(WORKSPACE)\Nt32Pkg\RealTimeClockRuntimeDxe\RealTimeClock.inf
+#  $(WORKSPACE)\Nt32Pkg\MonotonicCounterRuntimeDxe\Metronome.inf
+#  $(WORKSPACE)\Nt32Pkg\CpuRuntimeDxe\Cpu.inf
   $(WORKSPACE)/Nt32Pkg/FvbServicesRuntimeDxe/Nt32Fwh.inf
+  ${WORKSPACE}/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf
+  ${WORKSPACE}/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf
+  ${WORKSPACE}/MdeModulePkg/Universal/Ebc/Dxe/Ebc.inf
+  ${WORKSPACE}/MdeModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.inf
+  ${WORKSPACE}/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.inf
+  #${WORKSPACE}/MdeModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.inf
+  ${WORKSPACE}/MdeModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.inf