clean up EBC in inf files.

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

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 4e1186f87a357d44664aa17a42463e99a5d37a1f..e98b3e22136b1e9508c91233fb0c590954e0e43c 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -26,7 +26,11 @@
 \r
   ENTRY_POINT                    = DxeMain\r
 \r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF\r
+#\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
+#\r
 \r
 [Sources.common]\r
   DxeMain.h\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index 3abd31db567d6ff1e4148a0b51a0f6421b335c87..b952a9b90d0e0fd92415b8de9c23f7c0b2ceb663 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -30,7 +30,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r
@@ -45,7 +45,7 @@
   Ia32/IdtVectorAsm.asm\r
   Ia32/IdtVectorAsm.S | GCC\r
 \r
-[Sources.X64]\r
+[Sources.X64, Sources.EBC]\r
   X64/DxeLoadFunc.c\r
   Ia32/ImageRead.c\r
 \r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 2e83e660e075cc6db17e8a87d2dc95d3ae408773..2164380934ec90917adc2013a860f8421d7399db 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -30,7 +30,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
index 943e6c0fd6274eec0d1c8d28c02a9a73d230cc72..99e31a5c899ea362b668ebbcdac6ba6726b2b4d7 100644 (file)
--- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+++ b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
@@ -26,6 +26,8 @@
 \r
   ENTRY_POINT                    = RuntimeDriverInitialize\r
 \r
+#\r
+# The following information is for reference only and not required by the build tools.\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
index 1221269322769d0036983b888bc8484cb47ad470..3063629972d55dd79e376c6e61be8eae0320bd2c 100644 (file)
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
+++ b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
@@ -28,7 +28,8 @@
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r
-\r
+#\r
+# The following information is for reference only and not required by the build tools.\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
index d7e0c8d66658c8e9c3b9ce1f5165df126647cf02..a7f92b7d0367c69de8522c52481e4ac07965aca0 100644 (file)
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
@@ -29,7 +29,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
index 10ea0cdbeadee1ee83461cc8d47565a3de204817..201e56c8cb6e938af6435e325aefb7fb2a84daa2 100644 (file)
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
+++ b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
@@ -27,7 +27,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
index 3dfb63b1d8cfb25750da79bae8539c5783d6dd74..a39cd35cadeb24d717e65f3d4d05c558017196f9 100644 (file)
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
+++ b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
@@ -29,7 +29,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index dc0499e002f5b52a063e85a645da7edffd8587c5..b5b8aa6aad858ab59195b3621d3fd667a2a33c29 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -254,6 +254,7 @@
 \r
 [Components.common]\r
   MdeModulePkg/Core/Pei/PeiMain.inf\r
+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
   MdeModulePkg/Core/Dxe/DxeMain.inf {\r
     <LibraryClasses>\r
       NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf\r
@@ -342,33 +343,31 @@
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
   MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
-\r
-[Components.IA32]\r
   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
+\r
+[Components.IA32]\r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf\r
   MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+  MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r
 \r
 [Components.X64]\r
-  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
-  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf\r
   MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
   MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
 [Components.IPF]\r
-  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf\r
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
 [Components.EBC]\r
-  #BugBug: Need DXE I/O library instance for EBC.\r
+  #\r
+  # PcatRealTimeClockRuntimeDxe.inf needs DXE I/O Library instance.\r
+  #\r
   #MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
-\r
-\r
+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+  MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r

diff --git a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
index 0213fa702d5c7fe18b55c8566fdc7fc71b1712bd..019984d3d9fc40aaa279ff4b7ebebfba2ab85e4a 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
+++ b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
@@ -26,7 +26,11 @@
 \r
   ENTRY_POINT                    = PeiBaseMemoryTestInit\r
 \r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
+#\r
 \r
 [Sources.common]\r
   BaseMemoryTest.c\r

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
index c59b7c8a99f1caf46271fed1490fd9266847c83a..cdceb9c0e9814e718f80a9d5e28d7e0cf29b13d9 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
@@ -27,7 +27,11 @@
 \r
   ENTRY_POINT                    = GenericMemoryTestEntryPoint\r
 \r
+#\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#\r
 \r
 [Sources.common]\r
   NullMemoryTest.h\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index a2963d60a398344b8e9febb397adc8244ddb79c5..df0ec1ecada8c0ff859ec5ec358f59cea695bf59 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -29,7 +29,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
index eeec5573d4569a42be722f0990b83e2795571118..6bb9d897bdb98364d43c1cc7ab9edb0de9a01ea8 100644 (file)
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
@@ -26,7 +26,9 @@
   ENTRY_POINT                    = PeimInitializePciCfg\r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
index 05ff6da1097dddaa44bb3fc4c476ca1185493fa4..b90486ba805407f14dd59c63038055b7d33cc1e9 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
@@ -28,7 +28,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64\r
+#  VALID_ARCHITECTURES           = IA32 X64 EBC\r
 #\r
 #  VIRTUAL_ADDRESS_MAP_CALLBACK  =  VariableClassAddressChangeEvent\r
 #\r

diff --git a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
index c4801e34cce0ac6884bc011c689d399eaea9b5cc..5ae6e0ac696a19178a5da2a1c18d7f941885bd50 100644 (file)
--- a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
+++ b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
@@ -26,7 +26,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
index 07b02fbff71cbcad6d092b98a739b645ac72da77..4902bcac9c4cd09851faa8ed6781b3e64f415bd8 100644 (file)
--- a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
+++ b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
@@ -27,7 +27,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf b/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf
index b019232f69f935d3ed3b39cbf424f62561c7ae0c..1c9b3162050e52cde4fd17742a0f06215f72747a 100644 (file)
--- a/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf
+++ b/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf
@@ -29,12 +29,12 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64\r
+#  VALID_ARCHITECTURES           = IA32 X64 EBC\r
 #\r
 #  VIRTUAL_ADDRESS_MAP_CALLBACK  =  FvbVirtualAddressChangeNotifyEvent\r
 #\r
 \r
-[Sources]\r
+[Sources.common]\r
   Fvb.h\r
   Fvb.c\r
 \r

diff --git a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
index af8adae9ea339a55e160bf382eeab186bee3b210..c50ef4b3789dc222f78e2cba23c7730fc08d1242 100644 (file)
--- a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
+++ b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
@@ -26,7 +26,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
index b84ee05581b5d810fc0b9c6bf9638321484bd987..490e7d2ba862a0873adb0b8922481668d8cd13f6 100644 (file)
--- a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
+++ b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
@@ -27,7 +27,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiHobLib/PeiHobLib.inf b/MdePkg/Library/PeiHobLib/PeiHobLib.inf
index 64733ffe437444b5ca7f4aae35c59a239f148e2c..f4314054f91a9a49c785bd329c91be9f0b3ae9b9 100644 (file)
--- a/MdePkg/Library/PeiHobLib/PeiHobLib.inf
+++ b/MdePkg/Library/PeiHobLib/PeiHobLib.inf
@@ -26,7 +26,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
index aee8f20148ecaedf1f16c26d0845cdbce0d7bcfa..e1580374c8a0b1399cefa1a07b68c68e881e3aa9 100644 (file)
--- a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
+++ b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
@@ -27,7 +27,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf b/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
index 6cb6327f3bdd51f1fa28dbc8c29de157e2cf7386..cbe11a7c2970ec222123e53173a3ca91010e13db 100644 (file)
--- a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
+++ b/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
@@ -27,7 +27,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf b/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf
index fad2cf048b82be3f86296e15a84ec234054dbda1..87543c8ebaf84915a44b52d0e8b5077068dd46ac 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf
+++ b/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf
@@ -27,7 +27,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
index 92940180555e51b37208fff0139e89993209642f..69c9c85a2787bf5bbc20ace1a0b6295c03d4ccfa 100644 (file)
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
@@ -28,7 +28,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiPiLib/PeiPiLib.inf b/MdePkg/Library/PeiPiLib/PeiPiLib.inf
index 29aba607c4d76f593f5df7a827dc0664ea94ff08..14c8662932d71748d650d170631a847e65cacf8e 100644 (file)
--- a/MdePkg/Library/PeiPiLib/PeiPiLib.inf
+++ b/MdePkg/Library/PeiPiLib/PeiPiLib.inf
@@ -27,7 +27,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
index 8c774ce752db79c921ee3435c398e1fc908152e8..19de2ddb15a6bce9ed2e586ab063c8f91a4ece95 100644 (file)
--- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
+++ b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
@@ -26,7 +26,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf b/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
index 4432def698a52fc7d004eb8fb937aad423fb41c4..1c5d1f76bf569dc9a496cea217aa67671e3cb302 100644 (file)
--- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
+++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
@@ -26,7 +26,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
index d23959a5cba054c479356d925ecf9e4a53f4d220..c149dfe56550222e1b4fe9a918e40a7f6d6acc59 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
@@ -30,7 +30,7 @@
   CONSTRUCTOR                    = PeiServicesTablePointerLibConstructor\r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
index 8d5f430939f88b23a6b915258170f66916b6f39c..c9131c09fa743365b7b1198572b44392d5a18a20 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
+++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
@@ -25,7 +25,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64\r
+#  VALID_ARCHITECTURES           = IA32 X64 EBC (EBC is for build only)\r
 #\r
 \r
 [Packages]\r

diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
index 90c6157efb48caf64b1624669e190a507fb12235..c7839e2c368a21b92e325b89a0973f06aecf328b 100644 (file)
--- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
+++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
@@ -26,7 +26,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
index 8f8843845fa5abf5f49ba48e28230cbca0be975d..373b1f40748d37e64f6fa0f24be34f361a9b9c9e 100644 (file)
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
+++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
@@ -26,7 +26,7 @@
 \r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
index 3aaff3a63369994c88a775a3536f25d1e9246223..5f348154aee76892174506e2a776c4543516593e 100644 (file)
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
@@ -33,10 +33,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF\r
 #\r
 \r
-[Sources.Ia32]\r
-  X86TimerLib.c\r
-\r
-[Sources.X64]\r
+[Sources.Ia32, Sources.X64]\r
   X86TimerLib.c\r
 \r
 [Sources.IPF]\r
@@ -50,11 +47,7 @@
 [LibraryClasses]\r
   BaseLib\r
 \r
-[LibraryClasses.IA32]\r
-  PcdLib\r
-  IoLib\r
-\r
-[LibraryClasses.X64]\r
+[LibraryClasses.IA32, LibraryClasses.X64]\r
   PcdLib\r
   IoLib\r
 \r
@@ -62,9 +55,6 @@
   PalCallLib\r
 \r
 \r
-[Pcd.IA32]\r
-  gEfiMdePkgTokenSpaceGuid.PcdFSBClock\r
-\r
-[Pcd.X64]\r
+[Pcd.IA32, Pcd.X64]\r
   gEfiMdePkgTokenSpaceGuid.PcdFSBClock\r
 \r

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index a0517e9fe05a38e94ff55fe532a811c9435d5053..e1422bb3a9bf185e3e15ad793947a63883035b89 100644 (file)
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -111,6 +111,7 @@
   MdePkg/Library/GraphicsLib/GraphicsLib.inf\r
 \r
 [Components.IA32]\r
+  MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf\r
   MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf\r
   MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf\r
@@ -121,6 +122,7 @@
   MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf\r
 \r
 [Components.X64]\r
+  MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf\r
   MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf\r
   MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf\r
@@ -131,8 +133,12 @@
   MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf\r
 \r
 [Components.IPF]\r
+  MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r
   MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointerLibKr7.inf\r
   MdePkg/Library/BasePalCallLibNull/BasePalCallLibNull.inf\r
   MdePkg/Library/PeiPalLib/PeiPalLib.inf\r
   MdePkg/Library/DxePalLib/DxePalLib.inf\r
+\r
+[Components.EBC]\r
+  MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r