clean up EBC in inf files.

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

19 files changed, 27 insertions, 31 deletions

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