adjust file list order in dsc file.

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

2 files changed, 30 insertions, 34 deletions

diff --git a/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf b/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf
index 1c9b316205..05f8d21fa6 100644
--- a/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf
+++ b/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf
@@ -29,7 +29,7 @@
 #

 # The following information is for reference only and not required by the build tools.

 #

-#  VALID_ARCHITECTURES           = IA32 X64 EBC

+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 #  VIRTUAL_ADDRESS_MAP_CALLBACK  =  FvbVirtualAddressChangeNotifyEvent

 #

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index e1422bb3a9..00748d0d56 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -50,11 +50,13 @@
 

 [Components.common]

   MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf

+  MdePkg/Library/BaseCpuLib/BaseCpuLib.inf

   MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

+  MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

   MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

   MdePkg/Library/BaseLib/BaseLib.inf

-  MdePkg/Library/BaseCpuLib/BaseCpuLib.inf

   MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

+  MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf

   MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf

   MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf

@@ -65,23 +67,27 @@
   MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf

   MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf

   MdePkg/Library/BasePrintLib/BasePrintLib.inf

+  MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf

   MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf

   MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf

-  MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

+

   MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

   MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

+  MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

   MdePkg/Library/DxeHobLib/DxeHobLib.inf

-  MdePkg/Library/PeiHobLib/PeiHobLib.inf

-  MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

   MdePkg/Library/DxePcdLib/DxePcdLib.inf

   MdePkg/Library/DxePiLib/DxePiLib.inf

   MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

   MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf

-  MdePkg/Library/UefiHiiLib/UefiHiiLib.inf

-  MdePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf

+  MdePkg/Library/FvbServiceLib/FvbServiceLib.inf

+  MdePkg/Library/GraphicsLib/GraphicsLib.inf

+

+

   MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf

-  MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf

   MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf

+  MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf

+  MdePkg/Library/PeiHobLib/PeiHobLib.inf

+  MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf

   MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf

   MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf

   MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

@@ -91,7 +97,7 @@
   MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

   MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

   MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf

-  MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf

+

   MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

   MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

   MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf

@@ -99,46 +105,36 @@
   MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

   MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf

   MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

+  MdePkg/Library/UefiHiiLib/UefiHiiLib.inf

+  MdePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf

   MdePkg/Library/UefiLib/UefiLib.inf

+  MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

+  MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf

   MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

   MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

-  MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf

   MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

-  MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf

-  MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

-  MdePkg/Library/FvbServiceLib/FvbServiceLib.inf

-  MdePkg/Library/GraphicsLib/GraphicsLib.inf

 

-[Components.IA32]

+[Components.IA32, Components.X64]

   MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

-  MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf

-  MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf

-  MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf

-  MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf

   MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf

-  MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

-  MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf

-  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

+  MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf

   MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf

-  MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf

-  MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

-  MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf

+  MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf

   MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

+  MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf

+  MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.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

+  MdePkg/Library/PeiPalLib/PeiPalLib.inf

+  MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointerLibKr7.inf

+  MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf

+

 

 [Components.EBC]

   MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

+