From 6036e94dc9402827130875258e99e486e82e7904 Mon Sep 17 00:00:00 2001 From: "Zeng, Star" Date: Thu, 28 Aug 2014 06:34:06 +0000 Subject: MdeModulePkg: INF/DEC file updates to EDK II packages 1. Usage information in INF file comment blocks are either incomplete or incorrect. This includes usage information for Protocols/PPIs/GUIDs/PCDs/HOBs/Events/BootModes. The syntax for usage information in comment blocks is defined in the EDK II Module Information (INF) Specification Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Zeng, Star Reviewed-by: Gao, Liming git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15962 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Core/Dxe/DxeMain.inf | 129 +++++++++++++++++----------- MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 51 +++++------ MdeModulePkg/Core/Pei/PeiMain.inf | 75 +++++++++++----- MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf | 36 ++++---- MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf | 48 +++++++---- MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf | 8 +- 6 files changed, 215 insertions(+), 132 deletions(-) (limited to 'MdeModulePkg/Core') diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf index bd9a4bd56d..adac56041a 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.inf +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf @@ -1,8 +1,9 @@ ## @file -# This is core module in DXE phase. It 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 - 2013, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2014, Intel Corporation. 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 @@ -16,6 +17,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = DxeCore + MODULE_UNI_FILE = DxeCore.uni FILE_GUID = D6A2CB7F-6A18-4e2f-B43B-9920A733700A MODULE_TYPE = DXE_CORE VERSION_STRING = 1.0 @@ -96,61 +98,77 @@ PcdLib [Guids] - gEfiEventMemoryMapChangeGuid ## CONSUMES ## Event - gEfiEventVirtualAddressChangeGuid ## SOMETIMES_CONSUMES ## Event - gEfiEventExitBootServicesGuid ## SOMETIMES_CONSUMES ## Event - gEfiHobMemoryAllocModuleGuid ## CONSUMES ## Hob - gEfiFileInfoGuid ## CONSUMES ## File - gEfiFirmwareFileSystem2Guid ## CONSUMES ## GUID - gEfiFirmwareFileSystem3Guid ## CONSUMES ## GUID - gAprioriGuid ## CONSUMES ## GUID - gEfiDebugImageInfoTableGuid ## CONSUMES ## GUID - gEfiHobListGuid ## CONSUMES ## GUID - gEfiDxeServicesTableGuid ## CONSUMES ## GUID - gEfiMemoryTypeInformationGuid ## CONSUMES ## GUID - gEfiEventDxeDispatchGuid ## CONSUMES ## GUID - gLoadFixedAddressConfigurationTableGuid ## SOMETIMES_CONSUMES - gIdleLoopEventGuid ## CONSUMES ## GUID - gEventExitBootServicesFailedGuid ## CONSUMES ## GUID - gEfiVectorHandoffTableGuid ## SOMETIMES_PRODUCES ## Configuration + gEfiEventMemoryMapChangeGuid ## PRODUCES ## Event + gEfiEventVirtualAddressChangeGuid ## CONSUMES ## Event + ## CONSUMES ## Event + ## PRODUCES ## Event + gEfiEventExitBootServicesGuid + gEfiHobMemoryAllocModuleGuid ## CONSUMES ## HOB + gEfiFirmwareFileSystem2Guid ## CONSUMES ## GUID # Used to compare with FV's file system guid and get the FV's file system format + gEfiFirmwareFileSystem3Guid ## CONSUMES ## GUID # Used to compare with FV's file system guid and get the FV's file system format + gAprioriGuid ## SOMETIMES_CONSUMES ## File + gEfiDebugImageInfoTableGuid ## PRODUCES ## SystemTable + gEfiHobListGuid ## PRODUCES ## SystemTable + gEfiDxeServicesTableGuid ## PRODUCES ## SystemTable + ## PRODUCES ## SystemTable + ## SOMETIMES_CONSUMES ## HOB + gEfiMemoryTypeInformationGuid + gEfiEventDxeDispatchGuid ## PRODUCES ## Event + gLoadFixedAddressConfigurationTableGuid ## SOMETIMES_PRODUCES ## SystemTable + ## PRODUCES ## Event + ## CONSUMES ## Event + gIdleLoopEventGuid + gEventExitBootServicesFailedGuid ## SOMETIMES_PRODUCES ## Event + gEfiVectorHandoffTableGuid ## SOMETIMES_PRODUCES ## SystemTable [Ppis] - gEfiVectorHandoffInfoPpiGuid ## UNDEFINED + gEfiVectorHandoffInfoPpiGuid ## UNDEFINED # HOB [Protocols] - 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 - gEfiSecurity2ArchProtocolGuid ## CONSUMES - gEfiVariableArchProtocolGuid ## CONSUMES - gEfiBdsArchProtocolGuid ## CONSUMES - gEfiVariableWriteArchProtocolGuid ## CONSUMES - gEfiMonotonicCounterArchProtocolGuid ## CONSUMES - gEfiMetronomeArchProtocolGuid ## CONSUMES - gEfiTimerArchProtocolGuid ## CONSUMES - gEfiBusSpecificDriverOverrideProtocolGuid ## CONSUMES - gEfiDriverFamilyOverrideProtocolGuid ## CONSUMES - gEfiPlatformDriverOverrideProtocolGuid ## CONSUMES + ## PRODUCES + ## SOMETIMES_CONSUMES + gEfiDecompressProtocolGuid + gEfiLoadPeImageProtocolGuid ## SOMETIMES_PRODUCES # Produces when PcdFrameworkCompatibilitySupport is set + gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES + gEfiLoadFileProtocolGuid ## SOMETIMES_CONSUMES + gEfiLoadFile2ProtocolGuid ## SOMETIMES_CONSUMES + gEfiBusSpecificDriverOverrideProtocolGuid ## SOMETIMES_CONSUMES + gEfiDriverFamilyOverrideProtocolGuid ## SOMETIMES_CONSUMES + gEfiPlatformDriverOverrideProtocolGuid ## SOMETIMES_CONSUMES gEfiDriverBindingProtocolGuid ## SOMETIMES_CONSUMES - gEfiFirmwareVolumeBlockProtocolGuid ## PRODUCES - gEfiFirmwareVolume2ProtocolGuid ## PRODUCES - gEfiCpuArchProtocolGuid ## CONSUMES - gEfiDevicePathProtocolGuid ## CONSUMES + ## PRODUCES + ## CONSUMES + ## NOTIFY + gEfiFirmwareVolumeBlockProtocolGuid + ## PRODUCES + ## CONSUMES + ## NOTIFY + gEfiFirmwareVolume2ProtocolGuid + ## PRODUCES + ## CONSUMES + gEfiDevicePathProtocolGuid gEfiLoadedImageProtocolGuid ## PRODUCES + gEfiLoadedImageDevicePathProtocolGuid ## PRODUCES gEfiHiiPackageListProtocolGuid ## SOMETIMES_PRODUCES gEfiEbcProtocolGuid ## SOMETIMES_CONSUMES - gEfiLoadedImageDevicePathProtocolGuid ## PRODUCES gEfiSmmBase2ProtocolGuid ## SOMETIMES_CONSUMES + # Arch Protocols + gEfiBdsArchProtocolGuid ## CONSUMES + gEfiCpuArchProtocolGuid ## CONSUMES + gEfiMetronomeArchProtocolGuid ## CONSUMES + gEfiMonotonicCounterArchProtocolGuid ## CONSUMES + gEfiRealTimeClockArchProtocolGuid ## CONSUMES + gEfiResetArchProtocolGuid ## CONSUMES + gEfiRuntimeArchProtocolGuid ## CONSUMES + gEfiSecurityArchProtocolGuid ## CONSUMES + gEfiSecurity2ArchProtocolGuid ## SOMETIMES_CONSUMES + gEfiTimerArchProtocolGuid ## CONSUMES + gEfiVariableWriteArchProtocolGuid ## CONSUMES + gEfiVariableArchProtocolGuid ## CONSUMES + gEfiCapsuleArchProtocolGuid ## CONSUMES + gEfiWatchdogTimerArchProtocolGuid ## CONSUMES + [FeaturePcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES @@ -159,4 +177,17 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdMaxEfiSystemTablePointerAddress ## CONSUMES - \ No newline at end of file + +# [Hob] +# RESOURCE_DESCRIPTOR ## CONSUMES +# MEMORY_ALLOCATION ## CONSUMES +# FIRMWARE_VOLUME ## CONSUMES +# UNDEFINED ## CONSUMES # CPU +# +# [Event] +# EVENT_TYPE_RELATIVE_TIMER ## PRODUCES # DxeCore signals timer event. +# EVENT_TYPE_PERIODIC_TIMER ## PRODUCES # DxeCore signals timer event. +# + +[UserExtensions.TianoCore."ExtraFiles"] + DxeCoreExtra.uni \ No newline at end of file diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf index 85d0069c2e..1473ccd7da 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf @@ -5,7 +5,7 @@ # PPI to discover and dispatch the DXE Foundation and components that are # needed to run the DXE Foundation. # -# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2014, Intel Corporation. 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 @@ -19,6 +19,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = DxeIpl + MODULE_UNI_FILE = DxeIpl.uni FILE_GUID = 86D70125-BAA3-4296-A62F-602BEBBB9081 MODULE_TYPE = PEIM VERSION_STRING = 1.0 @@ -77,50 +78,50 @@ [Ppis] gEfiDxeIplPpiGuid ## PRODUCES - gEfiEndOfPeiSignalPpiGuid ## SOMETIMES_PRODUCES(Not produced on S3 boot path) - gEfiPeiDecompressPpiGuid ## SOMETIMES_PRODUCES + gEfiPeiDecompressPpiGuid ## PRODUCES + gEfiEndOfPeiSignalPpiGuid ## SOMETIMES_PRODUCES # Not produced on S3 boot path gEfiPeiReadOnlyVariable2PpiGuid ## SOMETIMES_CONSUMES - gEfiPeiLoadFilePpiGuid ## CONSUMES - gEfiPeiS3Resume2PpiGuid ## SOMETIMES_CONSUMES(Consumed on S3 boot path) - gEfiPeiRecoveryModulePpiGuid ## SOMETIMES_CONSUMES(Consumed on recovery boot path) - gEfiVectorHandoffInfoPpiGuid ## SOMETIMES_CONSUMES + gEfiPeiLoadFilePpiGuid ## SOMETIMES_CONSUMES + gEfiPeiS3Resume2PpiGuid ## SOMETIMES_CONSUMES # Consumed on S3 boot path + gEfiPeiRecoveryModulePpiGuid ## SOMETIMES_CONSUMES # Consumed on recovery boot path + ## SOMETIMES_CONSUMES + ## UNDEFINED # HOB + gEfiVectorHandoffInfoPpiGuid [Guids] - gEfiMemoryTypeInformationGuid ## SOMETIMES_CONSUMES ## Variable:L"MemoryTypeInformation" - gEfiMemoryTypeInformationGuid ## SOMETIMES_PRODUCES ## HOB + ## SOMETIMES_CONSUMES ## Variable:L"MemoryTypeInformation" + ## SOMETIMES_PRODUCES ## HOB + gEfiMemoryTypeInformationGuid [FeaturePcd.IA32] - gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode + gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode ## CONSUMES [FeaturePcd.X64] - gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildPageTables + gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildPageTables ## CONSUMES [FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress + gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress ## CONSUMES [Pcd.IA32,Pcd.X64] - gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable + gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_CONSUMES [Depex] gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiLoadFilePpiGuid AND gEfiPeiMasterBootModePpiGuid # # [BootMode] -# S3_RESUME ## SOMETIMES_CONSUMES -# RECOVERY ## SOMETIMES_CONSUMES +# S3_RESUME ## SOMETIMES_CONSUMES +# RECOVERY_FULL ## SOMETIMES_CONSUMES # # # [Hob] -# ## -# # New Stack HoB -# MEMORY_ALLOCATION ## PRODUCES -# ## -# # Old Stack HOB -# MEMORY_ALLOCATION ## CONSUMES +# MEMORY_ALLOCATION ## SOMETIMES_PRODUCES # MEMORY_ALLOCATION_MODULE for DxeCore +# MEMORY_ALLOCATION ## SOMETIMES_PRODUCES # New Stack HoB +# MEMORY_ALLOCATION ## SOMETIMES_PRODUCES # Old Stack HOB # # [Hob.IPF] -# ## -# # BSP Stack HOB for IPF -# MEMORY_ALLOCATION ## PRODUCES -# +# MEMORY_ALLOCATION ## SOMETIMES_PRODUCES # MEMORY_ALLOCATION_BSP_STORE # + +[UserExtensions.TianoCore."ExtraFiles"] + DxeIplExtra.uni diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf index 7cff0632a3..342e344559 100644 --- a/MdeModulePkg/Core/Pei/PeiMain.inf +++ b/MdeModulePkg/Core/Pei/PeiMain.inf @@ -1,5 +1,7 @@ ## @file -# PeiMain module is core module in PEI phase. It takes responsibilities of: +# PeiMain module is core module in PEI phase. +# +# It takes responsibilities of: # 1) Initialize memory, PPI, image services etc, to establish PEIM runtime environment. # 2) Dispatch PEIM from discovered FV. # 3) Handoff control to DxeIpl to load DXE core and enter DXE phase. @@ -19,6 +21,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PeiCore + MODULE_UNI_FILE = PeiCore.uni FILE_GUID = 52C05B14-0B98-496c-BC3B-04B50211D680 MODULE_TYPE = PEI_CORE VERSION_STRING = 1.0 @@ -70,32 +73,60 @@ PcdLib [Guids] - gPeiAprioriFileNameGuid ## CONSUMES ## GUID - gEfiFirmwareFileSystem2Guid ## CONSUMES ## FV - gEfiFirmwareFileSystem3Guid ## CONSUMES ## FV + gPeiAprioriFileNameGuid ## SOMETIMES_CONSUMES ## File + ## PRODUCES ## UNDEFINED # Install ppi + ## CONSUMES ## UNDEFINED # Locate ppi + gEfiFirmwareFileSystem2Guid + ## PRODUCES ## UNDEFINED # Install ppi + ## CONSUMES ## UNDEFINED # Locate ppi + ## CONSUMES ## GUID # Used to compare with FV's file system guid and get the FV's file system format + gEfiFirmwareFileSystem3Guid [Ppis] - gEfiPeiStatusCodePpiGuid ## SOMETIMES_CONSUMES (PeiReportStatusService is not ready if this PPI doesn't exist) - gEfiPeiResetPpiGuid ## SOMETIMES_CONSUMES (PeiResetService is not ready if this PPI doesn't exist) + gEfiPeiStatusCodePpiGuid ## SOMETIMES_CONSUMES # PeiReportStatusService is not ready if this PPI doesn't exist + gEfiPeiResetPpiGuid ## SOMETIMES_CONSUMES # PeiResetService is not ready if this PPI doesn't exist gEfiDxeIplPpiGuid ## CONSUMES gEfiPeiMemoryDiscoveredPpiGuid ## PRODUCES - gEfiPeiDecompressPpiGuid ## CONSUMES - gEfiPeiFirmwareVolumeInfoPpiGuid ## NOTIFY ## SOMETIMES_PRODUCES (Produce FvInfoPpi if the encapsulated FvImage is found) - gEfiPeiFirmwareVolumeInfo2PpiGuid ## NOTIFY ## SOMETIMES_PRODUCES (Produce FvInfo2Ppi if the encapsulated FvImage is found) - gEfiPeiLoadFilePpiGuid ## PRODUCES ## SOMETIMES_CONSUMES (The default load PeImage logic will be used when this PPI doesn't exist) + gEfiPeiDecompressPpiGuid ## SOMETIMES_CONSUMES + ## NOTIFY + ## SOMETIMES_PRODUCES # Produce FvInfoPpi if the encapsulated FvImage is found + gEfiPeiFirmwareVolumeInfoPpiGuid + ## NOTIFY + ## SOMETIMES_PRODUCES # Produce FvInfoPpi2 if the encapsulated FvImage is found + gEfiPeiFirmwareVolumeInfo2PpiGuid + ## PRODUCES + ## CONSUMES + gEfiPeiLoadFilePpiGuid gEfiPeiSecurity2PpiGuid ## NOTIFY gEfiTemporaryRamSupportPpiGuid ## SOMETIMES_CONSUMES gEfiTemporaryRamDonePpiGuid ## SOMETIMES_CONSUMES -[Pcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressPeiCodePageNumber ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnS3Boot ## SOMETIMES_CONSUMES +[Pcd] + gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressPeiCodePageNumber ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnS3Boot ## CONSUMES + +# [BootMode] +# S3_RESUME ## SOMETIMES_CONSUMES + +# [Hob] +# PHIT ## PRODUCES +# RESOURCE_DESCRIPTOR ## SOMETIMES_PRODUCES +# RESOURCE_DESCRIPTOR ## SOMETIMES_CONSUMES +# MEMORY_ALLOCATION ## SOMETIMES_CONSUMES +# FIRMWARE_VOLUME ## SOMETIMES_PRODUCES +# FIRMWARE_VOLUME ## SOMETIMES_CONSUMES +# MEMORY_ALLOCATION ## SOMETIMES_PRODUCES +# MEMORY_ALLOCATION ## PRODUCES # MEMORY_ALLOCATION_STACK +# UNDEFINED ## PRODUCES # MEMORY_POOL + +[UserExtensions.TianoCore."ExtraFiles"] + PeiCoreExtra.uni diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf index e2ef13e3c1..1225a20f2a 100644 --- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf +++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf @@ -1,7 +1,7 @@ ## @file # This module provide an SMM CIS compliant implementation of SMM Core. # -# Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -15,6 +15,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PiSmmCore + MODULE_UNI_FILE = PiSmmCore.uni FILE_GUID = E94F54CD-81EB-47ed-AEC3-856F5DC157A9 MODULE_TYPE = SMM_CORE VERSION_STRING = 1.0 @@ -59,22 +60,25 @@ TimerLib [Protocols] - gEfiDxeSmmReadyToLockProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiSmmReadyToLockProtocolGuid # PROTOCOL ALWAYS_PRODUCED - gEfiSmmCpuIo2ProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiFirmwareVolume2ProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiSmmEndOfDxeProtocolGuid # PROTOCOL ALWAYS_PRODUCED - gEfiSecurityArchProtocolGuid # PROTOCOL SOMETIMES_CONSUMED - gEfiSecurity2ArchProtocolGuid # PROTOCOL SOMETIMES_CONSUMED - gEfiLoadedImageProtocolGuid # PROTOCOL SOMETIMES_PRODUCED - gEfiDevicePathProtocolGuid # PROTOCOL SOMETIMES_CONSUMED + gEfiDxeSmmReadyToLockProtocolGuid ## UNDEFINED # SmiHandlerRegister + gEfiSmmReadyToLockProtocolGuid ## PRODUCES + gEfiSmmCpuIo2ProtocolGuid ## CONSUMES + gEfiFirmwareVolume2ProtocolGuid ## CONSUMES + gEfiSmmEndOfDxeProtocolGuid ## PRODUCES + gEfiSecurityArchProtocolGuid ## SOMETIMES_CONSUMES + gEfiSecurity2ArchProtocolGuid ## SOMETIMES_CONSUMES + gEfiLoadedImageProtocolGuid ## PRODUCES + gEfiDevicePathProtocolGuid ## CONSUMES [Pcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressSmmCodePageNumber # SOMETIMES_CONSUMED - gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable # ALWAYS_CONSUMED + gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressSmmCodePageNumber ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable ## CONSUMES [Guids] - gAprioriGuid # ALWAYS_CONSUMED - gEfiEventDxeDispatchGuid # ALWAYS_CONSUMED - gEfiEventLegacyBootGuid # ALWAYS_CONSUMED - gEfiEndOfDxeEventGroupGuid # ALWAYS_CONSUMED + gAprioriGuid ## SOMETIMES_CONSUMES ## File + gEfiEventDxeDispatchGuid ## PRODUCES ## GUID # SmiHandlerRegister + gEfiEventLegacyBootGuid ## PRODUCES ## GUID # SmiHandlerRegister + gEfiEndOfDxeEventGroupGuid ## PRODUCES ## GUID # SmiHandlerRegister + +[UserExtensions.TianoCore."ExtraFiles"] + PiSmmCoreExtra.uni diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf index 6af4f65b46..236ffa5d64 100644 --- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf +++ b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf @@ -1,7 +1,7 @@ ## @file -# This module provide an SMM CIS compliant implementation of SMM IPL. +# This module provide an SMM CIS compliant implementation of SMM IPL. # -# Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -15,6 +15,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PiSmmIpl + MODULE_UNI_FILE = PiSmmIpl.uni FILE_GUID = 2FA2A6DA-11D5-4dc3-999A-749648B03C56 MODULE_TYPE = DXE_RUNTIME_DRIVER VERSION_STRING = 1.0 @@ -51,26 +52,37 @@ PcdLib [Protocols] - gEfiSmmBase2ProtocolGuid # PROTOCOL ALWAYS_PRODUCED - gEfiSmmCommunicationProtocolGuid # PROTOCOL ALWAYS_PRODUCED - gEfiSmmAccess2ProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiSmmConfigurationProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiSmmControl2ProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiDxeSmmReadyToLockProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiCpuArchProtocolGuid # PROTOCOL SIMETIMES_CONSUMED + gEfiSmmBase2ProtocolGuid ## PRODUCES + gEfiSmmCommunicationProtocolGuid ## PRODUCES + gEfiSmmAccess2ProtocolGuid ## CONSUMES + ## NOTIFY + ## CONSUMES + gEfiSmmConfigurationProtocolGuid + gEfiSmmControl2ProtocolGuid ## CONSUMES + ## NOTIFY + ## SOMETIMES_CONSUMES + ## UNDEFINED # Used to do smm communcation + gEfiDxeSmmReadyToLockProtocolGuid + gEfiCpuArchProtocolGuid ## SOMETIMES_CONSUMES [Guids] - gEfiEventDxeDispatchGuid # ALWAYS_CONSUMED - gEfiEventReadyToBootGuid # ALWAYS_CONSUMED - gEfiEventLegacyBootGuid # ALWAYS_CONSUMED - gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED - gEfiEndOfDxeEventGroupGuid # ALWAYS_CONSUMED - gLoadFixedAddressConfigurationTableGuid # SIMETIMES_CONSUMED + ## CONSUMES ## Event + ## PRODUCES ## UNDEFINED # Used to do smm communcation + gEfiEventDxeDispatchGuid + gEfiEventReadyToBootGuid ## CONSUMES ## Event + ## SOMETIMES_CONSUMES ## Event + ## SOMETIMES_PRODUCES ## UNDEFINED # Used to do smm communcation + gEfiEventLegacyBootGuid + gEfiEventVirtualAddressChangeGuid ## CONSUMES ## Event + gEfiEndOfDxeEventGroupGuid ## CONSUMES ## Event + gLoadFixedAddressConfigurationTableGuid ## SOMETIMES_CONSUMES ## SystemTable [Pcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressSmmCodePageNumber # SIMETIMES_CONSUMED - gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable # ALWAYS_CONSUMED + gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressSmmCodePageNumber ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable ## CONSUMES - [Depex] gEfiSmmAccess2ProtocolGuid AND gEfiSmmControl2ProtocolGuid + +[UserExtensions.TianoCore."ExtraFiles"] + PiSmmIplExtra.uni diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf index 60576dcc2e..035aa9a596 100644 --- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf +++ b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf @@ -5,7 +5,7 @@ # CalculateCrc32 boot services table, SetVirtualAddressMap & ConvertPointer # runtime services table. # -# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -21,6 +21,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = RuntimeDxe + MODULE_UNI_FILE = RuntimeDxe.uni FILE_GUID = B601F8C4-43B7-4784-95B1-F4226CB40CEE MODULE_TYPE = DXE_RUNTIME_DRIVER VERSION_STRING = 1.0 @@ -58,4 +59,7 @@ gEfiLoadedImageProtocolGuid ## CONSUMES [depex] - TRUE \ No newline at end of file + TRUE + +[UserExtensions.TianoCore."ExtraFiles"] + RuntimeDxeExtra.uni \ No newline at end of file -- cgit v1.2.3