X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxe%2FDxeMain.inf;h=3c711400e3d050e9bd0ff8cb5e5165fe77219bff;hp=edd2e70bae49f041344feeaa3c2156061a1cf157;hb=6320fa42c9216930926da7cef1bb726fe04699c3;hpb=405b567555b3e133ba9b49be3821c3b1b0e2a120

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index edd2e70bae..3c711400e3 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -1,7 +1,8 @@
 #/** @file
-#  This module provides an implementation of DXE Core that is compliant with DXE CIS.
+#  This is core module in DXE phase. It provides an implementation of DXE Core that is
+#  compliant with DXE CIS.  
 #  
-#  Copyright (c) 2006 - 2008, Intel Corporation. <BR>
+#  Copyright (c) 2006 - 2009, Intel Corporation. <BR>
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -18,8 +19,7 @@
   FILE_GUID                      = D6A2CB7F-6A18-4e2f-B43B-9920A733700A
   MODULE_TYPE                    = DXE_CORE
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
+  PI_SPECIFICATION_VERSION       = 0x00010000
 
   ENTRY_POINT                    = DxeMain
 
@@ -32,7 +32,6 @@
 [Sources.common]
   DxeMain.h
   SectionExtraction/CoreSectionExtraction.c
-  Image/ImageFile.c
   Image/Image.c
   Image/Image.h
   Misc/DebugImageInfo.c
@@ -88,60 +87,59 @@
   UefiBootServicesTableLib
   DevicePathLib
   ReportStatusCodeLib
+  TimerLib
+  DxeServicesLib
 
 [Guids]
-  gEfiEventLegacyBootGuid                       # ALWAYS_CONSUMED
-  gEfiEventReadyToBootGuid                      # ALWAYS_CONSUMED
-  gEfiEventMemoryMapChangeGuid                  # ALWAYS_CONSUMED
-  gEfiEventVirtualAddressChangeGuid             # ALWAYS_CONSUMED
-  gEfiEventExitBootServicesGuid                 # ALWAYS_CONSUMED
-  gEfiHobMemoryAllocModuleGuid                  # ALWAYS_CONSUMED
-  gEfiFileInfoGuid                              # ALWAYS_CONSUMED
-  gEfiFirmwareFileSystem2Guid                   # ALWAYS_CONSUMED
-  gAprioriGuid                                  # ALWAYS_CONSUMED
-  gEfiDebugImageInfoTableGuid                   # ALWAYS_CONSUMED
-  gEfiHobListGuid                               # ALWAYS_CONSUMED
-  gEfiDxeServicesTableGuid                      # ALWAYS_CONSUMED
-  gEfiMemoryTypeInformationGuid                 # ALWAYS_CONSUMED
+  gEfiEventMemoryMapChangeGuid                  ## CONSUMES ## Event
+  gEfiEventVirtualAddressChangeGuid             ## SOMETIMES_CONSUMES ## Event
+  gEfiEventExitBootServicesGuid                 ## SOMETIMES_CONSUMES ## Event
+  gEfiHobMemoryAllocModuleGuid                  ## CONSUMES ## Hob
+  gEfiFileInfoGuid                              ## CONSUMES ## File
+  gEfiFirmwareFileSystem2Guid                   ## CONSUMES ## GUID
+  gAprioriGuid                                  ## CONSUMES ## GUID
+  gEfiDebugImageInfoTableGuid                   ## CONSUMES ## GUID
+  gEfiHobListGuid                               ## CONSUMES ## GUID
+  gEfiDxeServicesTableGuid                      ## CONSUMES ## GUID
+  gEfiMemoryTypeInformationGuid                 ## CONSUMES ## GUID
 
 [Protocols]
-  gEfiStatusCodeRuntimeProtocolGuid             # PROTOCOL SOMETIMES_CONSUMED
-  gEfiCapsuleArchProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED
-  gEfiDecompressProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED
-  gEfiLoadPeImageProtocolGuid                   # PROTOCOL ALWAYS_PRODUCED
-  gEfiSimpleFileSystemProtocolGuid              # PROTOCOL ALWAYS_CONSUMED
-  gEfiLoadFileProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED
-  gEfiResetArchProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED
-  gEfiRealTimeClockArchProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiRuntimeArchProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED
-  gEfiWatchdogTimerArchProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiSecurityArchProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED
-  gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED
-  gEfiBdsArchProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED
-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiMonotonicCounterArchProtocolGuid          # PROTOCOL ALWAYS_CONSUMED
-  gEfiMetronomeArchProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED
-  gEfiTimerArchProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED
-  gEfiBusSpecificDriverOverrideProtocolGuid     # PROTOCOL ALWAYS_CONSUMED
-  gEfiPlatformDriverOverrideProtocolGuid        # PROTOCOL ALWAYS_CONSUMED
-  gEfiDriverBindingProtocolGuid                 # PROTOCOL SOMETIMES_CONSUMED
-  gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_PRODUCED
-  gEfiFirmwareVolumeDispatchProtocolGuid        # PROTOCOL ALWAYS_PRODUCED
-  gEfiFirmwareVolume2ProtocolGuid               # PROTOCOL ALWAYS_PRODUCED
-  gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED
-  gEfiLoadedImageProtocolGuid                   # PROTOCOL ALWAYS_PRODUCED
-  gEfiEbcProtocolGuid                           # PROTOCOL SOMETIMES_CONSUMED
-  gEfiTcgPlatformProtocolGuid
-  gEfiLoadedImageDevicePathProtocolGuid         # PROTOCOL ALWAYS_PRODUCED
+  gEfiStatusCodeRuntimeProtocolGuid             ## SOMETIMES_CONSUMES
+  gEfiCapsuleArchProtocolGuid                   ## CONSUMES
+  gEfiDecompressProtocolGuid                    ## CONSUMES
+  gEfiLoadPeImageProtocolGuid                   ## SOMETIMES_PRODUCES (Produces when PcdFrameworkCompatibilitySupport is set)
+  gEfiSimpleFileSystemProtocolGuid              ## CONSUMES
+  gEfiLoadFileProtocolGuid                      ## CONSUMES
+  gEfiLoadFile2ProtocolGuid                     ## CONSUMES
+  gEfiResetArchProtocolGuid                     ## CONSUMES
+  gEfiRealTimeClockArchProtocolGuid             ## CONSUMES
+  gEfiRuntimeArchProtocolGuid                   ## CONSUMES
+  gEfiWatchdogTimerArchProtocolGuid             ## CONSUMES
+  gEfiSecurityArchProtocolGuid                  ## CONSUMES
+  gEfiVariableArchProtocolGuid                  ## CONSUMES
+  gEfiBdsArchProtocolGuid                       ## CONSUMES
+  gEfiVariableWriteArchProtocolGuid             ## CONSUMES
+  gEfiMonotonicCounterArchProtocolGuid          ## CONSUMES
+  gEfiMetronomeArchProtocolGuid                 ## CONSUMES
+  gEfiTimerArchProtocolGuid                     ## CONSUMES
+  gEfiBusSpecificDriverOverrideProtocolGuid     ## CONSUMES
+  gEfiPlatformDriverOverrideProtocolGuid        ## CONSUMES
+  gEfiDriverBindingProtocolGuid                 ## SOMETIMES_CONSUMES
+  gEfiFirmwareVolumeBlockProtocolGuid           ## PRODUCES
+  gEfiFirmwareVolume2ProtocolGuid               ## PRODUCES
+  gEfiCpuArchProtocolGuid                       ## CONSUMES
+  gEfiDevicePathProtocolGuid                    ## CONSUMES
+  gEfiLoadedImageProtocolGuid                   ## PRODUCES
+  gEfiHiiPackageListProtocolGuid                ## SOMETIMES_PRODUCES
+  gEfiEbcProtocolGuid                           ## SOMETIMES_CONSUMES
+  gEfiLoadedImageDevicePathProtocolGuid         ## PRODUCES
 
 [FixedPcd.common]
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeCoreEntry | 0x3041000          # EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_ENTRY_POINT
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeCoreHandoffToBds | 0x3041001   # EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_HANDOFF_TO_NEXT
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueBootServiceExit | 0x3100019       # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeDriverBegin | 0x3040002        # EFI_SOFTWARE_DXE_CORE | EFI_SW_PC_INIT_BEGIN
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeDriverEnd | 0x3040003          # EFI_SOFTWARE_DXE_CORE | EFI_SW_PC_INIT_END
-
-[BuildOptions]
-  MSFT:*_*_*_CC_FLAGS     = /FAcs
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeCoreEntry
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeCoreHandoffToBds
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueBootServiceExit
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeDriverBegin
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeDriverEnd
 
+[FeaturePcd.common]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport	   ## CONSUMES