add in a few modules

[mirror_edk2.git] / Nt32Pkg / Nt32.dsc

diff --git a/Nt32Pkg/Nt32.dsc b/Nt32Pkg/Nt32.dsc
index f26a8852cf672029975e6106d9538f7a15f2e787..43aa1c3b5f90b0d68e7c46820422d93acf20b524 100644 (file)
--- a/Nt32Pkg/Nt32.dsc
+++ b/Nt32Pkg/Nt32.dsc
@@ -406,7 +406,6 @@
 [Components.IA32]\r
   ${WORKSPACE}/Nt32Pkg/BootModePei/BootMode.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf\r
-<<<<<<< .mine\r
 # ${WORKSPACE}/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf\r
   $(WORKSPACE)\Nt32Pkg\WinNtThunkDxe\WinNtThunk.inf\r
   $(WORKSPACE)\Nt32Pkg\WinNtThunkPPIToProtocolPei\WinNtThunkPPIToProtocol.inf\r
@@ -417,10 +416,10 @@
   $(WORKSPACE)\Nt32Pkg\WinNtSimpleFileSystemDxe\WinNtSimpleFileSystem.inf\r
   $(WORKSPACE)\Nt32Pkg\WinNtGopDxe\WinNtGop.inf\r
   $(WORKSPACE)\Nt32Pkg\WinNtSerialIoDxe\WinNtSerialIo.inf\r
-#  $(WORKSPACE)\Nt32Pkg\TimerDxe\Timer.inf\r
-#  $(WORKSPACE)\Nt32Pkg\ResetRuntimeDxe\Reset.inf\r
-#  $(WORKSPACE)\Nt32Pkg\RealTimeClockRuntimeDxe\RealTimeClock.inf\r
-#  $(WORKSPACE)\Nt32Pkg\MonotonicCounterRuntimeDxe\Metronome.inf\r
+  $(WORKSPACE)\Nt32Pkg\TimerDxe\Timer.inf\r
+  $(WORKSPACE)\Nt32Pkg\ResetRuntimeDxe\Reset.inf\r
+  $(WORKSPACE)\Nt32Pkg\RealTimeClockRuntimeDxe\RealTimeClock.inf\r
+  $(WORKSPACE)\Nt32Pkg\MonotonicCounterRuntimeDxe\Metronome.inf\r
 #  $(WORKSPACE)\Nt32Pkg\CpuRuntimeDxe\Cpu.inf\r
   $(WORKSPACE)/Nt32Pkg/FvbServicesRuntimeDxe/Nt32Fwh.inf\r
   ${WORKSPACE}/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf\r