From 078bee4ebfc4dfdff3eff06823c4fd514c9130f5 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Tue, 28 Oct 2008 07:17:17 +0000 Subject: [PATCH] clean up EBC in inf files. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6267 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Core/Dxe/DxeMain.inf | 6 +++++- MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 4 ++-- MdeModulePkg/Core/Pei/PeiMain.inf | 2 +- MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf | 2 ++ .../DxeCoreMemoryAllocationLib.inf | 3 ++- .../PeiPerformanceLib/PeiPerformanceLib.inf | 2 +- .../PeiRecoveryLibNull/PeiRecoveryLibNull.inf | 2 +- .../Library/PeiS3LibNull/PeiS3LibNull.inf | 2 +- MdeModulePkg/MdeModulePkg.dsc | 21 +++++++++---------- .../BaseMemoryTestPei/BaseMemoryTestPei.inf | 6 +++++- .../NullMemoryTestDxe/NullMemoryTestDxe.inf | 4 ++++ MdeModulePkg/Universal/PCD/Pei/Pcd.inf | 2 +- .../PcatSingleSegmentPciCfg2Pei.inf | 4 +++- .../RuntimeDxe/VariableRuntimeDxe.inf | 2 +- .../DxeCoreEntryPoint/DxeCoreEntryPoint.inf | 2 +- .../Library/DxeCoreHobLib/DxeCoreHobLib.inf | 2 +- .../Library/FvbServiceLib/FvbServiceLib.inf | 4 ++-- .../PeiCoreEntryPoint/PeiCoreEntryPoint.inf | 2 +- .../PeiExtractGuidedSectionLib.inf | 2 +- MdePkg/Library/PeiHobLib/PeiHobLib.inf | 2 +- .../Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf | 2 +- .../PeiMemoryAllocationLib.inf | 2 +- MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf | 2 +- MdePkg/Library/PeiPcdLib/PeiPcdLib.inf | 2 +- MdePkg/Library/PeiPiLib/PeiPiLib.inf | 2 +- .../PeiResourcePublicationLib.inf | 2 +- .../Library/PeiServicesLib/PeiServicesLib.inf | 2 +- .../PeiServicesTablePointerLib.inf | 2 +- .../PeiServicesTablePointerLibIdt.inf | 2 +- .../PeiSmbusLibSmbus2Ppi.inf | 2 +- .../Library/PeimEntryPoint/PeimEntryPoint.inf | 2 +- .../SecPeiDxeTimerLibCpu.inf | 16 +++----------- MdePkg/MdePkg.dsc | 6 ++++++ 33 files changed, 66 insertions(+), 54 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf index 4e1186f87a..e98b3e2213 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.inf +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf @@ -26,7 +26,11 @@ ENTRY_POINT = DxeMain -# VALID_ARCHITECTURES = IA32 X64 IPF +# +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) +# [Sources.common] DxeMain.h diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf index 3abd31db56..b952a9b90d 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf @@ -30,7 +30,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] @@ -45,7 +45,7 @@ Ia32/IdtVectorAsm.asm Ia32/IdtVectorAsm.S | GCC -[Sources.X64] +[Sources.X64, Sources.EBC] X64/DxeLoadFunc.c Ia32/ImageRead.c diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf index 2e83e660e0..2164380934 100644 --- a/MdeModulePkg/Core/Pei/PeiMain.inf +++ b/MdeModulePkg/Core/Pei/PeiMain.inf @@ -30,7 +30,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf index 943e6c0fd6..99e31a5c89 100644 --- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf +++ b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf @@ -26,6 +26,8 @@ ENTRY_POINT = RuntimeDriverInitialize +# +# The following information is for reference only and not required by the build tools. # # VALID_ARCHITECTURES = IA32 X64 IPF EBC # diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf index 1221269322..3063629972 100644 --- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf +++ b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf @@ -28,7 +28,8 @@ EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 - +# +# The following information is for reference only and not required by the build tools. # # VALID_ARCHITECTURES = IA32 X64 IPF EBC # diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf index d7e0c8d666..a7f92b7d03 100644 --- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf +++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf @@ -29,7 +29,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf index 10ea0cdbea..201e56c8cb 100644 --- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf +++ b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf @@ -27,7 +27,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf index 3dfb63b1d8..a39cd35cad 100644 --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf +++ b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf @@ -29,7 +29,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index dc0499e002..b5b8aa6aad 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -254,6 +254,7 @@ [Components.common] MdeModulePkg/Core/Pei/PeiMain.inf + MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf MdeModulePkg/Core/Dxe/DxeMain.inf { NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf @@ -342,33 +343,31 @@ MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf - -[Components.IA32] MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf + +[Components.IA32] MdeModulePkg/Universal/EbcDxe/EbcDxe.inf MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf - MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf [Components.X64] - MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf - MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf MdeModulePkg/Universal/EbcDxe/EbcDxe.inf MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf - MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf [Components.IPF] - MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf MdeModulePkg/Universal/EbcDxe/EbcDxe.inf MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf - MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf [Components.EBC] - #BugBug: Need DXE I/O library instance for EBC. + # + # PcatRealTimeClockRuntimeDxe.inf needs DXE I/O Library instance. + # #MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf - - + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf diff --git a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf index 0213fa702d..019984d3d9 100644 --- a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf +++ b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf @@ -26,7 +26,11 @@ ENTRY_POINT = PeiBaseMemoryTestInit -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) +# [Sources.common] BaseMemoryTest.c diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf index c59b7c8a99..cdceb9c0e9 100644 --- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf +++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf @@ -27,7 +27,11 @@ ENTRY_POINT = GenericMemoryTestEntryPoint +# +# The following information is for reference only and not required by the build tools. +# # VALID_ARCHITECTURES = IA32 X64 IPF EBC +# [Sources.common] NullMemoryTest.h diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf index a2963d60a3..df0ec1ecad 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf @@ -29,7 +29,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf index eeec5573d4..6bb9d897bd 100644 --- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf +++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf @@ -26,7 +26,9 @@ ENTRY_POINT = PeimInitializePciCfg # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf index 05ff6da109..b90486ba80 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf @@ -28,7 +28,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 +# VALID_ARCHITECTURES = IA32 X64 EBC # # VIRTUAL_ADDRESS_MAP_CALLBACK = VariableClassAddressChangeEvent # diff --git a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf index c4801e34cc..5ae6e0ac69 100644 --- a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf +++ b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf @@ -26,7 +26,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf index 07b02fbff7..4902bcac9c 100644 --- a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf +++ b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf @@ -27,7 +27,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf b/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf index b019232f69..1c9b316205 100644 --- a/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf +++ b/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf @@ -29,12 +29,12 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 +# VALID_ARCHITECTURES = IA32 X64 EBC # # VIRTUAL_ADDRESS_MAP_CALLBACK = FvbVirtualAddressChangeNotifyEvent # -[Sources] +[Sources.common] Fvb.h Fvb.c diff --git a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf index af8adae9ea..c50ef4b378 100644 --- a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf +++ b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf @@ -26,7 +26,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf index b84ee05581..490e7d2ba8 100644 --- a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf +++ b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf @@ -27,7 +27,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiHobLib/PeiHobLib.inf b/MdePkg/Library/PeiHobLib/PeiHobLib.inf index 64733ffe43..f4314054f9 100644 --- a/MdePkg/Library/PeiHobLib/PeiHobLib.inf +++ b/MdePkg/Library/PeiHobLib/PeiHobLib.inf @@ -26,7 +26,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf index aee8f20148..e1580374c8 100644 --- a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf +++ b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf @@ -27,7 +27,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf b/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf index 6cb6327f3b..cbe11a7c29 100644 --- a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf +++ b/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf @@ -27,7 +27,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf b/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf index fad2cf048b..87543c8eba 100644 --- a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf +++ b/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf @@ -27,7 +27,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf index 9294018055..69c9c85a27 100644 --- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf +++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf @@ -28,7 +28,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiPiLib/PeiPiLib.inf b/MdePkg/Library/PeiPiLib/PeiPiLib.inf index 29aba607c4..14c8662932 100644 --- a/MdePkg/Library/PeiPiLib/PeiPiLib.inf +++ b/MdePkg/Library/PeiPiLib/PeiPiLib.inf @@ -27,7 +27,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf index 8c774ce752..19de2ddb15 100644 --- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf +++ b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf @@ -26,7 +26,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf b/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf index 4432def698..1c5d1f76bf 100644 --- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf +++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf @@ -26,7 +26,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf index d23959a5cb..c149dfe565 100644 --- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf +++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf @@ -30,7 +30,7 @@ CONSTRUCTOR = PeiServicesTablePointerLibConstructor # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf index 8d5f430939..c9131c09fa 100644 --- a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf +++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf @@ -25,7 +25,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 +# VALID_ARCHITECTURES = IA32 X64 EBC (EBC is for build only) # [Packages] diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf index 90c6157efb..c7839e2c36 100644 --- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf +++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf @@ -26,7 +26,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf index 8f8843845f..373b1f4074 100644 --- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf +++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf @@ -26,7 +26,7 @@ # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) # [Sources.common] diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf index 3aaff3a633..5f348154ae 100644 --- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf +++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf @@ -33,10 +33,7 @@ # VALID_ARCHITECTURES = IA32 X64 IPF # -[Sources.Ia32] - X86TimerLib.c - -[Sources.X64] +[Sources.Ia32, Sources.X64] X86TimerLib.c [Sources.IPF] @@ -50,11 +47,7 @@ [LibraryClasses] BaseLib -[LibraryClasses.IA32] - PcdLib - IoLib - -[LibraryClasses.X64] +[LibraryClasses.IA32, LibraryClasses.X64] PcdLib IoLib @@ -62,9 +55,6 @@ PalCallLib -[Pcd.IA32] - gEfiMdePkgTokenSpaceGuid.PcdFSBClock - -[Pcd.X64] +[Pcd.IA32, Pcd.X64] gEfiMdePkgTokenSpaceGuid.PcdFSBClock diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index a0517e9fe0..e1422bb3a9 100644 --- a/MdePkg/MdePkg.dsc +++ b/MdePkg/MdePkg.dsc @@ -111,6 +111,7 @@ MdePkg/Library/GraphicsLib/GraphicsLib.inf [Components.IA32] + MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf @@ -121,6 +122,7 @@ MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf [Components.X64] + MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf @@ -131,8 +133,12 @@ MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf [Components.IPF] + MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointerLibKr7.inf MdePkg/Library/BasePalCallLibNull/BasePalCallLibNull.inf MdePkg/Library/PeiPalLib/PeiPalLib.inf MdePkg/Library/DxePalLib/DxePalLib.inf + +[Components.EBC] + MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf -- 2.39.2