Remove the Includes section from a few INF file and Nt32.dsc buildable by commenting...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2834 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf
index d2e1277bba8a5335454381c0536e34520ede7b3c..35a60fd708802b5d03a24ae5a19c2678d1318192 100644 (file)
--- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf
+++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf
@@ -70,7 +70,6 @@
 \r
 [Packages]\r
   Nt32Pkg/Nt32Pkg.dec\r
-  EdkModulePkg/EdkModulePkg.dec\r
   MdePkg/MdePkg.dec\r
 \r
 \r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
index c13e625e69398ce7f554b4a06b97df992c8dec48..a268e2aca7b73fd486fb582173834f5f675f5cea 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
@@ -75,7 +75,6 @@
 \r
 [Packages]\r
   Nt32Pkg/Nt32Pkg.dec\r
-  EdkModulePkg/EdkModulePkg.dec\r
   MdePkg/MdePkg.dec\r
 \r
 \r

diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf
index 40b4e68483a333fdf0fa6c642f8b1b60277adf4b..4b8d6bfd417fce2c8cc20af9017cd9624108444e 100644 (file)
--- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf
+++ b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf
@@ -65,7 +65,6 @@
 ################################################################################\r
 \r
 [Packages]\r
-  EdkModulePkg/EdkModulePkg.dec\r
   MdePkg/MdePkg.dec\r
 \r
 \r

diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf
index 6c2fa7e9bac273c756f67de2cba369b4ca9e8a71..5406ae7e9de495f9b840dac36575da7f73cf4ca3 100644 (file)
--- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf
+++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf
@@ -68,7 +68,6 @@
 \r
 [Packages]\r
   Nt32Pkg/Nt32Pkg.dec\r
-  EdkModulePkg/EdkModulePkg.dec\r
   MdePkg/MdePkg.dec\r
 \r
 \r

diff --git a/Nt32Pkg/Nt32.dsc b/Nt32Pkg/Nt32.dsc
index c7505c42f4e23af4cea598636410b90c2e856ca2..f26a8852cf672029975e6106d9538f7a15f2e787 100644 (file)
--- a/Nt32Pkg/Nt32.dsc
+++ b/Nt32Pkg/Nt32.dsc
@@ -406,16 +406,22 @@
 [Components.IA32]\r
   ${WORKSPACE}/Nt32Pkg/BootModePei/BootMode.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf\r
-  #${WORKSPACE}/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocol.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtConsoleDxe/WinNtConsole.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtGopDxe/WinNtGop.inf\r
-  $(WORKSPACE)/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.inf\r
+<<<<<<< .mine\r
+# ${WORKSPACE}/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtThunkDxe\WinNtThunk.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtThunkPPIToProtocolPei\WinNtThunkPPIToProtocol.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtAutoScanPei\WinNtAutoScan.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtBlockIoDxe\WinNtBlockIo.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtBusDriverDxe\WinNtBusDriver.inf\r
+  $(WORKSPACE)\Nt32Pkg\WinNtConsoleDxe\WinNtConsole.inf\r
+  $(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\CpuRuntimeDxe\Cpu.inf\r
   $(WORKSPACE)/Nt32Pkg/FvbServicesRuntimeDxe/Nt32Fwh.inf\r
   ${WORKSPACE}/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf\r
   ${WORKSPACE}/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf\r

diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
index 3094e8112328795a066c617a437be99efc759543..cb184435a69b8e6aeb15aaf35bc6f7a4f2722b3b 100644 (file)
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
+++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
@@ -47,15 +47,6 @@
   CommonHeader.h\r
 \r
 \r
-################################################################################\r
-#\r
-# Includes Section - list of Include locations that are required for\r
-#                    this module.\r
-#\r
-################################################################################\r
-\r
-[Includes]\r
-  $(WORKSPACE)/MdePkg/Include/Library\r
 \r
 ################################################################################\r
 #\r