]> git.proxmox.com Git - mirror_edk2.git/blobdiff - EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
sync comments, fix function header, rename variable name to follow coding style.
[mirror_edk2.git] / EdkCompatibilityPkg / EdkCompatibilityPkg.dsc
index 5502fd2b75586d151137d2c3646040f088c56ee8..f57208c31617ab46695ec6d106047fdeea839e21 100644 (file)
   PLATFORM_VERSION               = 0.1\r
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = Build/EdkCompatibilityPkg\r
-  SUPPORTED_ARCHITECTURES        = IA32|X64|IPF\r
+  SUPPORTED_ARCHITECTURES        = IA32|X64|IPF|EBC\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
-\r
+define MSFT_MACRO                = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000\r
+define INTEL_MACRO                = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000\r
+define GCC_MACRO                 = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_SPECIFICATION_VERSION=0x00010000 -DTIANO_RELEASE_VERSION=0x00080006 -DPCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000\r
 \r
 ################################################################################\r
 #\r
 [SkuIds]\r
   0|DEFAULT              # The entry: 0|DEFAULT is reserved and always required.\r
 \r
+[LibraryClasses.common]\r
+  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  HiiLib|MdePkg/Library/UefiHiiLib/UefiHiiLib.inf\r
+  ExtendedHiiLib|MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf\r
+  IfrSupportLib|MdePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf\r
+  ExtendedIfrSupportLib|MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf\r
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
+  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
+  PalCallLib|MdePkg/Library/BasePalCallLibNull/BasePalCallLibNull.inf\r
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
+  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf\r
+  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf\r
+  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
+  PeiPiLib|MdePkg/Library/PeiPiLib/PeiPiLib.inf\r
+  \r
+[LibraryClasses.common.PEIM]\r
+  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
+\r
+[LibraryClasses.common.DXE_DRIVER]\r
+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
+\r
 [BuildOptions]\r
-  *_*_*_CC_FLAGS    = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 \r
-  *_*_*_ASM_FLAGS   = \r
-  *_*_*_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 \r
-  *_*_*_APP_FLAGS   = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 \r
-  *_*_*_PP_FLAGS    = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 \r
+  GCC:*_*_IA32_CC_FLAGS     = -DEFI32 $(GCC_MACRO)\r
+  GCC:*_*_IA32_ASM_FLAGS    = -DEFI32\r
+  GCC:*_*_IA32_VFRPP_FLAGS  = -DEFI32 $(GCC_MACRO)\r
+  GCC:*_*_IA32_APP_FLAGS    = -DEFI32 $(GCC_MACRO)\r
+  GCC:*_*_IA32_PP_FLAGS     = -DEFI32 $(GCC_MACRO)\r
+\r
+  GCC:*_*_X64_CC_FLAGS      = -DEFIX64 $(GCC_MACRO)\r
+  GCC:*_*_X64_ASM_FLAGS     = -DEFIX64\r
+  GCC:*_*_X64_VFRPP_FLAGS   = -DEFIX64 $(GCC_MACRO)\r
+  GCC:*_*_X64_APP_FLAGS     = -DEFIX64 $(GCC_MACRO)\r
+  GCC:*_*_X64_PP_FLAGS      = -DEFIX64 $(GCC_MACRO)\r
+\r
+  GCC:*_*_IPF_CC_FLAGS      = -DEFI64 $(GCC_MACRO)\r
+  GCC:*_*_IPF_ASM_FLAGS     =\r
+  GCC:*_*_IPF_VFRPP_FLAGS   = -DEFI64 $(GCC_MACRO)\r
+  GCC:*_*_IPF_APP_FLAGS     = -DEFI64 $(GCC_MACRO)\r
+  GCC:*_*_IPF_PP_FLAGS      = -DEFI64 $(GCC_MACRO)\r
+\r
+\r
+  INTEL:*_*_IA32_CC_FLAGS    = /D EFI32 $(MSFT_MACRO)\r
+  INTEL:*_*_IA32_ASM_FLAGS   = /DEFI32\r
+  INTEL:*_*_IA32_VFRPP_FLAGS = /D EFI32 $(MSFT_MACRO)\r
+  INTEL:*_*_IA32_APP_FLAGS   = /D EFI32 $(MSFT_MACRO)\r
+  INTEL:*_*_IA32_PP_FLAGS    = /D EFI32 $(MSFT_MACRO)\r
+\r
+  INTEL:*_*_EBC_CC_FLAGS    = /D EFI32 $(MSFT_MACRO)\r
+  INTEL:*_*_EBC_PP_FLAGS    = /D EFI32 $(MSFT_MACRO)\r
+\r
+  INTEL:*_*_X64_CC_FLAGS     = /D EFIX64 $(MSFT_MACRO)\r
+  INTEL:*_*_X64_ASM_FLAGS    = /DEFIX64\r
+  INTEL:*_*_X64_VFRPP_FLAGS  = /D EFIX64 $(MSFT_MACRO)\r
+  INTEL:*_*_X64_APP_FLAGS    = /D EFIX64 $(MSFT_MACRO)\r
+  INTEL:*_*_X64_PP_FLAGS     = /D EFIX64 $(MSFT_MACRO)\r
+\r
+  INTEL:*_*_IPF_CC_FLAGS     = /D EFI64 $(MSFT_MACRO)\r
+  INTEL:*_*_IPF_ASM_FLAGS    =\r
+  INTEL:*_*_IPF_VFRPP_FLAGS  = /D EFI64 $(MSFT_MACRO)\r
+  INTEL:*_*_IPF_APP_FLAGS    = /D EFI64 $(MSFT_MACRO)\r
+  INTEL:*_*_IPF_PP_FLAGS     = /D EFI64 $(MSFT_MACRO)\r
+\r
+\r
+  MSFT:*_*_IA32_CC_FLAGS    = /D EFI32 $(MSFT_MACRO)\r
+  MSFT:*_*_IA32_ASM_FLAGS   = /DEFI32\r
+  MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32 $(MSFT_MACRO)\r
+  MSFT:*_*_IA32_APP_FLAGS   = /D EFI32 $(MSFT_MACRO)\r
+  MSFT:*_*_IA32_PP_FLAGS    = /D EFI32 $(MSFT_MACRO)\r
+\r
+  MSFT:*_*_X64_CC_FLAGS     = /D EFIX64 $(MSFT_MACRO)\r
+  MSFT:*_*_X64_ASM_FLAGS    = /DEFIX64\r
+  MSFT:*_*_X64_VFRPP_FLAGS  = /D EFIX64 $(MSFT_MACRO)\r
+  MSFT:*_*_X64_APP_FLAGS    = /D EFIX64 $(MSFT_MACRO)\r
+  MSFT:*_*_X64_PP_FLAGS     = /D EFIX64 $(MSFT_MACRO)\r
+\r
+  MSFT:*_*_IPF_CC_FLAGS     = /D EFI64 $(MSFT_MACRO)\r
+  MSFT:*_*_IPF_ASM_FLAGS    =\r
+  MSFT:*_*_IPF_VFRPP_FLAGS  = /D EFI64 $(MSFT_MACRO)\r
+  MSFT:*_*_IPF_APP_FLAGS    = /D EFI64 $(MSFT_MACRO)\r
+  MSFT:*_*_IPF_PP_FLAGS     = /D EFI64 $(MSFT_MACRO)\r
 \r
 \r
 [Components.Common]\r
 \r
 # All Libraries Instances listed in Alphabetic Order\r
-  EdkCompatibilityPkg\Foundation\Core\Dxe\ArchProtocol\ArchProtocolLib.inf\r
-  EdkCompatibilityPkg\Foundation\Efi\Guid\EfiGuidLib.inf\r
-  EdkCompatibilityPkg\Foundation\Efi\Protocol\EfiProtocolLib.inf\r
-  EdkCompatibilityPkg\Foundation\Framework\Guid\EdkFrameworkGuidLib.inf\r
-  EdkCompatibilityPkg\Foundation\Framework\Ppi\EdkFrameworkPpiLib.inf\r
-  EdkCompatibilityPkg\Foundation\Framework\Protocol\EdkFrameworkProtocolLib.inf\r
-  EdkCompatibilityPkg\Foundation\Guid\EdkGuidLib.inf\r
+  EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf\r
+  EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf\r
+  EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf\r
+  EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf\r
+  EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf\r
+  EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProtocolLib.inf\r
+  EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf\r
 \r
   #\r
   # BugBug: Can't pass IPF build. Will investigate and add back later.\r
   #\r
-#  EdkCompatibilityPkg\Foundation\Library\CompilerStub\CompilerStubLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\CustomizedDecompress\CustomizedDecompress.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiDriverLib\EfiDriverLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiIfrSupportLib\EfiIfrSupportLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiScriptLib\EfiScriptLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiUiLib\EfiUiLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Dxe\Graphics\Graphics.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Dxe\GraphicsLite\Graphics.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Dxe\Hob\HobLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Dxe\Print\PrintLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Dxe\PrintLite\PrintLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Dxe\UefiEfiIfrSupportLib\UefiEfiIfrSupportLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseCacheMaintenanceLib\BaseCacheMaintenanceLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseDebugLibNull\BaseDebugLibNull.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseIoLibIntrinsic\BaseIoLibIntrinsic.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseLib\BaseLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseMemoryLib\BaseMemoryLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePciCf8Lib\BasePciCf8Lib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePciExpressLib\BasePciExpressLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePciLibCf8\BasePciLibCf8.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePciLibPciExpress\BasePciLibPciExpress.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePeCoffGetEntryPointLib\BasePeCoffGetEntryPointLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePeCoffLib\BasePeCoffLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePostCodeLibDebug\BasePostCodeLibDebug.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePostCodeLibPort80\BasePostCodeLibPort80.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BasePrintLib\BasePrintLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseTimerLibLocalApic\BaseTimerLibLocalApic.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\BaseUefiDecompressLib\BaseUefiDecompressLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeHobLib\DxeHobLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeIoLibCpuIo\DxeIoLibCpuIo.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeMemoryAllocationLib\DxeMemoryAllocationLib.inf\r
+#  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/CustomizedDecompress/CustomizedDecompress.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupportLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiEfiIfrSupportLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+  #\r
+  # Need to sync with MdePkg\Library\BaseIoLibIntrinsic\BaseIoLibIntrinsic.inf so that EBC can pass build\r
+  #\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/BaseMemoryLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib/BasePciCf8Lib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpressLib/BasePciExpressLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8/BasePciLibCf8.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib/BasePeCoffLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/BasePrintLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
 \r
   #\r
   # BugBug: Can't pass IPF build. Will investigate and add back later.\r
   #\r
-# EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxePerformanceLib\DxePerformanceLib.inf\r
-\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeReportStatusCodeLib\DxeReportStatusCodeLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeServicesTableLib\DxeServicesTableLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\DxeSmbusLib\DxeSmbusLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\EdkDxeRuntimeDriverLib\EdkDxeRuntimeDriverLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\HiiLib\HiiLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiDxeDebugLibReportStatusCode\PeiDxeDebugLibReportStatusCode.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiDxePostCodeLibReportStatusCode\PeiDxePostCodeLibReportStatusCode.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiHobLib\PeiHobLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiMemoryAllocationLib\PeiMemoryAllocationLib.inf\r
+# EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxePerformanceLib/DxePerformanceLib.inf\r
+\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeSmbusLib/DxeSmbusLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/PeiHobLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
   #\r
   # BugBug: Can't pass IPF build. Will investigate and add back later.\r
   #\r
-# EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiPerformanceLib\PeiPerformanceLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiReportStatusCodeLib\PeiReportStatusCodeLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiResourcePublicationLib\PeiResourcePublicationLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiServicesLib\PeiServicesLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiServicesTablePointerLib\PeiServicesTablePointerLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiSmbusLib\PeiSmbusLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\UefiBootServicesTableLib\UefiBootServicesTableLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\UefiDevicePathLib\UefiDevicePathLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\UefiDriverModelLib\UefiDriverModelLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\UefiLib\UefiLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\UefiRuntimeServicesTableLib\UefiRuntimeServicesTableLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EfiCommonLib\EfiCommonLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Pei\Hob\PeiHobLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Pei\PeiLib\PeiLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\RuntimeDxe\EfiRuntimeLib\EfiRuntimeLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\Thunk16\Thunk16Lib.inf\r
-  EdkCompatibilityPkg\Foundation\Ppi\EdkPpiLib.inf\r
-  EdkCompatibilityPkg\Foundation\Protocol\EdkProtocolLib.inf\r
-  EdkCompatibilityPkg\Sample\Platform\Generic\MonoStatusCode\Library\Pei\MemoryStatusCode\MemoryStatusCode.inf\r
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\BsDataHubStatusCode\BsDataHubStatusCode.inf\r
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\BsSerialStatusCode\BsSerialStatusCode.inf\r
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtLedStatusCode\RtLedStatusCode.inf\r
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtMemoryStatusCode\RtMemoryStatusCode.inf\r
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtPlatformStatusCode\Nt32\RtPlatformStatusCode.inf\r
-  EdkCompatibilityPkg\Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtPort80StatusCode\RtPort80StatusCode.inf\r
-  EdkCompatibilityPkg\Sample\Platform\Nt32\Ppi\EdkNt32PpiLib.inf\r
-  EdkCompatibilityPkg\Sample\Platform\Nt32\Protocol\EdkNt32ProtocolLib.inf\r
+# EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiPerformanceLib/PeiPerformanceLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLib/PeiServicesLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiSmbusLib/PeiSmbusLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib.inf\r
+  EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf\r
+  EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf\r
+  EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.inf\r
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsDataHubStatusCode/BsDataHubStatusCode.inf\r
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.inf\r
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtLedStatusCode/RtLedStatusCode.inf\r
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtMemoryStatusCode/RtMemoryStatusCode.inf\r
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPlatformStatusCode/Nt32/RtPlatformStatusCode.inf\r
+  EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/RtPort80StatusCode/RtPort80StatusCode.inf\r
+  EdkCompatibilityPkg/Sample/Platform/Nt32/Ppi/EdkNt32PpiLib.inf\r
+  EdkCompatibilityPkg/Sample/Platform/Nt32/Protocol/EdkNt32ProtocolLib.inf\r
 \r
-[Components.IA32,Components.X64]\r
-  EdkCompatibilityPkg\Foundation\Cpu\Pentium\CpuIA32Lib\CpuIA32Lib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiServicesTablePointerLibMm7\PeiServicesTablePointerLibMm7.inf\r
-  EdkCompatibilityPkg\Sample\Library\Dxe\WinNt\WinNtLib.inf\r
+  #\r
+  # Modules in Compatibility Directory\r
+  #\r
+  EdkCompatibilityPkg/Compatibility/DeviceIoToPciRootBridgeIoThunk/DeviceIoToPciRootBridgeIoThunk.inf\r
+  EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf\r
+  EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.inf\r
+  EdkCompatibilityPkg/Compatibility/FvToFv2Thunk/FvToFv2Thunk.inf\r
+  EdkCompatibilityPkg/Compatibility/Fv2ToFvThunk/Fv2ToFvThunk.inf\r
+  EdkCompatibilityPkg/Compatibility/PciCfg2ToPciCfgThunk/PciCfg2ToPciCfgThunk.inf\r
+  EdkCompatibilityPkg/Compatibility/PciCfgToPciCfg2Thunk/PciCfgToPciCfg2Thunk.inf\r
+  EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.inf\r
+  EdkCompatibilityPkg/Compatibility/ReadOnlyVariableToReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.inf\r
+  EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.inf\r
+  EdkCompatibilityPkg/Compatibility/UcToUc2Thunk/UcToUc2Thunk.inf\r
 \r
+[Components.IA32,Components.X64,Components.IPF]\r
+  EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf\r
+  \r
+[Components.IA32,Components.X64]\r
+  EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf\r
 \r
 [Components.IPF]\r
-  EdkCompatibilityPkg\Foundation\Cpu\Itanium\CpuIa64Lib\CpuIA64Lib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\EdkDxeSalLib\EdkDxeSalLib.inf\r
-  EdkCompatibilityPkg\Foundation\Library\EdkIIGlueLib\Library\PeiServicesTablePointerLibKr1\PeiServicesTablePointerLibKr1.inf\r
+  EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/EdkDxeSalLib.inf\r
+  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.inf\r
 \r