From 4abb21937cec2be1db93c1c4ee994d0d40cbcaa2 Mon Sep 17 00:00:00 2001 From: qwang12 Date: Thu, 28 Jun 2007 07:33:33 +0000 Subject: [PATCH] Remove the Includes section from a few INF file and Nt32.dsc buildable by commenting out some inf. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2834 6f19259b-4bc3-4df7-8a09-765794883524 --- .../DxeNt32OemHookStatusCodeLib.inf | 1 - .../EdkGenericBdsLib/EdkGenericBdsLib.inf | 1 - .../Nt32PeCoffLoaderLib.inf | 1 - .../PeiNt32OemHookStatusCodeLib.inf | 1 - Nt32Pkg/Nt32.dsc | 26 ++++++++++++------- .../RealTimeClockRuntimeDxe/RealTimeClock.inf | 9 ------- 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf index d2e1277bba..35a60fd708 100644 --- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf +++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf @@ -70,7 +70,6 @@ [Packages] Nt32Pkg/Nt32Pkg.dec - EdkModulePkg/EdkModulePkg.dec MdePkg/MdePkg.dec diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf index c13e625e69..a268e2aca7 100644 --- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf +++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf @@ -75,7 +75,6 @@ [Packages] Nt32Pkg/Nt32Pkg.dec - EdkModulePkg/EdkModulePkg.dec MdePkg/MdePkg.dec diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf index 40b4e68483..4b8d6bfd41 100644 --- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf +++ b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf @@ -65,7 +65,6 @@ ################################################################################ [Packages] - EdkModulePkg/EdkModulePkg.dec MdePkg/MdePkg.dec diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf index 6c2fa7e9ba..5406ae7e9d 100644 --- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf +++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf @@ -68,7 +68,6 @@ [Packages] Nt32Pkg/Nt32Pkg.dec - EdkModulePkg/EdkModulePkg.dec MdePkg/MdePkg.dec diff --git a/Nt32Pkg/Nt32.dsc b/Nt32Pkg/Nt32.dsc index c7505c42f4..f26a8852cf 100644 --- a/Nt32Pkg/Nt32.dsc +++ b/Nt32Pkg/Nt32.dsc @@ -406,16 +406,22 @@ [Components.IA32] ${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 - $(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 diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf index 3094e81123..cb184435a6 100644 --- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf +++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf @@ -47,15 +47,6 @@ CommonHeader.h -################################################################################ -# -# Includes Section - list of Include locations that are required for -# this module. -# -################################################################################ - -[Includes] - $(WORKSPACE)/MdePkg/Include/Library ################################################################################ # -- 2.39.5