added absent files and fixed dependencies

Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>

.gitignore

@@ -1,4 +1,5 @@
 # OS X temporary files that should never be committed
+.vs
 .DS_Store
 *.swp
 *.lock

BaseTools/Bin/externals.txt

@@ -0,0 +1 @@
+Win32  https://svn.code.sf.net/p/edk2-toolbinaries/code/trunk/Win32

Clover.dsc

@@ -24,7 +24,7 @@
   SUPPORTED_ARCHITECTURES        = X64|IA32
   BUILD_TARGETS                  = RELEASE|DEBUG
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Clover/Clover.fdf
+  FLASH_DEFINITION               = Clover.fdf
 
   !ifndef OPENSSL_VERSION
     DEFINE OPENSSL_VERSION       = 1.0.1e
@@ -39,150 +39,150 @@
   #
   # Entry point
   #
-  PeimEntryPoint|Clover/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
+  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
-  DxeCoreEntryPoint|Clover/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
+  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
-  UefiDriverEntryPoint|Clover/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-  UefiApplicationEntryPoint|Clover/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
+  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   #
   # Basic
   #
-  BaseLib|Clover/MdePkg/Library/BaseLib/BaseLib.inf
+  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
-  SynchronizationLib|Clover/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
+  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
-  BaseMemoryLib|Clover/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
-  #BaseMemoryLib|Clover/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf
+  #BaseMemoryLib|MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf
-  #BaseMemoryLib|Clover/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
+  #BaseMemoryLib|MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
-  PrintLib|Clover/MdePkg/Library/BasePrintLib/BasePrintLib.inf
+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-  CpuLib|Clover/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
+  CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
-  IoLib|Clover/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
-  PciLib|Clover/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
+  PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
-  PciCf8Lib|Clover/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
+  PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
-  PciExpressLib|Clover/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
+  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
-  #PciLib|Clover/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
+  #PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
-  #PciExpressLib|Clover/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.inf
+  #PciExpressLib|MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.inf
-  CacheMaintenanceLib|Clover/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
+  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
-  #PeCoffLib|Clover/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+  #PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
-  PeCoffLib|Clover/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
+  PeCoffLib|Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
-  PeCoffExtraActionLib|Clover/MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
+  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
-  PeCoffGetEntryPointLib|Clover/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
+  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
-  CustomizedDisplayLib|Clover/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
+  CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
   #
   # UEFI & PI
   #
-  UefiBootServicesTableLib|Clover/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-  UefiRuntimeServicesTableLib|Clover/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-  UefiRuntimeLib|Clover/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
-  UefiLib|Clover/MdePkg/Library/UefiLib/UefiLib.inf
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
-  #UefiHiiServicesLib|Clover/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
+  #UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  UefiHiiServicesLib|Clover/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
+  UefiHiiServicesLib|Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  HiiLib|Clover/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
+  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
-  DevicePathLib|Clover/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-  UefiDecompressLib|Clover/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
+  UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
-  DxeServicesLib|Clover/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
+  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
-  DxeServicesTableLib|Clover/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiBootManagerLib|Clover/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   #EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
   #EblNetworkLib|EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf
   #EblCmdLib|EmbeddedPkg/Library/EblCmdLibNull/EblCmdLibNull.inf
-  FileHandleLib|Clover/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  SortLib|Clover/MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-  UefiCpuLib|Clover/CloverEFI/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+  UefiCpuLib|CloverEFI/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
 !ifdef ENABLE_SECURE_BOOT
-  OpensslLib|Clover/Library/OpensslLib/openssl-$(OPENSSL_VERSION)/OpensslLib.inf
+  OpensslLib|Library/OpensslLib/openssl-$(OPENSSL_VERSION)/OpensslLib.inf
-  IntrinsicLib|Clover/Library/IntrinsicLib/IntrinsicLib.inf
+  IntrinsicLib|Library/IntrinsicLib/IntrinsicLib.inf
 !else
-  OpensslLib|Clover/Library/OpensslLib/OpensslLibNull.inf
+  OpensslLib|Library/OpensslLib/OpensslLibNull.inf
 !endif
 
   #
   # Generic Modules
   #
-  UefiUsbLib|Clover/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
+  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-  UefiScsiLib|Clover/MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
+  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  OemHookStatusCodeLib|Clover/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
   #GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
-  GenericBdsLib|Clover/Library/GenericBdsLib/GenericBdsLib.inf
+  GenericBdsLib|Library/GenericBdsLib/GenericBdsLib.inf
-  SecurityManagementLib|Clover/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
+  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
-  CapsuleLib|Clover/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
-  #PeCoffExtraActionLib|Clover/MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
+  #PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
-  NetLib|Clover/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
   #
   # Platform
   #
   #PlatformBdsLib|DuetPkg/Library/DuetBdsLib/PlatformBds.inf
-  PlatformBdsLib|Clover/Library/OsxBdsPlatformLib/PlatformBds.inf
+  PlatformBdsLib|Library/OsxBdsPlatformLib/PlatformBds.inf
   #TimerLib|DuetPkg/Library/DuetTimerLib/DuetTimerLib.inf
-  TimerLib|Clover/Library/DuetTimerLib/DuetTimerLib.inf
+  TimerLib|Library/DuetTimerLib/DuetTimerLib.inf
   #
   # Misc
   #
-  PerformanceLib|Clover/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
+  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-  DebugAgentLib|Clover/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
+  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
-  PcdLib|Clover/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-#  PcdLib|Clover/MdePkg/Library/DxePcdLib/DxePcdLib.inf
+#  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  PeiServicesLib|Clover/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
+  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
-  MemoryAllocationLib|Clover/MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-  HobLib|Clover/MdePkg/Library/DxeHobLib/DxeHobLib.inf
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
-  LockBoxLib|Clover/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
+  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
-  CpuExceptionHandlerLib|Clover/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
+  CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
-  SmbusLib|Clover/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf
+  SmbusLib|MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf
-  S3BootScriptLib|Clover/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
+  S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
-  ExtractGuidedSectionLib|Clover/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
-  PlatformHookLib|Clover/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
+  PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
 
   #SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf
-  SerialPortLib|Clover/MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
+  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-  MtrrLib|Clover/CloverEFI/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
+  MtrrLib|CloverEFI/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
-  IoApicLib|Clover/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
+  IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
-  LocalApicLib|Clover/CloverEFI/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
+  LocalApicLib|CloverEFI/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
-  #LocalApicLib|Clover/CloverEFI/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
+  #LocalApicLib|CloverEFI/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
 
   #
   # To save size, use NULL library for DebugLib and ReportStatusCodeLib.
   # If need status code output, do library instance overriden as below DxeMain.inf does
   #
-  DebugLib|Clover/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  DebugPrintErrorLevelLib|Clover/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
+  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
-  ReportStatusCodeLib|Clover/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
 
-  TpmMeasurementLib|Clover/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
+  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
-  AuthVariableLib|Clover/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
+  AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
-  VarCheckLib|Clover/MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+  VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
 
   #
   # Our libs
   #
-  MemLogLib|Clover/Library/MemLogLibDefault/MemLogLibDefault.inf
+  MemLogLib|Library/MemLogLibDefault/MemLogLibDefault.inf
-  VideoBiosPatchLib|Clover/Library/VideoBiosPatchLib/VideoBiosPatchLib.inf
+  VideoBiosPatchLib|Library/VideoBiosPatchLib/VideoBiosPatchLib.inf
-  WaveLib|Clover/Library/WaveLib/WaveLib.inf
+  WaveLib|Library/WaveLib/WaveLib.inf
     
-  ShellLib|Clover/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
 !ifndef NO_CLOVER_SHELL
   #Shell
-  ShellCommandLib|Clover/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+  ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
-  ShellCEntryLib|Clover/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+  ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
-  HandleParsingLib|Clover/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+  HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
-  BcfgCommandLib|Clover/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
+  BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
 !endif
 
 [LibraryClasses.common.DXE_CORE]
-  HobLib|Clover/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
+  HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
-  BaseMemoryLib|Clover/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
-  MemoryAllocationLib|Clover/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
+  MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
 
 [LibraryClasses.common.PEIM]
-  MemoryAllocationLib|Clover/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
+  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-  HobLib|Clover/MdePkg/Library/PeiHobLib/PeiHobLib.inf
+  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  LockBoxLib|Clover/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
+  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
 
 [LibraryClasses.IA32.PEIM, LibraryClasses.X64.PEIM]
-  PeiServicesTablePointerLib|Clover/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
+  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
 
 [LibraryClasses.common.DXE_DRIVER]
-  MemoryAllocationLib|Clover/MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
 
 [LibraryClasses.common.DXE_SMM_DRIVER]
-  SmmServicesTableLib|Clover/MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
+  SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
-  MemoryAllocationLib|Clover/MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
+  MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
 
 
 
@@ -208,18 +208,18 @@
 	#DuetPkg/BootSector/BootSector.inf
 
   #DuetPkg/DxeIpl/DxeIpl.inf {
-  Clover/CloverEFI/OsxDxeIpl/DxeIpl.inf {
+  CloverEFI/OsxDxeIpl/DxeIpl.inf {
     <LibraryClasses>
       #
       # If no following overriden for ReportStatusCodeLib library class,
       # All other module can *not* output debug information even they are use not NULL library
       # instance for DebugLib and ReportStatusCodeLib
       #
-      #ReportStatusCodeLib|Clover/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
+      #ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
-      ReportStatusCodeLib|Clover/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+      ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
   }
- #Clover/MdeModulePkg/Core/Dxe/DxeMain.inf {
+ #MdeModulePkg/Core/Dxe/DxeMain.inf {
- Clover/CloverEFI/OsxDxeCore/DxeMain.inf {
+ CloverEFI/OsxDxeCore/DxeMain.inf {
     #
     # Enable debug output for DxeCore module, this is a sample for how to enable debug output
     # for a module. If need turn on debug output for other module, please copy following overriden
@@ -232,267 +232,267 @@
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042
       #0x80000042
     <LibraryClasses>
-      BaseMemoryLib|Clover/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+      BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
-      MemoryAllocationLib|Clover/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
+      MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
      # DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
      # ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf
-     DebugLib|Clover/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+     DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
- 	 ReportStatusCodeLib|Clover/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+ 	 ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
- 	 PeCoffLib|Clover/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
+ 	 PeCoffLib|Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
 
   }
 
-  Clover/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
-  Clover/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
-  Clover/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-  Clover/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
+  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
 
   #DuetPkg/FSVariable/FSVariable.inf
 !ifndef REAL_NVRAM
 !ifdef HAVE_LEGACY_EMURUNTIMEDXE
-  Clover/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
+  MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
 !else
-  Clover/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
     <PcdsFixedAtBuild>
       gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE
     <LibraryClasses>
-      AuthVariableLib|Clover/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
+      AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
-      TpmMeasurementLib|Clover/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
+      TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
-      VarCheckLib|Clover/MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+      VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
   }
 !endif
 !else
-  Clover/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
+  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-  Clover/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
     <LibraryClasses>
-      NULL|Clover/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
   }
 !endif
 
-  Clover/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  Clover/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
+  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
-  Clover/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
+  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
-  Clover/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-  Clover/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf {
+  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf {
     <LibraryClasses>
-      PcdLib|Clover/MdePkg/Library/DxePcdLib/DxePcdLib.inf
+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
     <PcdsPatchableInModule>
       gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
       gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
   }
-  Clover/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-  Clover/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
-  Clover/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
+  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
-  #Clover/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+  #MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
-  Clover/CloverEFI/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+  CloverEFI/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
-  #Clover/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
+  #MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-  Clover/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
-  Clover/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
   #DuetPkg/SmbiosGenDxe/SmbiosGen.inf
-  #Clover/OsxSmbiosDxe/SmbiosDxe.inf
+  #OsxSmbiosDxe/SmbiosDxe.inf
-  Clover/CloverEFI/OsxSmbiosGenDxe/SmbiosGen.inf
+  CloverEFI/OsxSmbiosGenDxe/SmbiosGen.inf
 
   #DuetPkg/EfiLdr/EfiLdr.inf {
-  Clover/CloverEFI/OsxEfiLdr/EfiLdr.inf {
+  CloverEFI/OsxEfiLdr/EfiLdr.inf {
     <LibraryClasses>
-      DebugLib|Clover/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-      BaseMemoryLib|Clover/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+      BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
 
       #NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
-      NULL|Clover/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+      NULL|Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
   }
   #IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf {
-  Clover/CloverEFI/OsxBdsDxe/BdsDxe.inf {
+  CloverEFI/OsxBdsDxe/BdsDxe.inf {
     <LibraryClasses>
-      PcdLib|Clover/MdePkg/Library/DxePcdLib/DxePcdLib.inf
+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
   }
-  Clover/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
+  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
-  Clover/CloverEFI/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
+  CloverEFI/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
   #UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
-  #Clover/UefiCpuPkg/CpuDxe/CpuDxe.inf
   #UefiCpuPkg/CpuDxe/CpuDxe.inf
-  Clover/CloverEFI/CpuDxe/Cpu.inf
+  #UefiCpuPkg/CpuDxe/CpuDxe.inf
-  Clover/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf {
+  CloverEFI/CpuDxe/Cpu.inf
+  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf {
       <PcdsFixedAtBuild>
       gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeMask|0xFFFC
   }
   #DuetPkg/AcpiResetDxe/Reset.inf
-  Clover/CloverEFI/AcpiReset/Reset.inf
+  CloverEFI/AcpiReset/Reset.inf
   #DuetPkg/LegacyMetronome/Metronome.inf
-  Clover/MdeModulePkg/Universal/Metronome/Metronome.inf
+  MdeModulePkg/Universal/Metronome/Metronome.inf
 # EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/MpServicesOnFrameworkMpServicesThunk.inf
 
   #Chipset
   #PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
-  Clover/CloverEFI/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
+  CloverEFI/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
-  Clover/PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
+  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
   #PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
   #PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
   #DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
-  Clover/CloverEFI/PciRootBridgeDxe/PciRootBridge.inf
+  CloverEFI/PciRootBridgeDxe/PciRootBridge.inf
   #DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
-  Clover/CloverEFI/OsxPciBusNoEnumerationDxe/PciBusNoEnumeration.inf
+  CloverEFI/OsxPciBusNoEnumerationDxe/PciBusNoEnumeration.inf
-  #Clover/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+  #MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
-  #Clover/PciBusDxe/PciBusDxe.inf
+  #PciBusDxe/PciBusDxe.inf
-  Clover/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
 
   #DataHub
-  #Clover/VBoxAppleSim/VBoxAppleSim.inf
+  #VBoxAppleSim/VBoxAppleSim.inf
   #IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
-  Clover/Protocols/DataHubDxe/DataHubDxe.inf
+  Protocols/DataHubDxe/DataHubDxe.inf
-  #Clover/Protocols/DataHubStdErrDxe/DataHubStdErrDxe.inf
+  #Protocols/DataHubStdErrDxe/DataHubStdErrDxe.inf
 
   # foreign file system support
-  Clover/Protocols/DriverOverride/DriverOverride.inf
+  Protocols/DriverOverride/DriverOverride.inf
-  Clover/FileSystems/VBoxFsDxe/VBoxHfs.inf
+  FileSystems/VBoxFsDxe/VBoxHfs.inf
-  Clover/FileSystems/VBoxFsDxe/VBoxIso9660.inf
+  FileSystems/VBoxFsDxe/VBoxIso9660.inf
-  #Clover/FileSystems/VBoxFsDxe/VBoxFsDxe.inf
+  #FileSystems/VBoxFsDxe/VBoxFsDxe.inf
-  Clover/FileSystems/VBoxFsDxe/VBoxExt2.inf
+  FileSystems/VBoxFsDxe/VBoxExt2.inf
-  Clover/FileSystems/VBoxFsDxe/VBoxExt4.inf
+  FileSystems/VBoxFsDxe/VBoxExt4.inf
-  Clover/FileSystems/VBoxFsDxe/VBoxReiserFS.inf
+  FileSystems/VBoxFsDxe/VBoxReiserFS.inf
   #EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
-  #Clover/OsxMmcDxe/MmcDxe.inf
+  #OsxMmcDxe/MmcDxe.inf
-  Clover/FileSystems/FatPkg/EnhancedFatDxe/Fat.inf
+  FileSystems/FatPkg/EnhancedFatDxe/Fat.inf
-  Clover/FileSystems/ApfsDriverLoader/ApfsDriverLoader.inf
+  FileSystems/ApfsDriverLoader/ApfsDriverLoader.inf
   # FS from grub
 !ifndef NO_GRUB_DRIVERS
-  Clover/FileSystems/GrubFS/src/EXFAT.inf
+  FileSystems/GrubFS/src/EXFAT.inf
-  Clover/FileSystems/GrubFS/src/HFSPLUS.inf
+  FileSystems/GrubFS/src/HFSPLUS.inf
-  Clover/FileSystems/GrubFS/src/ISO9660.inf
+  FileSystems/GrubFS/src/ISO9660.inf
-  Clover/FileSystems/GrubFS/src/NTFS.inf
+  FileSystems/GrubFS/src/NTFS.inf
-  Clover/FileSystems/GrubFS/src/UDF.inf
+  FileSystems/GrubFS/src/UDF.inf
-  #Clover/FileSystems/GrubFS/src/ZFS.inf
+  #FileSystems/GrubFS/src/ZFS.inf
-  #Clover/FileSystems/GrubFS/src/UFS.inf
+  #FileSystems/GrubFS/src/UFS.inf
-  #Clover/FileSystems/GrubFS/src/UFS2.inf
+  #FileSystems/GrubFS/src/UFS2.inf
-  #Clover/FileSystems/GrubFS/src/XFS.inf
+  #FileSystems/GrubFS/src/XFS.inf
 !endif
 
   #Video
   #IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
-  #Clover/VBoxVgaMiniPort/VgaMiniPortDxe.inf
+  #VBoxVgaMiniPort/VgaMiniPortDxe.inf
   #IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
-  #Clover/VgaClassDxe/VgaClassDxe.inf
+  #VgaClassDxe/VgaClassDxe.inf
-  #Clover/IntelGmaDxe/Gop.inf
+  #IntelGmaDxe/Gop.inf
   #DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
-  Clover/CloverEFI/BiosVideo/BiosVideo.inf
+  CloverEFI/BiosVideo/BiosVideo.inf
-  #Clover/BiosVideoAuto/BiosVideo.inf
+  #BiosVideoAuto/BiosVideo.inf
-  Clover/LegacyBios/VideoDxe/VideoDxe.inf
+  LegacyBios/VideoDxe/VideoDxe.inf
-  #Clover/LegacyBios/VideoDxe/VideoDxe2.inf
+  #LegacyBios/VideoDxe/VideoDxe2.inf
 
   # IDE/AHCI Support
 !ifdef USE_BIOS_BLOCKIO
-  Clover/LegacyBios/BlockIoDxe/BlockIoDxe.inf
+  LegacyBios/BlockIoDxe/BlockIoDxe.inf
 !else
-  #Clover/Trash/VBoxIdeControllerDxe/VBoxIdeControllerDxe.inf
+  #Trash/VBoxIdeControllerDxe/VBoxIdeControllerDxe.inf
-  #Clover/Trash/VBoxIdeBusDxe/VBoxIdeBusDxe.inf
+  #Trash/VBoxIdeBusDxe/VBoxIdeBusDxe.inf
   #DuetPkg/SataControllerDxe/SataControllerDxe.inf
-  Clover/Drivers/SataControllerDxe/SataControllerDxe.inf
+  Drivers/SataControllerDxe/SataControllerDxe.inf
-  #Clover/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
+  #MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
-  Clover/Drivers/AtaAtapi/AtaAtapiPassThru.inf
+  Drivers/AtaAtapi/AtaAtapiPassThru.inf
-  #Clover/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
+  #MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-  Clover/Drivers/AtaBus/AtaBusDxe.inf
+  Drivers/AtaBus/AtaBusDxe.inf
-  #Clover/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
+  #MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
-  Clover/Drivers/DVDBus/ScsiBusDxe.inf
+  Drivers/DVDBus/ScsiBusDxe.inf
-  #Clover/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
+  #MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-  Clover/Drivers/DVDDisk/ScsiDiskDxe.inf
+  Drivers/DVDDisk/ScsiDiskDxe.inf
   #IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
 !endif
 
   # Usb Support
-  Clover/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
+  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
-  Clover/Drivers/OhciDxe/OhciDxe.inf
+  Drivers/OhciDxe/OhciDxe.inf
-  Clover/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-#  Clover/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
+#  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
-  Clover/Drivers/XhciDxe/XhciDxe.inf
+  Drivers/XhciDxe/XhciDxe.inf
-#  Clover/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+#  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-  Clover/Drivers/UsbBusDxe/UsbBusDxe.inf
+  Drivers/UsbBusDxe/UsbBusDxe.inf
-#  Clover/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+#  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-  Clover/Drivers/UsbKbDxe/UsbKbDxe.inf
+  Drivers/UsbKbDxe/UsbKbDxe.inf
-  Clover/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-  Clover/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
-  #Clover/Drivers/UsbMouseDxe/UsbMouseDxe.inf
+  #Drivers/UsbMouseDxe/UsbMouseDxe.inf
 
   # ISA Support
-  Clover/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
+  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
-  Clover/Drivers/Isa/IsaBusDxe/IsaBusDxe.inf
+  Drivers/Isa/IsaBusDxe/IsaBusDxe.inf
   #IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
-  Clover/Drivers/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
+  Drivers/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
   #IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
-  Clover/Drivers/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
+  Drivers/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
   #IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
-  Clover/Drivers/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+  Drivers/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
 
   # ACPI Support
-  #Clover/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
+  #MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
-  Clover/CloverEFI/OsxAcpiTableDxe/AcpiTableDxe.inf
+  CloverEFI/OsxAcpiTableDxe/AcpiTableDxe.inf
-  #Clover/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
+  #MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
-  #Clover/CloverEFI/OsxAcpiPlatformDxe/AcpiPlatformDxe.inf
+  #CloverEFI/OsxAcpiPlatformDxe/AcpiPlatformDxe.inf
 
-  Clover/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
-  Clover/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf {
+  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf {
     <LibraryClasses>
-      PcdLib|Clover/MdePkg/Library/DxePcdLib/DxePcdLib.inf
+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
   }
-  #Clover/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+  #MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
-  Clover/Drivers/PartitionDxe/PartitionDxe.inf
+  Drivers/PartitionDxe/PartitionDxe.inf
 
   #FD
   #IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
-  #Clover/SaveResume/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
+  #SaveResume/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
-  #Clover/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
+  #MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
-  #Clover/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
+  #MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
-  #Clover/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
+  #MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
-  #Clover/SaveResume/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
+  #SaveResume/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
-  #Clover/CloverEFI/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+  #CloverEFI/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
 
   # Bios Thunk
   #IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf
   #IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
   #IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
   #IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf
-  Clover/CloverEFI/BiosKeyboard/KeyboardDxe.inf
+  CloverEFI/BiosKeyboard/KeyboardDxe.inf
   #IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf
-  #Clover/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
+  #MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
-  Clover/LegacyBios/Region2Dxe/LegacyRegion2Dxe.inf
+  LegacyBios/Region2Dxe/LegacyRegion2Dxe.inf
 
   # Misc
-  Clover/FSInject/FSInject.inf
+  FSInject/FSInject.inf
-  Clover/Protocols/MsgLog/MsgLog.inf
+  Protocols/MsgLog/MsgLog.inf
-  Clover/Protocols/SMCHelper/SMCHelper.inf
+  Protocols/SMCHelper/SMCHelper.inf
-  Clover/Protocols/FirmwareVolume/FirmwareVolume.inf
+  Protocols/FirmwareVolume/FirmwareVolume.inf
-  Clover/Protocols/AppleImageCodec/AppleImageCodec.inf
+  Protocols/AppleImageCodec/AppleImageCodec.inf
-  Clover/Protocols/AppleUITheme/AppleUITheme.inf
+  Protocols/AppleUITheme/AppleUITheme.inf
-  Clover/Protocols/HashServiceFix/HashServiceFix.inf
+  Protocols/HashServiceFix/HashServiceFix.inf
-  Clover/Protocols/AppleKeyAggregator/AppleKeyAggregator.inf
+  Protocols/AppleKeyAggregator/AppleKeyAggregator.inf
-  Clover/Protocols/AppleKeyFeeder/AppleKeyFeeder.inf
+  Protocols/AppleKeyFeeder/AppleKeyFeeder.inf
   
 
 !ifdef DEBUG_ON_SERIAL_PORT
 
-  Clover/Protocols/DumpUefiCalls/DumpUefiCalls.inf {
+  Protocols/DumpUefiCalls/DumpUefiCalls.inf {
     <PcdsFixedAtBuild>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x07
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xFFFFFFFF
     <LibraryClasses>
-      DebugLib|Clover/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
+      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-      SerialPortLib|Clover/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
+      SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
   }
 
 !else
 
-  Clover/Protocols/DumpUefiCalls/DumpUefiCalls.inf {
+  Protocols/DumpUefiCalls/DumpUefiCalls.inf {
   	<LibraryClasses>
-  		PeCoffLib|Clover/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
+  		PeCoffLib|Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
   }
 
 
 !endif
 
   # Drivers for Aptio loading - should go to Clover's /EFI/drivers64UEFI dir
-  Clover/Protocols/OsxFatBinaryDrv/OsxFatBinaryDrv.inf
+  Protocols/OsxFatBinaryDrv/OsxFatBinaryDrv.inf
 
   # Drivers for Phoenix UEFI loading - should go to Clover's /EFI/drivers64UEFI dir
-  Clover/Protocols/EmuVariableUefi/EmuVariableRuntimeDxe.inf {
+  Protocols/EmuVariableUefi/EmuVariableRuntimeDxe.inf {
     <PcdsFixedAtBuild>
       gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
       gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x3000
@@ -503,23 +503,23 @@
   }
 
   # Driver Audio
-  Clover/Drivers/AudioDxe/AudioDxe.inf
+  Drivers/AudioDxe/AudioDxe.inf
 
   #
   # Sample Application
   #
-  #Clover/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
+  #MdeModulePkg/Application/HelloWorld/HelloWorld.inf
-  #Clover/MdeModulePkg/Application/VariableInfo/VariableInfo.inf
+  #MdeModulePkg/Application/VariableInfo/VariableInfo.inf
-  #Clover/Sample/Application/Sample.inf
+  #Sample/Application/Sample.inf
-  #Clover/gptsync/gptsync.inf
+  #gptsync/gptsync.inf
-  Clover/bdmesg_efi/bdmesg.inf
+  bdmesg_efi/bdmesg.inf
   
 !ifndef NO_CLOVER_SHELL
-  Clover/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+  ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
-  Clover/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+  ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
 
   
-  Clover/ShellPkg/Application/Shell/Shell.inf {
+  ShellPkg/Application/Shell/Shell.inf {
     <PcdsFixedAtBuild>
 	  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
 	  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
@@ -529,23 +529,23 @@
 	!endif #$(NO_SHELL_PROFILES)
 
     <LibraryClasses>
-      PcdLib|Clover/MdePkg/Library/DxePcdLib/DxePcdLib.inf
+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-      PeCoffGetEntryPointLib|Clover/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
+      PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
-      UefiHiiServicesLib|Clover/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
+      UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-      NULL|Clover/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
-      NULL|Clover/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
-      NULL|Clover/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
 !ifndef $(NO_SHELL_PROFILES)
-      NULL|Clover/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
-      NULL|Clover/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
-      NULL|Clover/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
-      NULL|Clover/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
-      NULL|Clover/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
 !ifdef $(INCLUDE_DP)
-      NULL|Clover/ShellPkg/Library/UefiDpLib/UefiDpLib.inf
+      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf
 !endif #$(INCLUDE_DP)
 !ifdef $(INCLUDE_TFTP_COMMAND)
-      NULL|Clover/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
+      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 !endif #$(NO_SHELL_PROFILES)
   }
@@ -553,7 +553,7 @@
 
 
 !ifdef DEBUG_ON_SERIAL_PORT
-	Clover/rEFIt_UEFI/refit.inf {
+	rEFIt_UEFI/refit.inf {
 	#
      # Enable debug output.
      #
@@ -561,24 +561,24 @@
 		gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x07
 		gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xFFFFFFFF
 	<LibraryClasses>
-		SerialPortLib|Clover/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
+		SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-		DebugLib|Clover/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
+		DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-	DebugPrintErrorLevelLib|Clover/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
+	DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
 	}
 !else
-	Clover/rEFIt_UEFI/refit.inf {
+	rEFIt_UEFI/refit.inf {
     <LibraryClasses>
-      BaseMemoryLib|Clover/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf
+      BaseMemoryLib|MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf
   }
 !endif
 
 [Components.X64]
 
-  Clover/OsxAptioFixDrv/OsxAptioFixDrv.inf
+  OsxAptioFixDrv/OsxAptioFixDrv.inf
-#  Clover/OsxAptioFixDrv/OsxAptioFix2Drv.inf
+#  OsxAptioFixDrv/OsxAptioFix2Drv.inf
-  Clover/OsxAptioFixDrv/OsxAptioFix3Drv.inf
+  OsxAptioFixDrv/OsxAptioFix3Drv.inf
-  Clover/OsxLowMemFixDrv/OsxLowMemFixDrv.inf
+  OsxLowMemFixDrv/OsxLowMemFixDrv.inf
-  #Clover/OsxAptioFixDrv/OsxAptioFixDrv.inf {
+  #OsxAptioFixDrv/OsxAptioFixDrv.inf {
     #
     # Enable debug output.
     #
@@ -586,9 +586,9 @@
    #   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x07
    #   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xFFFFFFFF
    # <LibraryClasses>
-   #   SerialPortLib|Clover/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
+   #   SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-   #   DebugLib|Clover/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
+   #   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-   #   DebugPrintErrorLevelLib|Clover/MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
+   #   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
   #}
 
 ###################################################################################################

Clover.fdf

@@ -62,145 +62,145 @@ READ_LOCK_STATUS   = TRUE
 #  }
 
 APRIORI DXE {
-  INF  Clover/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
-  INF  Clover/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
+  INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
-  INF  Clover/Protocols/MsgLog/MsgLog.inf
+  INF  Protocols/MsgLog/MsgLog.inf
 }
 
-INF  Clover/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
-INF  Clover/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
-INF  Clover/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-INF  Clover/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
+INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
 
 #INF  DuetPkg/FSVariable/FSVariable.inf
 !ifdef REAL_NVRAM
-  INF Clover/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
+  INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-  INF Clover/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 !else
 !ifdef HAVE_LEGACY_EMURUNTIMEDXE
-  INF  Clover/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
+  INF  MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
 !else
-  INF Clover/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 !endif
 !endif
 
-INF  Clover/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-INF  Clover/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
+INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
-INF  Clover/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
+INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
-INF  Clover/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-INF  Clover/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+INF  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-INF  Clover/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-INF  Clover/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
-INF  Clover/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
+INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
 
 #INF  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
-INF  Clover/CloverEFI/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+INF  CloverEFI/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
 #INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-INF  Clover/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 #INF  DuetPkg/SmbiosGenDxe/SmbiosGen.inf
-#INF  Clover/OsxSmbiosDxe/SmbiosDxe.inf
+#INF  OsxSmbiosDxe/SmbiosDxe.inf
-INF  Clover/CloverEFI/OsxSmbiosGenDxe/SmbiosGen.inf
+INF  CloverEFI/OsxSmbiosGenDxe/SmbiosGen.inf
 #INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
-INF  Clover/CloverEFI/OsxBdsDxe/BdsDxe.inf
+INF  CloverEFI/OsxBdsDxe/BdsDxe.inf
-INF  Clover/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
+INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
-INF  Clover/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
-INF  Clover/CloverEFI/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
+INF  CloverEFI/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
-#INF  Clover/UefiCpuPkg/CpuDxe/CpuDxe.inf
+#INF  UefiCpuPkg/CpuDxe/CpuDxe.inf
 
 #INF  IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf
-INF  Clover/CloverEFI/CpuDxe/Cpu.inf
+INF  CloverEFI/CpuDxe/Cpu.inf
 !ifndef CLANG
 #INF  UefiCpuPkg/CpuDxe/CpuDxe.inf
 !else
-#INF  RuleOverride=BINARY Clover/CpuDxeBin/CpuDxeBin.inf
+#INF  RuleOverride=BINARY CpuDxeBin/CpuDxeBin.inf
 !endif
 
     # DataHub
-#INF  Clover/VBoxAppleSim/VBoxAppleSim.inf
+#INF  VBoxAppleSim/VBoxAppleSim.inf
-INF Clover/Protocols/DataHubDxe/DataHubDxe.inf
+INF Protocols/DataHubDxe/DataHubDxe.inf
-#INF Clover/Protocols/DataHubStdErrDxe/DataHubStdErrDxe.inf
+#INF Protocols/DataHubStdErrDxe/DataHubStdErrDxe.inf
 #INF EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/PiSmbiosRecordOnDataHubSmbiosRecordThunk.inf
 	# foreign file system support
-INF  Clover/Protocols/DriverOverride/DriverOverride.inf	
+INF  Protocols/DriverOverride/DriverOverride.inf	
 !ifndef NO_GRUB_DRIVERS_EMBEDDED
 !ifndef NO_GRUB_DRIVERS
-INF  Clover/FileSystems/GrubFS/src/EXFAT.inf	
+INF  FileSystems/GrubFS/src/EXFAT.inf	
-#INF  Clover/FileSystems/GrubFS/src/NTFS.inf
+#INF  FileSystems/GrubFS/src/NTFS.inf
 !endif
 !endif
-#INF  Clover/FileSystems/VBoxFsDxe/VBoxFsDxe.inf
+#INF  FileSystems/VBoxFsDxe/VBoxFsDxe.inf
-#INF  Clover/FileSystems/VBoxFsDxe/VBoxIso9660.inf
+#INF  FileSystems/VBoxFsDxe/VBoxIso9660.inf
-#INF  Clover/FileSystems/VBoxFsDxe/VBoxExt2.inf
+#INF  FileSystems/VBoxFsDxe/VBoxExt2.inf
-#INF  Clover/FileSystems/VBoxFsDxe/VBoxExt4.inf
+#INF  FileSystems/VBoxFsDxe/VBoxExt4.inf
-#INF  Clover/FileSystems/VBoxFsDxe/VBoxReiserFS.inf
+#INF  FileSystems/VBoxFsDxe/VBoxReiserFS.inf
 !if $(USE_APPLE_HFSPLUS_DRIVER) AND ( $(ARCH) == X64 )
-INF  RuleOverride=BINARY Clover/FileSystems/HFSPlus/HFSPlus.inf
+INF  RuleOverride=BINARY FileSystems/HFSPlus/HFSPlus.inf
 !else
-INF  Clover/FileSystems/VBoxFsDxe/VBoxHfs.inf
+INF  FileSystems/VBoxFsDxe/VBoxHfs.inf
 !endif
 
-INF  Clover/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
+INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
 #INF  DuetPkg/AcpiResetDxe/Reset.inf
-INF  Clover/CloverEFI/AcpiReset/Reset.inf
+INF  CloverEFI/AcpiReset/Reset.inf
 #INF  DuetPkg/LegacyMetronome/Metronome.inf
-INF  Clover/MdeModulePkg/Universal/Metronome/Metronome.inf
+INF  MdeModulePkg/Universal/Metronome/Metronome.inf
-INF  Clover/PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
+INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
 #INF  PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
 #INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
-INF Clover/CloverEFI/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
+INF CloverEFI/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
 #INF  PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
 #INF  DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
-INF  Clover/CloverEFI/PciRootBridgeDxe/PciRootBridge.inf
+INF  CloverEFI/PciRootBridgeDxe/PciRootBridge.inf
 #INF  DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
-INF  Clover/CloverEFI/OsxPciBusNoEnumerationDxe/PciBusNoEnumeration.inf
+INF  CloverEFI/OsxPciBusNoEnumerationDxe/PciBusNoEnumeration.inf
 #INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
-#INF  Clover/CloverEFI/PciBusDxe/PciBusDxe.inf
+#INF  CloverEFI/PciBusDxe/PciBusDxe.inf
 
     # Video
 #INF  IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
-#INF  Clover/VBoxVgaMiniPort/VgaMiniPortDxe.inf
+#INF  VBoxVgaMiniPort/VgaMiniPortDxe.inf
 #INF  IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
-#INF  Clover/VgaClassDxe/VgaClassDxe.inf
+#INF  VgaClassDxe/VgaClassDxe.inf
 #INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
-INF  Clover/CloverEFI/BiosVideo/BiosVideo.inf
+INF  CloverEFI/BiosVideo/BiosVideo.inf
-#INF  Clover/BiosVideoAuto/BiosVideo.inf
+#INF  BiosVideoAuto/BiosVideo.inf
-#INF  Clover/IntelGmaDxe/Gop.inf
+#INF  IntelGmaDxe/Gop.inf
-#INF  Clover/LegacyBios/VideoDxe/VideoDxe.inf
+#INF  LegacyBios/VideoDxe/VideoDxe.inf
 
     # BIOS CSM
 #INF  IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
 #INF  IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
 #INF  IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf
-INF  Clover/CloverEFI/BiosKeyboard/KeyboardDxe.inf
+INF  CloverEFI/BiosKeyboard/KeyboardDxe.inf
 #INF  IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf
 #INF  MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
-#INF  Clover/LegacyBios/RegionDxe/LegacyRegion2Dxe.inf
+#INF  LegacyBios/RegionDxe/LegacyRegion2Dxe.inf
-INF   Clover/LegacyBios/Region2Dxe/LegacyRegion2Dxe.inf
+INF   LegacyBios/Region2Dxe/LegacyRegion2Dxe.inf
 #INF  IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf
 
     # IDE/AHCI Support
 !ifdef USE_BIOS_BLOCKIO
-  INF  Clover/LegacyBios/BlockIoDxe/BlockIoDxe.inf
+  INF  LegacyBios/BlockIoDxe/BlockIoDxe.inf
 !ifdef DISABLE_USB_CONTROLLERS_WHEN_BLOCKIO
   DEFINE DISABLE_USB_CONTROLLERS = 1
 !endif
 
 !else
 !ifdef USE_ION
-	INF  RuleOverride=BINARY Clover/ION/ION.inf
+	INF  RuleOverride=BINARY ION/ION.inf
 !else
-  #INF  Clover/VBoxIdeControllerDxe/VBoxIdeControllerDxe.inf
+  #INF  VBoxIdeControllerDxe/VBoxIdeControllerDxe.inf
-  #INF  Clover/VBoxIdeBusDxe/VBoxIdeBusDxe.inf
+  #INF  VBoxIdeBusDxe/VBoxIdeBusDxe.inf
   #INF  DuetPkg/SataControllerDxe/SataControllerDxe.inf
-  INF  Clover/Drivers/SataControllerDxe/SataControllerDxe.inf
+  INF  Drivers/SataControllerDxe/SataControllerDxe.inf
   #INF  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
-  INF  Clover/Drivers/AtaAtapi/AtaAtapiPassThru.inf
+  INF  Drivers/AtaAtapi/AtaAtapiPassThru.inf
   #INF  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-  INF  Clover/Drivers/AtaBus/AtaBusDxe.inf
+  INF  Drivers/AtaBus/AtaBusDxe.inf
   #INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
-  INF  Clover/Drivers/DVDBus/ScsiBusDxe.inf
+  INF  Drivers/DVDBus/ScsiBusDxe.inf
   #INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-  INF  Clover/Drivers/DVDDisk/ScsiDiskDxe.inf
+  INF  Drivers/DVDDisk/ScsiDiskDxe.inf
   #INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
 !endif  
 !endif
@@ -209,67 +209,67 @@ INF   Clover/LegacyBios/Region2Dxe/LegacyRegion2Dxe.inf
 !ifndef DISABLE_USB_SUPPORT
 
 !ifndef DISABLE_USB_CONTROLLERS
-  INF  Clover/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
+  INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
 !ifndef DISABLE_USB_MASS_STORAGE
-  INF  Clover/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+  INF  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
 !endif
 !endif
 
 !ifdef ENABLE_USB_OHCI
-  INF  Clover/Drivers/OhciDxe/OhciDxe.inf
+  INF  Drivers/OhciDxe/OhciDxe.inf
 !endif
 !ifdef ENABLE_USB_XHCI
-  #INF  Clover/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
+  #INF  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
-  INF  Clover/Drivers/XhciDxe/XhciDxe.inf
+  INF  Drivers/XhciDxe/XhciDxe.inf
 !endif
 
-  #INF  Clover/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  #INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-  INF  Clover/Drivers/UsbBusDxe/UsbBusDxe.inf
+  INF  Drivers/UsbBusDxe/UsbBusDxe.inf
-  #INF  Clover/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+  #INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-  INF  Clover/Drivers/UsbKbDxe/UsbKbDxe.inf
+  INF  Drivers/UsbKbDxe/UsbKbDxe.inf
-  INF  Clover/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  INF  MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
 !ifndef DISABLE_USB_MASS_STORAGE  
-  INF  Clover/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+  INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 !endif  
 
 !endif
 
     # ISA Support
-INF  Clover/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
+INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
-INF  Clover/Drivers/Isa/IsaBusDxe/IsaBusDxe.inf
+INF  Drivers/Isa/IsaBusDxe/IsaBusDxe.inf
-#INF  Clover/Drivers/Isa/IsaSerialDxe/IsaSerialDxe.inf
+#INF  Drivers/Isa/IsaSerialDxe/IsaSerialDxe.inf
-#INF  Clover/Drivers/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
+#INF  Drivers/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
-#INF  Clover/Drivers/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
+#INF  Drivers/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
 
-INF  Clover/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
-INF  Clover/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 #INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
-INF  Clover/Drivers/PartitionDxe/PartitionDxe.inf
+INF  Drivers/PartitionDxe/PartitionDxe.inf
 
     # ACPI Support
 #INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
-INF  Clover/CloverEFI/OsxAcpiTableDxe/AcpiTableDxe.inf
+INF  CloverEFI/OsxAcpiTableDxe/AcpiTableDxe.inf
 #INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
-#INF  Clover/CloverEFI/OsxAcpiPlatformDxe/AcpiPlatformDxe.inf
+#INF  CloverEFI/OsxAcpiPlatformDxe/AcpiPlatformDxe.inf
 
     # FD
 #INF  IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
-#INF  Clover/SaveResume/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
+#INF  SaveResume/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
 #INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
 #INF  MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
 #INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
-#INF  Clover/SaveResume/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
+#INF  SaveResume/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 #INF  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
 
     # Misc
-INF  Clover/Protocols/MsgLog/MsgLog.inf
+INF  Protocols/MsgLog/MsgLog.inf
 
     # Binary INF file to support toggle among different CPU architectures.
 #INF  RuleOverride=BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
-INF  Clover/FileSystems/FatPkg/EnhancedFatDxe/Fat.inf
+INF  FileSystems/FatPkg/EnhancedFatDxe/Fat.inf
 
 #FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
-#	SECTION RAW = Clover/Logo/Logo.bmp
+#	SECTION RAW = Logo/Logo.bmp
 #  }
 
 [Rule.Common.SEC]

CloverEFI/AcpiReset/Reset.inf

@@ -22,7 +22,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 
 [LibraryClasses]
   DebugLib

CloverEFI/BiosKeyboard/KeyboardDxe.inf

@@ -46,7 +46,7 @@
 
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec

CloverEFI/BiosVideo/BiosVideo.inf

@@ -26,7 +26,7 @@
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 #  DuetPkg/DuetPkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 
 [LibraryClasses]
   UefiLib

CloverEFI/CpuDxe/Cpu.inf

@@ -26,7 +26,7 @@
   ENTRY_POINT                    = InitializeCpu
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
 

CloverEFI/OsxAcpiPlatformDxe/AcpiPlatformDxe.inf

@@ -30,7 +30,7 @@
   AcpiPlatform.c
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
 

CloverEFI/OsxBdsDxe/BdsDxe.inf

@@ -88,7 +88,7 @@
 
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec

CloverEFI/OsxDxeIpl/DxeIpl.inf

@@ -24,7 +24,7 @@
   VERSION_STRING                 = 1.0
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec

CloverEFI/OsxEfiLdr/EfiLdr.inf

@@ -24,7 +24,7 @@
   VERSION_STRING                 = 1.0
 
 [Packages]
-	Clover/CloverPkg.dec
+	CloverPkg.dec
   MdePkg/MdePkg.dec
 #  MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

CloverEFI/OsxPciBusNoEnumerationDxe/PciBusNoEnumeration.inf

@@ -25,7 +25,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 
 [LibraryClasses]
   DebugLib

CloverEFI/OsxSmbiosGenDxe/SmbiosGen.inf

@@ -28,7 +28,7 @@
   ENTRY_POINT                    = SmbiosGenEntrypoint
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec

CloverEFI/PciRootBridgeDxe/PciRootBridge.inf

@@ -27,7 +27,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 
 [LibraryClasses]
   UefiDriverEntryPoint

Drivers/AudioDxe/AudioDxe.inf

@@ -31,7 +31,7 @@
     VERSION_STRING = 1.0
 
 [Packages]
-    Clover/CloverPkg.dec
+    CloverPkg.dec
     MdePkg/MdePkg.dec
 
 [LibraryClasses]

Drivers/Isa/IsaBusDxe/IsaBusDxe.inf

@@ -42,6 +42,7 @@
   ComponentName.h
 
 [Packages]
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

Drivers/Isa/Ps2MouseDxe/Ps2MouseDxe.inf

@@ -38,7 +38,7 @@
   Ps2Mouse.c
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec

Drivers/PartitionDxe/PartitionDxe.inf

@@ -51,7 +51,7 @@
   Partition.h
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
 
 

Drivers/UsbBusDxe/UsbBusDxe.inf

@@ -49,7 +49,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 
 
 [LibraryClasses]

Drivers/UsbKbDxe/UsbKbDxe.inf

@@ -55,7 +55,7 @@
   KeyBoard.h
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
 

Drivers/UsbMouseDxe/UsbMouseDxe.inf

@@ -49,7 +49,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-    Clover/CloverPkg.dec
+    CloverPkg.dec
 
 [LibraryClasses]
   MemoryAllocationLib

Drivers/XhciDxe/XhciDxe.inf

@@ -50,7 +50,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 
 [LibraryClasses]
   MemoryAllocationLib

FSInject/FSInject.dec

@@ -11,7 +11,7 @@
   PACKAGE_VERSION = 0.1
 
 [Includes]
-  ../Include
+#  ../Include
   Include
 
 [Protocols]

FSInject/FSInject.inf

@@ -23,7 +23,7 @@
   ENTRY_POINT                    = FSInjectEntrypoint
 
 [Packages]
-  Clover/FSInject/FSInject.dec
+  FSInject/FSInject.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
 

FileSystems/ApfsDriverLoader/ApfsDriverLoader.inf

@@ -31,7 +31,7 @@
   EfiComponentName.h
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 #  AppleSupportPkg/AppleSupportPkg.dec
   MdePkg/MdePkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

FileSystems/GrubFS/src/AFFS.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec	
+        CloverPkg.dec	
         Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/AFS.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/BFS.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/BTRFS.inf

@@ -37,9 +37,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/CBFS.inf

@@ -36,9 +36,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/CPIO.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/CPIO_BE.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/EXFAT.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
         Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/EXT2.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/FAT.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/HFS.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/HFSPLUS.inf

@@ -36,9 +36,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
         Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/ISO9660.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/JFS.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/MINIX.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/MINIX2.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/MINIX2_BE.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/MINIX3.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/MINIX3_BE.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/MINIX_BE.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/NEWC.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/NILFS2.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/NTFS.inf

@@ -36,9 +36,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/ODC.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/PROC.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/REISERFS.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/ROMFS.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/SFS.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/SQUASH4.inf

@@ -42,9 +42,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/TAR.inf

@@ -35,9 +35,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/UDF.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/UFS.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/UFS2.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/UFS_BE.inf

@@ -33,9 +33,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/XFS.inf

@@ -34,9 +34,9 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        Clover/ShellPkg/ShellPkg.dec
+        ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec
 
 [LibraryClasses]

FileSystems/GrubFS/src/ZFS.inf

@@ -46,9 +46,9 @@
 
 [Packages]
       MdePkg/MdePkg.dec
-      Clover/ShellPkg/ShellPkg.dec
+      ShellPkg/ShellPkg.dec
       IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-      Clover/CloverPkg.dec
+      CloverPkg.dec
       Clover/FileSystems/GrubFS/efifs.dec
 
 

FileSystems/VBoxFsDxe/VBoxExt2.inf

@@ -42,7 +42,7 @@
 [Packages]
    MdePkg/MdePkg.dec
    IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-   Clover/CloverPkg.dec
+   CloverPkg.dec
 #  VBoxPkg/VBoxPkg.dec
 
 [LibraryClasses]

FileSystems/VBoxFsDxe/VBoxExt4.inf

@@ -42,7 +42,7 @@
 [Packages]
    MdePkg/MdePkg.dec
    IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-   Clover/CloverPkg.dec
+   CloverPkg.dec
 #  VBoxPkg/VBoxPkg.dec
 
 [LibraryClasses]

FileSystems/VBoxFsDxe/VBoxHfs.inf

@@ -44,7 +44,7 @@
 [Packages]
         MdePkg/MdePkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 #        VBoxPkg/VBoxPkg.dec
 
 [LibraryClasses]

FileSystems/VBoxFsDxe/VBoxIso9660.inf

@@ -39,7 +39,7 @@
         VBoxFswParam.h
 
 [Packages]
-    Clover/CloverPkg.dec
+    CloverPkg.dec
         MdePkg/MdePkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 #        VBoxPkg/VBoxPkg.dec

FileSystems/VBoxFsDxe/VBoxReiserFS.inf

@@ -44,7 +44,7 @@
 [Packages]
         MdePkg/MdePkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-        Clover/CloverPkg.dec
+        CloverPkg.dec
 #        VBoxPkg/VBoxPkg.dec
 
 [LibraryClasses]

IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

@@ -0,0 +1,251 @@
+## @file
+# Intel Framework Module Package.
+#
+# This package contains the definitions and module implementation
+# which follows Intel EFI Framework Specification.
+#
+# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+#
+# This program and the accompanying materials
+# are licensed and made available under the terms and conditions of the BSD License
+# which accompanies this distribution. The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+##
+
+[Defines]
+  DEC_SPECIFICATION              = 0x00010005
+  PACKAGE_NAME                   = IntelFrameworkModulePkg
+  PACKAGE_UNI_FILE               = IntelFrameworkModulePkg.uni
+  PACKAGE_GUID                   = 88894582-7553-4822-B484-624E24B6DECF
+  PACKAGE_VERSION                = 0.96
+
+[Includes]
+  Include                        # Root include for the package
+
+[LibraryClasses]
+  ##  @libraryclass  Platform BDS library definition about platform specific behavior.
+  PlatformBdsLib|Include/Library/PlatformBdsLib.h
+
+  ##  @libraryclass  Generic BDS library definition, include the data structure and function.
+  GenericBdsLib|Include/Library/GenericBdsLib.h
+
+[Guids]
+  ## IntelFrameworkModule package token space guid
+  #  Include/Guid/IntelFrameworkModulePkgTokenSpace.h
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }}
+
+  ## GUID identifies Data Hub records logged by Status Code Runtime Protocol.
+  #  Include/Guid/DataHubStatusCodeRecord.h
+  gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}
+
+  ## GUID indicates the tiano custom compress/decompress algorithm.
+  #  Include/Guid/TianoDecompress.h
+  gTianoCustomDecompressGuid     = { 0xA31280AD, 0x481E, 0x41B6, { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47, 0x79 }}
+
+  ## Include/Guid/AcpiVariable.h
+  gEfiAcpiVariableCompatiblityGuid   = { 0xc020489e, 0x6db2, 0x4ef2, { 0x9a, 0xa5, 0xca, 0x6,  0xfc, 0x11, 0xd3, 0x6a }}
+
+  ## Include/Guid/LegacyBios.h
+  gEfiLegacyBiosGuid                 = { 0x2E3044AC, 0x879F, 0x490F, { 0x97, 0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50 }}
+  
+  ## Include/Guid/LegacyDevOrder.h
+  gEfiLegacyDevOrderVariableGuid     = { 0xa56074db, 0x65fe, 0x45f7, {0xbd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52 }}
+
+  ## Include/Guid/CapsuleDataFile.h
+  gEfiUpdateDataFileGuid             = { 0x283fa2ee, 0x532c, 0x484d, { 0x93, 0x83, 0x9f, 0x93, 0xb3, 0x6f, 0xb, 0x7e }}
+  
+  ## Include/Guid/BlockIoVendor.h
+  gBlockIoVendorGuid                 = { 0xcf31fac5, 0xc24e, 0x11d2,  {0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b }}
+  
+  ## Include/Guid/BdsHii.h
+  gFrontPageFormSetGuid              = { 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }}
+  gBootManagerFormSetGuid            = { 0x847bc3fe, 0xb974, 0x446d, {0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b }}
+  gDeviceManagerFormSetGuid          = { 0x3ebfa8e6, 0x511d, 0x4b5b, {0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27 }}
+  gDriverHealthFormSetGuid           = { 0xf76e0a70, 0xb5ed, 0x4c38, {0xac, 0x9a, 0xe5, 0xf5, 0x4b, 0xf1, 0x6e, 0x34 }}
+  gBootMaintFormSetGuid              = { 0x642237c7, 0x35d4, 0x472d, {0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22 }}
+  gFileExploreFormSetGuid            = { 0x1f2d63e1, 0xfebd, 0x4dc7, {0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b }}
+  
+  ## Include/Guid/BdsLibHii.h
+  gBdsLibStringPackageGuid           = { 0x3b4d9b23, 0x95ac, 0x44f6, {0x9f, 0xcd, 0xe, 0x95, 0x94, 0x58, 0x6c, 0x72 }}
+  
+  ## Include/Guid/LastEnumLang.h
+  gLastEnumLangGuid                  = { 0xe8c545b, 0xa2ee, 0x470d, {0x8e, 0x26, 0xbd, 0xa1, 0xa1, 0x3c, 0xa, 0xa3 }}
+
+  ## Include/Guid/HdBootVariable.h
+  gHdBootDevicePathVariablGuid       = { 0xfab7e9e1, 0x39dd, 0x4f2b, {0x84, 0x8, 0xe2, 0xe, 0x90, 0x6c, 0xb6, 0xde }}
+
+[Protocols]
+  ## Vga Mini port binding for a VGA controller
+  #  Include/Protocol/VgaMiniPort.h
+  gEfiVgaMiniPortProtocolGuid    = { 0xc7735a2f, 0x88f5, 0x4882, { 0xae, 0x63, 0xfa, 0xac, 0x8c, 0x8b, 0x86, 0xb3 }}
+
+  ## ISA I/O Protocol is used to perform ISA device Io/Mem operations.
+  #  Include/Protocol/IsaIo.h
+  gEfiIsaIoProtocolGuid          = { 0x7ee2bd44, 0x3da0, 0x11d4, { 0x9a, 0x38, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
+
+  ## ISA Acpi Protocol is used to operate and communicate with ISA device.
+  #  Include/Protocol/IsaAcpi.h
+  gEfiIsaAcpiProtocolGuid        = { 0x64a892dc, 0x5561, 0x4536, { 0x92, 0xc7, 0x79, 0x9b, 0xfc, 0x18, 0x33, 0x55 }}
+
+  ## OEM Badging Protocol defines the interface to get the OEM badging image with the dispaly attribute.
+  #  Include/Protocol/OEMBadging.h
+  gEfiOEMBadgingProtocolGuid     = { 0x170E13C0, 0xBF1B, 0x4218, { 0x87, 0x1D, 0x2A, 0xBD, 0xC6, 0xF8, 0x87, 0xBC }}
+
+  ## Include/Protocol/ExitPmAuth.h
+  gExitPmAuthProtocolGuid        = { 0xd088a413, 0xa70, 0x4217, { 0xba, 0x55, 0x9a, 0x3c, 0xb6, 0x5c, 0x41, 0xb3 }}
+
+#
+# [Error.gEfiIntelFrameworkModulePkgTokenSpaceGuid]
+#   0x80000001 | Invalid value provided.
+#   0x80000002 | Reserved bits must be set to zero.
+#
+
+[PcdsFeatureFlag]
+  ## Indicates if OEM device is enabled as StatusCode report device.
+  #  It is only used in Framework StatusCode implementation. <BR><BR>
+  #   TRUE  - Enable OEM device.<BR>
+  #   FALSE - Disable OEM device.<BR>
+  # @Prompt Report StatusCode via OEM Device
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|FALSE|BOOLEAN|0x00010024
+
+  ## Indicates if StatusCode report is loged into DataHub.<BR><BR>
+  #   TRUE  - Log StatusCode report into DataHub.<BR>
+  #   FALSE - Does not log StatusCode report into DataHub.<BR>
+  # @Prompt Log StatusCode into DataHub
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE|BOOLEAN|0x00010029
+
+  ## Indicates if Serial device uses half hand shake.<BR><BR>
+  #   TRUE  - Serial device uses half hand shake.<BR>
+  #   FALSE - Serial device doesn't use half hand shake.<BR>
+  # @Prompt Enable Serial device Half Hand Shake
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE|BOOLEAN|0x00010043
+
+  ## Indicates if Legacy support is needed for ACPI S3 Save.<BR><BR>
+  #   TRUE  - Support Legacy OS with S3 boot.<BR>
+  #   FALSE - Does not support Legacy OS with S3 boot.<BR>
+  # @Prompt Turn on Legacy Support in S3 Boot
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformCsmSupport|TRUE|BOOLEAN|0x00010044
+
+  ## Indicates if Framework Acpi Support protocol is installed.<BR><BR>  
+  #   TRUE  - Install Framework Acpi Support protocol.<BR>
+  #   FALSE - Doesn't install Framework Acpi Support protocol.<BR>
+  # @Prompt Enable Framework Acpi Support
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdInstallAcpiSupportProtocol|TRUE|BOOLEAN|0x00010046
+
+  ## Indicates if only Boot logo is showed and all message output is disabled in BDS.<BR><BR>
+  #   TRUE  - Only Boot Logo is showed in boot.<BR>
+  #   FALSE - All messages and Boot Logo are showed in boot.<BR>
+  # @Prompt Enable Boot Logo only
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootlogoOnlyEnable|FALSE|BOOLEAN|0x00010048
+
+[PcdsFixedAtBuild, PcdsPatchableInModule]
+  ## FFS filename to find the default BMP Logo file.
+  # @Prompt FFS Name of Boot Logo File
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile |{ 0x99, 0x8b, 0xB2, 0x7B, 0xBB, 0x61, 0xD5, 0x11, 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }|VOID*|0x40000003
+
+  ## FFS filename to find the shell application.
+  # @Prompt FFS Name of Shell Application
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }|VOID*|0x40000004
+
+  ## ISA Bus features to support DMA, SlaveDMA and ISA Memory. <BR><BR>
+  #  BIT0 indicates if DMA is supported<BR>
+  #  BIT1 indicates if only slave DMA is supported<BR>
+  #  BIT2 indicates if ISA memory is supported<BR>
+  #  Other BITs are reseved and must be zero.
+  #  If more than one features are supported, the different BIT will be enabled at the same time.
+  # @Prompt ISA Bus Features
+  # @Expression 0x80000002 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures & 0xF8) == 0
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures|0x05|UINT8|0x00010040
+
+[PcdsDynamic, PcdsDynamicEx]
+  ## Indicates if the machine has completed one boot cycle before.
+  #  After the complete boot, BootState will be set to FALSE.<BR><BR>
+  #   TRUE  - The complete boot cycle has not happened before.<BR>
+  #   FALSE - The complete boot cycle has happened before.<BR>
+  # @Prompt Boot State Flag
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|TRUE|BOOLEAN|0x0001002f
+
+[PcdsFixedAtBuild, PcdsDynamic, PcdsDynamicEx, PcdsPatchableInModule]
+  ## I/O Base address of floppy device controller.
+  # @Prompt I/O Base Address of Floppy Device Controller
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFdcBaseAddress|0x3f0|UINT16|0x30000000
+
+  ## Indicates if BiosVideo driver will switch to 80x25 Text VGA Mode when exiting boot service.<BR><BR>
+  #   TRUE  - Switch to Text VGA Mode.<BR>
+  #   FALSE - Does not switch to Text VGA Mode.<BR>
+  # @Prompt Switch to Text VGA Mode on UEFI Boot
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoSetTextVgaModeEnable|FALSE|BOOLEAN|0x30000001
+
+  ## Indicates if BiosVideo driver will check for VESA BIOS Extension service support.<BR><BR>
+  #   TRUE  - Check for VESA BIOS Extension service.<BR>
+  #   FALSE - Does not check for VESA BIOS Extension service.<BR>
+  # @Prompt Enable Check for VESA BIOS Extension Service
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable|TRUE|BOOLEAN|0x30000002
+
+  ## Indicates if BiosVideo driver will check for VGA service support.
+  #  NOTE: If both PcdBiosVideoCheckVbeEnable and PcdBiosVideoCheckVgaEnable are set to FALSE,
+  #  that means Graphics Output protocol will not be installed, the VGA miniport protocol will be installed instead.<BR><BR>
+  #   TRUE  - Check for VGA service.<BR>
+  #   FALSE - Does not check for VGA service.<BR>
+  # @Prompt Enable Check for VGA Service
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable|TRUE|BOOLEAN|0x30000003
+
+  ## Indicates if memory space for legacy region will be set as cacheable.<BR><BR>
+  #   TRUE  - Set cachebility for legacy region.<BR>
+  #   FALSE - Does not set cachebility for legacy region.<BR>
+  # @Prompt Enable Cachebility for Legacy Region
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion|TRUE|BOOLEAN|0x00000004
+
+  ## Specify memory size with bytes to reserve EBDA below 640K for OPROM.
+  # The value should be a multiple of 4KB. 
+  # @Prompt Reserved EBDA Memory Size
+  # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize < 0xA0000) AND ((gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize & 0x1000) == 0)
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize|0x8000|UINT32|0x30000005
+
+  ## Specify memory base address for OPROM to find free memory.
+  # Some OPROMs do not use EBDA or PMM to allocate memory for its usage, 
+  # instead they find the memory filled with zero from 0x20000.
+  # The value should be a multiple of 4KB.
+  # The range should be below the EBDA reserved range from 
+  # (CONVENTIONAL_MEMORY_TOP - Reserved EBDA Memory Size) to CONVENTIONAL_MEMORY_TOP.
+  # @Prompt Reserved Memory Base Address for OPROM
+  # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase >= 0x20000) AND ((gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase & 0x1000) == 0)
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase|0x60000|UINT32|0x3000000c
+  
+  ## Specify memory size with bytes for OPROM to find free memory.
+  #  The value should be a multiple of 4KB. And the range should be below the EBDA reserved range from 
+  # (CONVENTIONAL_MEMORY_TOP - Reserved EBDA Memory Size) to CONVENTIONAL_MEMORY_TOP.
+  # @Prompt Reserved Memory Size for OPROM
+  # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize < 0x80000) AND ((gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize & 0x1000) == 0)
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize|0x28000|UINT32|0x3000000d
+
+  ## Specify memory size with page number for a pre-allocated reserved memory to be used
+  #  by PEI in S3 phase. The default size 32K. When changing the value make sure the memory size 
+  #  is large enough to meet PEI requirement in the S3 phase.
+  # @Prompt Reserved S3 Boot ACPI Memory Size
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize|0x8000|UINT32|0x30000006
+
+  ## Specify the end of address below 1MB for the OPROM.
+  #  The last shadowed OpROM should not exceed this address.
+  # @Prompt Top Address of Shadowed Legacy OpROM
+  # @Expression 0x80000001 | gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEndOpromShadowAddress < 0x100000
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEndOpromShadowAddress|0xdffff|UINT32|0x30000008
+  
+  ## Specify the low PMM (Post Memory Manager) size with bytes below 1MB.
+  #  The value should be a multiple of 4KB.
+  # @Prompt Low PMM (Post Memory Manager) Size
+  # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLowPmmMemorySize < 0x100000) AND ((gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLowPmmMemorySize & 0x1000) == 0)
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLowPmmMemorySize|0x10000|UINT32|0x30000009
+  
+  ## Specify the high PMM (Post Memory Manager) size with bytes above 1MB.
+  #  The value should be a multiple of 4KB.
+  # @Prompt High PMM (Post Memory Manager) Size
+  # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdHighPmmMemorySize & 0x1000) == 0
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdHighPmmMemorySize|0x400000|UINT32|0x3000000a
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  IntelFrameworkModulePkgExtra.uni

IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc

@@ -0,0 +1,201 @@
+## @file
+# Intel Framework Reference Module Package for All Architectures
+#
+# This file is used to build all modules in IntelFrameworkModulePkg.
+#
+#Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+#This program and the accompanying materials are licensed and made available under 
+#the terms and conditions of the BSD License that accompanies this distribution.  
+#The full text of the license may be found at
+#http://opensource.org/licenses/bsd-license.php.                          
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+##           
+
+################################################################################
+#
+# Defines Section - statements that will be processed to create a Makefile.
+#
+################################################################################
+[Defines]
+  PLATFORM_NAME                  = IntelFrameworkModuleAll
+  PLATFORM_GUID                  = FFF87D9A-E5BB-4AFF-9ADE-8645492E8087
+  PLATFORM_VERSION               = 0.96
+  DSC_SPECIFICATION              = 0x00010005
+  OUTPUT_DIRECTORY               = Build/IntelFrameworkModuleAll
+  SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC|ARM
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
+  SKUID_IDENTIFIER               = DEFAULT
+
+################################################################################
+#
+# SKU Identification section - list of all SKU IDs supported by this
+#                              Platform.
+#
+################################################################################
+[SkuIds]
+  0|DEFAULT              # The entry: 0|DEFAULT is reserved and always required.
+
+[LibraryClasses]
+  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
+  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf  
+  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
+  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
+  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
+  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
+  PlatformBdsLib|IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf
+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
+  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
+  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
+  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
+  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
+  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
+  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
+  PalLib|MdePkg/Library/BasePalLibNull/BasePalLibNull.inf
+
+[LibraryClasses.common.PEIM]
+  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
+  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
+
+[LibraryClasses.EBC.PEIM]
+  IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
+
+[LibraryClasses.common.DXE_DRIVER]
+  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
+
+[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER]
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+
+[LibraryClasses.common.DXE_RUNTIME_DRIVER]
+  DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
+ 
+################################################################################
+#
+# Pcd Section - list of all EDK II PCD Entries defined by this Platform
+#
+################################################################################
+[PcdsFeatureFlag]
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE
+
+[PcdsFixedAtBuild]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f
+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000
+
+[PcdsFixedAtBuild.IPF]
+  gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000
+
+###################################################################################################
+#
+# Components Section - list of the modules and components that will be processed by compilation
+#                      tools and the EDK II tools to generate PE32/PE32+/Coff image files.
+#
+# Note: The EDK II DSC file is not used to specify how compiled binary images get placed
+#       into firmware volume images. This section is just a list of modules to compile from
+#       source into UEFI-compliant binaries.
+#       It is the FDF file that contains information on combining binary files into firmware
+#       volume images, whose concept is beyond UEFI and is described in PI specification.
+#       Binary modules do not need to be listed in this section, as they should be
+#       specified in the FDF file. For example: Shell binary (Shell_Full.efi), FAT binary (Fat.efi),
+#       Logo (Logo.bmp), and etc.
+#       There may also be modules listed in this section that are not required in the FDF file,
+#       When a module listed here is excluded from FDF file, then UEFI-compliant binary will be
+#       generated for it, but the binary will not be put into any firmware volume.
+#
+###################################################################################################
+
+[Components]
+  IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
+  IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+  IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
+  IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
+  IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
+  IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
+  IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+  IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf
+  IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+  IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf
+  IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
+  IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf
+
+  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
+  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
+  IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
+  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPei.inf
+  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
+  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
+  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
+  IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+  IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
+  IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
+
+  IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf
+  IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf
+  IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
+  IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
+
+  IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf
+  IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
+  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
+  IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
+  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
+  IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
+  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+  IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf
+  IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.inf
+  IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
+  IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
+
+[Components.IA32,Components.X64]
+  IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
+  IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
+
+[Components.IA32,Components.X64,Components.IPF]
+  IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
+  
+[Components.IA32]
+  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
+  IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf {
+    <LibraryClasses>
+      IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+  }
+
+[Components.X64]
+  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
+  IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf {
+    <LibraryClasses>
+      IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+  }
+  
+[Components.IPF]
+  IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf {
+    <LibraryClasses>
+      IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+  }
+
+[BuildOptions]
+  *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES

IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni

@@ -0,0 +1,169 @@
+// /** @file
+// Intel Framework Module Package.
+//
+// This package contains the definitions and module implementation
+// which follows Intel EFI Framework Specification.
+//
+// Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+//
+// This program and the accompanying materials
+// are licensed and made available under the terms and conditions of the BSD License
+// which accompanies this distribution. The full text of the license may be found at
+// http://opensource.org/licenses/bsd-license.php
+//
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
+// **/
+
+
+#string STR_PACKAGE_ABSTRACT            #language en-US "Intel Framework Module Package"
+
+#string STR_PACKAGE_DESCRIPTION         #language en-US "This package contains the definitions and module implementation that follow the Intel EFI Framework Specification."
+
+
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdLogoFile_PROMPT  #language en-US "FFS Name of Boot Logo File"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdLogoFile_HELP  #language en-US "FFS filename to find the default BMP Logo file."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdShellFile_PROMPT  #language en-US "FFS Name of Shell Application"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdShellFile_HELP  #language en-US "FFS filename to find the shell application."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdIsaBusSupportedFeatures_PROMPT  #language en-US "ISA Bus Features"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdIsaBusSupportedFeatures_HELP  #language en-US "ISA Bus features to support DMA, Slave DMA and ISA Memory. <BR><BR>\n"
+                                                                                                       "BIT0 indicates if DMA is supported<BR>\n"
+                                                                                                       "BIT1 indicates if only slave DMA is supported<BR>\n"
+                                                                                                       "BIT2 indicates if ISA memory is supported<BR>\n"
+                                                                                                       "Other BITs are reserved and must be zero. If more than one features are supported, the different BIT will be enabled at the same time."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_ERR_80000002 #language en-US "Reserved bits must be set to zero."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdFdcBaseAddress_PROMPT  #language en-US "I/O Base Address of Floppy Device Controller"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdFdcBaseAddress_HELP  #language en-US "I/O Base address of floppy device controller."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdBiosVideoSetTextVgaModeEnable_PROMPT  #language en-US "Switch to Text VGA Mode on UEFI Boot"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdBiosVideoSetTextVgaModeEnable_HELP  #language en-US "Indicates if BiosVideo driver will switch to 80x25 Text VGA Mode when exiting boot service.<BR><BR>\n"
+                                                                                                             "TRUE  - Switch to Text VGA Mode.<BR>\n"
+                                                                                                             "FALSE - Does not switch to Text VGA Mode.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdBiosVideoCheckVbeEnable_PROMPT  #language en-US "Enable Check for VESA BIOS Extension Service"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdBiosVideoCheckVbeEnable_HELP  #language en-US "Indicates if BiosVideo driver will check for VESA BIOS Extension service support.<BR><BR>\n"
+                                                                                                       "TRUE  - Check for VESA BIOS Extension service.<BR>\n"
+                                                                                                       "FALSE - Does not check for VESA BIOS Extension service.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdBiosVideoCheckVgaEnable_PROMPT  #language en-US "Enable Check for VGA Service"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdBiosVideoCheckVgaEnable_HELP  #language en-US "Indicates if BiosVideo driver will check for VGA service support. NOTE: If both PcdBiosVideoCheckVbeEnable and PcdBiosVideoCheckVgaEnable are set to FALSE, that means Graphics Output protocol will not be installed, the VGA miniport protocol will be installed instead.<BR><BR>\n"
+                                                                                                       "TRUE  - Check for VGA service<BR>\n"
+                                                                                                       "FALSE - Does not check for VGA service<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdLegacyBiosCacheLegacyRegion_PROMPT  #language en-US "Enable Cacheability for Legacy Region"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdLegacyBiosCacheLegacyRegion_HELP  #language en-US "Set memory space for legacy region cacheable?<BR><BR>\n"
+                                                                                                           "TRUE  - Cacheable<BR>\n"
+                                                                                                           "FALSE - Non cacheable<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdEbdaReservedMemorySize_PROMPT  #language en-US "Reserved EBDA Memory Size"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdEbdaReservedMemorySize_HELP  #language en-US "Specify memory size with bytes to reserve EBDA below 640K for OPROM. The value should be a multiple of 4KB."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_ERR_80000001 #language en-US "Invalid value provided."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdS3AcpiReservedMemorySize_PROMPT  #language en-US "Reserved S3 Boot ACPI Memory Size"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdS3AcpiReservedMemorySize_HELP  #language en-US "Specify memory size with page number for a pre-allocated reserved memory to be used by PEI in S3 phase. The default size 32K. When changing the value make sure the memory size is large enough to meet PEI requirement in the S3 phase."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdEndOpromShadowAddress_PROMPT  #language en-US "Top Address of Shadowed Legacy OpROM"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdEndOpromShadowAddress_HELP  #language en-US "Specify the end of address below 1MB for the OPROM. The last shadowed OpROM should not exceed this address."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdLowPmmMemorySize_PROMPT  #language en-US "Low PMM (Post Memory Manager) Size"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdLowPmmMemorySize_HELP  #language en-US "Specify the low PMM (Post Memory Manager) size with bytes below 1MB. The value should be a multiple of 4KB."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdHighPmmMemorySize_PROMPT  #language en-US "High PMM (Post Memory Manager) Size"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdHighPmmMemorySize_HELP  #language en-US "Specify the high PMM (Post Memory Manager) size with bytes above 1MB. The value should be a multiple of 4KB."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdFastPS2Detection_PROMPT  #language en-US "Enable fast PS2 detection"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdFastPS2Detection_HELP  #language en-US "Indicates if to use the optimized timing for best PS2 detection performance.\n"
+                                                                                                "Note this PCD could be set to TRUE for best boot performance and set to FALSE for best device compatibility.<BR><BR>\n"
+                                                                                                "TRUE  - Use the optimized timing for best PS2 detection performance.<BR>\n"
+                                                                                                "FALSE - Use the normal timing to detect PS2.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdStatusCodeUseOEM_PROMPT  #language en-US "Report StatusCode via OEM Device"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdStatusCodeUseOEM_HELP  #language en-US "Indicates if OEM device is enabled as StatusCode report device. It is only used in Framework StatusCode implementation. <BR><BR>\n"
+                                                                                                "TRUE  - Enable OEM device.<BR>\n"
+                                                                                                "FALSE - Disable OEM device.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdStatusCodeUseDataHub_PROMPT  #language en-US "Log StatusCode into DataHub"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdStatusCodeUseDataHub_HELP  #language en-US "Indicates if StatusCode report is loged into DataHub.<BR><BR>\n"
+                                                                                                    "TRUE  - Log StatusCode report into DataHub.<BR>\n"
+                                                                                                    "FALSE - Does not log StatusCode report into DataHub.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdIsaBusSerialUseHalfHandshake_PROMPT  #language en-US "Enable Serial device Half Hand Shake"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdIsaBusSerialUseHalfHandshake_HELP  #language en-US "Indicates if Serial device uses half hand shake.<BR><BR>\n"
+                                                                                                            "TRUE  - Serial device uses half hand shake.<BR>\n"
+                                                                                                            "FALSE - Serial device doesn't use half hand shake.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPlatformCsmSupport_PROMPT  #language en-US "Turn on Legacy Support in S3 boot"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPlatformCsmSupport_HELP  #language en-US "Enable Legacy OS support during ACPI S3 boot.<BR><BR>\n"
+                                                                                                  "TRUE  - Support Legacy OS with S3 boot.<BR>\n"
+                                                                                                  "FALSE - Does not support Legacy OS with S3 boot.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPs2KbdExtendedVerification_PROMPT  #language en-US "Turn on PS2 Keyboard Extended Verification"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPs2KbdExtendedVerification_HELP  #language en-US "Enable PS2 keyboard extended verification. Extended verification will increase boot time.<BR><BR>\n"
+                                                                                                          "TRUE  - Enable extended verification.<BR>\n"
+                                                                                                          "FALSE - Disable extended verification.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdInstallAcpiSupportProtocol_PROMPT  #language en-US "Enable Framework ACPI Support"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdInstallAcpiSupportProtocol_HELP  #language en-US "Indicates if Framework Acpi Support protocol is installed.<BR><BR>\n"
+                                                                                                          "TRUE  - Install Framework Acpi Support protocol.<BR>\n"
+                                                                                                          "FALSE - Doesn't install Framework Acpi Support protocol.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPs2MouseExtendedVerification_PROMPT  #language en-US "Turn on PS2 Mouse Extended Verification"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPs2MouseExtendedVerification_HELP  #language en-US "Enable PS2 mouse extended verification. Extended verification will increase boot time.<BR><BR>\n"
+                                                                                                            "TRUE  - Enable extended verification.<BR>\n"
+                                                                                                            "FALSE - Disable extended verification.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdBootlogoOnlyEnable_PROMPT  #language en-US "Enable Boot Logo only"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdBootlogoOnlyEnable_HELP  #language en-US "Indicates if only Boot logo is showed and all message output is disabled in BDS.<BR><BR>\n"
+                                                                                                  "TRUE  - Only Boot Logo is showed in boot.<BR>\n"
+                                                                                                  "FALSE - All messages and Boot Logo are showed in boot.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdBootState_PROMPT  #language en-US "Boot State Flag"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdBootState_HELP  #language en-US "Indicates if the machine has completed one boot cycle before. After the complete boot, BootState will be set to FALSE.<BR><BR>\n"
+                                                                                         "TRUE  - The complete boot cycle has not happened before.<BR>\n"
+                                                                                         "FALSE - The complete boot cycle has happened before.<BR>"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdOpromReservedMemoryBase_PROMPT  #language en-US "Reserved Memory Base Address for OPROM"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdOpromReservedMemoryBase_HELP  #language en-US "Specify memory base address for OPROM to find free memory.\n"
+                                                                                                       "Some OPROMs do not use EBDA or PMM to allocate memory for its usage,\n"
+                                                                                                       "instead they find the memory filled with zero from 0x20000.\n"
+                                                                                                       "The value should be a multiple of 4KB.\n"
+                                                                                                       "The range should be below the EBDA reserved range from\n"
+                                                                                                       "(CONVENTIONAL_MEMORY_TOP - Reserved EBDA Memory Size) to CONVENTIONAL_MEMORY_TOP."
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdOpromReservedMemorySize_PROMPT  #language en-US "Reserved Memory Size for OPROM"
+
+#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdOpromReservedMemorySize_HELP  #language en-US "Specify memory size with bytes for OPROM to find free memory.\n"
+                                                                                                       "The value should be a multiple of 4KB. And the range should be below the EBDA reserved range from\n"
+                                                                                                       "(CONVENTIONAL_MEMORY_TOP - Reserved EBDA Memory Size) to CONVENTIONAL_MEMORY_TOP."
+

IntelFrameworkModulePkg/IntelFrameworkModulePkgExtra.uni

@@ -0,0 +1,20 @@
+// /** @file
+// IntelFrameworkModule Package Localized Strings and Content.
+//
+// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+//
+// This program and the accompanying materials
+// are licensed and made available under the terms and conditions of the BSD License
+// which accompanies this distribution. The full text of the license may be found at
+// http://opensource.org/licenses/bsd-license.php
+//
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
+// **/
+
+#string STR_PROPERTIES_PACKAGE_NAME 
+#language en-US 
+"IntelFrameworkModule package"
+
+

IntelFrameworkPkg/Include/Framework/BootScript.h

@@ -0,0 +1,47 @@
+/** @file
+  This file contains the boot script defintions that are shared between the 
+  Boot Script Executor PPI and the Boot Script Save Protocol.
+
+Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef _BOOT_SCRIPT_H_
+#define _BOOT_SCRIPT_H_
+
+#include <PiDxe.h>
+///
+/// The framework implementation defines follow opcode that are different from the PI specification: 
+/// Add FRAMEWORK_ prefix to avoid naming conflict.
+///
+/// S3 Boot Script Table identifier.
+///
+#define FRAMEWORK_EFI_ACPI_S3_RESUME_SCRIPT_TABLE               0x00
+///
+/// The opcode is used to add a record for memory reads of the memory location and continues when the 
+/// exit criteria is satisfied, or after a defined duration.
+///
+#define FRAMEWORK_EFI_BOOT_SCRIPT_MEM_POLL_OPCODE               0x09
+///
+/// The opcode is used to add a record for dispatching specified arbitrary code into a specified
+/// boot script table.
+///
+#define FRAMEWORK_EFI_BOOT_SCRIPT_DISPATCH_2_OPCODE             0x0D
+///
+/// The opcode indicates the start of the boot script table.
+///
+#define FRAMEWORK_EFI_BOOT_SCRIPT_TABLE_OPCODE                  0xAA
+///
+/// The opcode indicates the end of the boot script table.
+///
+#define FRAMEWORK_EFI_BOOT_SCRIPT_TERMINATE_OPCODE              0xFF
+
+
+#endif

IntelFrameworkPkg/Include/Framework/DxeCis.h

@@ -0,0 +1,176 @@
+/** @file
+  Include file for definitions in the Intel Platform Innovation Framework for EFI
+  Driver Execution Environment Core Interface Specification (DXE CIS) Version 0.91.
+
+Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef _DXECIS_H_
+#define _DXECIS_H_
+
+#include <Protocol/StatusCode.h>
+
+/**
+  Functions of this type are used with the Framework MP Services Protocol and
+  the  SMM Services Table to execute a procedure on enabled APs.  The context 
+  the AP should use durng execution is specified by Buffer.
+  
+  @param[in]  Buffer   The pointer to the procedure's argument.
+
+**/
+typedef
+VOID
+(EFIAPI *FRAMEWORK_EFI_AP_PROCEDURE)(
+  IN  VOID  *Buffer
+  );
+
+///
+/// The Framework EFI Runtime Services Table as an extension to the EFI 1.10 Runtime Services Table.
+///
+typedef struct {
+  //
+  // Table header for the Framework EFI Runtime Services Table
+  //
+  EFI_TABLE_HEADER                  Hdr;
+  //
+  // Time services
+  //
+  EFI_GET_TIME                      GetTime;
+  EFI_SET_TIME                      SetTime;
+  EFI_GET_WAKEUP_TIME               GetWakeupTime;
+  EFI_SET_WAKEUP_TIME               SetWakeupTime;
+  //
+  // Virtual memory services
+  //
+  EFI_SET_VIRTUAL_ADDRESS_MAP       SetVirtualAddressMap;
+  EFI_CONVERT_POINTER               ConvertPointer;
+  //
+  // Variable services
+  //
+  EFI_GET_VARIABLE                  GetVariable;
+  EFI_GET_NEXT_VARIABLE_NAME        GetNextVariableName;
+  EFI_SET_VARIABLE                  SetVariable;
+  //
+  // Misc
+  //
+  EFI_GET_NEXT_HIGH_MONO_COUNT      GetNextHighMonotonicCount;
+  EFI_RESET_SYSTEM                  ResetSystem;
+  ///
+  /// A Framework extension to the EFI 1.10 runtime table.
+  /// It was moved to a protocol to avoid conflict with UEFI 2.0.
+  ///
+  EFI_REPORT_STATUS_CODE            ReportStatusCode;
+} FRAMEWORK_EFI_RUNTIME_SERVICES;
+
+///
+/// The Framework EFI Boot Services Table. Complies with the DxeCis specification.
+///
+typedef struct {
+  ///
+  /// The table header for the EFI Boot Services Table.
+  ///
+  EFI_TABLE_HEADER                Hdr;
+
+  //
+  // Task Priority Services
+  //
+  EFI_RAISE_TPL                   RaiseTPL;
+  EFI_RESTORE_TPL                 RestoreTPL;
+
+  //
+  // Memory Services
+  //
+  EFI_ALLOCATE_PAGES              AllocatePages;
+  EFI_FREE_PAGES                  FreePages;
+  EFI_GET_MEMORY_MAP              GetMemoryMap;
+  EFI_ALLOCATE_POOL               AllocatePool;
+  EFI_FREE_POOL                   FreePool;
+
+  //
+  // Event & Timer Services
+  //
+  EFI_CREATE_EVENT                  CreateEvent;
+  EFI_SET_TIMER                     SetTimer;
+  EFI_WAIT_FOR_EVENT                WaitForEvent;
+  EFI_SIGNAL_EVENT                  SignalEvent;
+  EFI_CLOSE_EVENT                   CloseEvent;
+  EFI_CHECK_EVENT                   CheckEvent;
+
+  //
+  // Protocol Handler Services
+  //
+  EFI_INSTALL_PROTOCOL_INTERFACE    InstallProtocolInterface;
+  EFI_REINSTALL_PROTOCOL_INTERFACE  ReinstallProtocolInterface;
+  EFI_UNINSTALL_PROTOCOL_INTERFACE  UninstallProtocolInterface;
+  EFI_HANDLE_PROTOCOL               HandleProtocol;
+  EFI_HANDLE_PROTOCOL               PcHandleProtocol;
+  EFI_REGISTER_PROTOCOL_NOTIFY      RegisterProtocolNotify;
+  EFI_LOCATE_HANDLE                 LocateHandle;
+  EFI_LOCATE_DEVICE_PATH            LocateDevicePath;
+  EFI_INSTALL_CONFIGURATION_TABLE   InstallConfigurationTable;
+
+  //
+  // Image Services
+  //
+  EFI_IMAGE_LOAD                    LoadImage;
+  EFI_IMAGE_START                   StartImage;
+  EFI_EXIT                          Exit;
+  EFI_IMAGE_UNLOAD                  UnloadImage;
+  EFI_EXIT_BOOT_SERVICES            ExitBootServices;
+
+  //
+  // Miscellaneous Services
+  //
+  EFI_GET_NEXT_MONOTONIC_COUNT      GetNextMonotonicCount;
+  EFI_STALL                         Stall;
+  EFI_SET_WATCHDOG_TIMER            SetWatchdogTimer;
+
+  //
+  // DriverSupport Services
+  //
+  EFI_CONNECT_CONTROLLER            ConnectController;
+  EFI_DISCONNECT_CONTROLLER         DisconnectController;
+
+  //
+  // Open and Close Protocol Services
+  //
+  EFI_OPEN_PROTOCOL                 OpenProtocol;
+  EFI_CLOSE_PROTOCOL                CloseProtocol;
+  EFI_OPEN_PROTOCOL_INFORMATION     OpenProtocolInformation;
+
+  //
+  // Library Services
+  //
+  EFI_PROTOCOLS_PER_HANDLE          ProtocolsPerHandle;
+  EFI_LOCATE_HANDLE_BUFFER          LocateHandleBuffer;
+  EFI_LOCATE_PROTOCOL               LocateProtocol;
+  EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES    InstallMultipleProtocolInterfaces;
+  EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES  UninstallMultipleProtocolInterfaces;
+
+  //
+  // 32-bit CRC Services
+  //
+  EFI_CALCULATE_CRC32               CalculateCrc32;
+
+  //
+  // Miscellaneous Services
+  //
+  EFI_COPY_MEM                      CopyMem;
+  EFI_SET_MEM                       SetMem;
+} FRAMEWORK_EFI_BOOT_SERVICES;
+
+#define EFI_EVENT_RUNTIME_CONTEXT       0x20000000
+#define EFI_EVENT_NOTIFY_SIGNAL_ALL     0x00000400
+#define EFI_EVENT_SIGNAL_READY_TO_BOOT  0x00000203
+#define EFI_EVENT_SIGNAL_LEGACY_BOOT    0x00000204
+
+#endif
+

IntelFrameworkPkg/Include/Framework/FirmwareVolumeHeader.h

@@ -0,0 +1,85 @@
+/** @file
+  Defines the data structure that is the volume header found at the beginning of
+  all firmware volumes that are either memory mapped or have an
+  associated FirmwareVolumeBlock protocol.
+
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+  @par Revision Reference:
+  These definitions are from the Firmware Volume Block Spec 0.9.
+
+**/
+
+#ifndef __EFI_FIRMWARE_VOLUME_HEADER_H__
+#define __EFI_FIRMWARE_VOLUME_HEADER_H__
+
+///
+/// Firmware Volume Block Attributes bit definitions.
+///@{
+#define EFI_FVB_READ_DISABLED_CAP   0x00000001
+#define EFI_FVB_READ_ENABLED_CAP    0x00000002
+#define EFI_FVB_READ_STATUS         0x00000004
+
+#define EFI_FVB_WRITE_DISABLED_CAP  0x00000008
+#define EFI_FVB_WRITE_ENABLED_CAP   0x00000010
+#define EFI_FVB_WRITE_STATUS        0x00000020
+
+#define EFI_FVB_LOCK_CAP            0x00000040
+#define EFI_FVB_LOCK_STATUS         0x00000080
+
+#define EFI_FVB_STICKY_WRITE        0x00000200
+#define EFI_FVB_MEMORY_MAPPED       0x00000400
+#define EFI_FVB_ERASE_POLARITY      0x00000800
+
+#define EFI_FVB_ALIGNMENT_CAP       0x00008000
+#define EFI_FVB_ALIGNMENT_2         0x00010000
+#define EFI_FVB_ALIGNMENT_4         0x00020000
+#define EFI_FVB_ALIGNMENT_8         0x00040000
+#define EFI_FVB_ALIGNMENT_16        0x00080000
+#define EFI_FVB_ALIGNMENT_32        0x00100000
+#define EFI_FVB_ALIGNMENT_64        0x00200000
+#define EFI_FVB_ALIGNMENT_128       0x00400000
+#define EFI_FVB_ALIGNMENT_256       0x00800000
+#define EFI_FVB_ALIGNMENT_512       0x01000000
+#define EFI_FVB_ALIGNMENT_1K        0x02000000
+#define EFI_FVB_ALIGNMENT_2K        0x04000000
+#define EFI_FVB_ALIGNMENT_4K        0x08000000
+#define EFI_FVB_ALIGNMENT_8K        0x10000000
+#define EFI_FVB_ALIGNMENT_16K       0x20000000
+#define EFI_FVB_ALIGNMENT_32K       0x40000000
+#define EFI_FVB_ALIGNMENT_64K       0x80000000
+///@}
+
+/// This is a simple macro defined as the set of all FV Block Attributes signifying capabilities.
+#define EFI_FVB_CAPABILITIES  ( EFI_FVB_READ_DISABLED_CAP  | \
+                                EFI_FVB_READ_ENABLED_CAP   | \
+                                EFI_FVB_WRITE_DISABLED_CAP | \
+                                EFI_FVB_WRITE_ENABLED_CAP  | \
+                                EFI_FVB_LOCK_CAP \
+                              )
+
+/** A parameterized macro defining a boolean expression that tests the state of a particular bit.
+  *
+  * @param FvbAttributes  Indicates a test for CLEAR if EFI_FVB_ERASE_POLARITY is 1, else test for SET.
+  *
+  * @param TestAttributes The set of bits to test.
+  *
+  * @param Bit            A value indicating the bit(s) to test.
+  *                       If multiple bits are set, the logical OR of their tests is the expression's value.
+**/
+#define EFI_TEST_FFS_ATTRIBUTES_BIT( FvbAttributes, TestAttributes, Bit) \
+    ((BOOLEAN) \
+      ((FvbAttributes & EFI_FVB_ERASE_POLARITY) ? (((~TestAttributes) & Bit) == Bit) : ((TestAttributes & Bit) == Bit)) \
+    )
+
+/// A simple macro defined as the set of all FV Block Attribute bits that indicate status.
+#define EFI_FVB_STATUS    (EFI_FVB_READ_STATUS | EFI_FVB_WRITE_STATUS | EFI_FVB_LOCK_STATUS)
+
+#endif  /* __EFI_FIRMWARE_VOLUME_HEADER_H__ */

IntelFrameworkPkg/Include/Framework/FirmwareVolumeImageFormat.h

@@ -0,0 +1,38 @@
+/** @file
+  This file defines the data structures that are architecturally defined for file
+  images loaded via the FirmwareVolume protocol.  The Firmware Volume specification
+  is the basis for these definitions.
+
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+  @par Revision Reference:
+  These definitions are from the Firmware Volume Spec 0.9.
+
+**/
+
+#ifndef __FIRMWARE_VOLUME_IMAGE_FORMAT_H__
+#define __FIRMWARE_VOLUME_IMAGE_FORMAT_H__
+
+//
+// Bit values for AuthenticationStatus
+//
+#define EFI_AGGREGATE_AUTH_STATUS_PLATFORM_OVERRIDE 0x000001
+#define EFI_AGGREGATE_AUTH_STATUS_IMAGE_SIGNED      0x000002
+#define EFI_AGGREGATE_AUTH_STATUS_NOT_TESTED        0x000004
+#define EFI_AGGREGATE_AUTH_STATUS_TEST_FAILED       0x000008
+#define EFI_AGGREGATE_AUTH_STATUS_ALL               0x00000f
+
+#define EFI_LOCAL_AUTH_STATUS_PLATFORM_OVERRIDE     0x010000
+#define EFI_LOCAL_AUTH_STATUS_IMAGE_SIGNED          0x020000
+#define EFI_LOCAL_AUTH_STATUS_NOT_TESTED            0x040000
+#define EFI_LOCAL_AUTH_STATUS_TEST_FAILED           0x080000
+#define EFI_LOCAL_AUTH_STATUS_ALL                   0x0f0000
+
+#endif

IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h

@@ -0,0 +1,403 @@
+/** @file
+  This file defines the encoding for the VFR (Visual Form Representation) language.
+  Framework IFR is primarily consumed by the EFI presentation engine, and produced by EFI
+  internal application and drivers as well as all add-in card option-ROM drivers
+
+Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+  @par Revision Reference:
+  These definitions are from the Framework Specification HII 0.92.
+
+**/
+
+#ifndef __FRAMEWORK_INTERNAL_FORMREPRESENTATION_H__
+#define __FRAMEWORK_INTERNAL_FORMREPRESENTATION_H__
+
+typedef UINT16  STRING_REF;
+
+//
+// IFR Op codes
+//
+#define FRAMEWORK_EFI_IFR_FORM_OP                 0x01
+#define FRAMEWORK_EFI_IFR_SUBTITLE_OP             0x02
+#define FRAMEWORK_EFI_IFR_TEXT_OP                 0x03
+#define EFI_IFR_GRAPHIC_OP                        0x04
+#define FRAMEWORK_EFI_IFR_ONE_OF_OP               0x05
+#define FRAMEWORK_EFI_IFR_CHECKBOX_OP             0x06
+#define FRAMEWORK_EFI_IFR_NUMERIC_OP              0x07
+#define FRAMEWORK_EFI_IFR_PASSWORD_OP             0x08
+#define FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP        0x09  ///< ONEOF OPTION field.
+#define FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP          0x0A
+#define EFI_IFR_END_FORM_OP                       0x0B
+#define EFI_IFR_HIDDEN_OP                         0x0C
+#define EFI_IFR_END_FORM_SET_OP                   0x0D
+#define FRAMEWORK_EFI_IFR_FORM_SET_OP             0x0E
+#define FRAMEWORK_EFI_IFR_REF_OP                  0x0F
+#define EFI_IFR_END_ONE_OF_OP                     0x10
+#define FRAMEWORK_EFI_IFR_END_OP                  EFI_IFR_END_ONE_OF_OP
+#define FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP      0x11
+#define FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP            0x12
+#define FRAMEWORK_EFI_IFR_EQ_ID_ID_OP             0x13
+#define FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP           0x14
+#define FRAMEWORK_EFI_IFR_AND_OP                  0x15
+#define FRAMEWORK_EFI_IFR_OR_OP                   0x16
+#define FRAMEWORK_EFI_IFR_NOT_OP                  0x17
+#define EFI_IFR_END_IF_OP                         0x18  ///< For endif of inconsistentif, suppressif, grayoutif.
+#define EFI_IFR_GRAYOUT_IF_OP                     0x19
+#define FRAMEWORK_EFI_IFR_DATE_OP                 0x1A
+#define FRAMEWORK_EFI_IFR_TIME_OP                 0x1B
+#define FRAMEWORK_EFI_IFR_STRING_OP               0x1C
+#define EFI_IFR_LABEL_OP                          0x1D
+#define EFI_IFR_SAVE_DEFAULTS_OP                  0x1E
+#define EFI_IFR_RESTORE_DEFAULTS_OP               0x1F
+#define EFI_IFR_BANNER_OP                         0x20
+#define EFI_IFR_INVENTORY_OP                      0x21
+#define EFI_IFR_EQ_VAR_VAL_OP                     0x22
+#define FRAMEWORK_EFI_IFR_ORDERED_LIST_OP         0x23
+#define FRAMEWORK_EFI_IFR_VARSTORE_OP             0x24
+#define EFI_IFR_VARSTORE_SELECT_OP                0x25
+#define EFI_IFR_VARSTORE_SELECT_PAIR_OP           0x26
+#define EFI_IFR_LAST_OPCODE                       EFI_IFR_VARSTORE_SELECT_PAIR_OP
+#define EFI_IFR_OEM_OP                            0xFE
+#define EFI_IFR_NV_ACCESS_COMMAND                 0xFF
+
+//
+// Define values for the flags fields in some VFR opcodes. These are
+// bitmasks.
+//
+#define EFI_IFR_FLAG_DEFAULT            0x01
+#define EFI_IFR_FLAG_MANUFACTURING      0x02
+#define EFI_IFR_FLAG_INTERACTIVE        0x04
+#define EFI_IFR_FLAG_NV_ACCESS          0x08
+#define EFI_IFR_FLAG_RESET_REQUIRED     0x10
+#define EFI_IFR_FLAG_LATE_CHECK         0x20
+
+#define EFI_NON_DEVICE_CLASS              0x00  ///< Useful when you do not want something in the Device Manager.
+#define EFI_DISK_DEVICE_CLASS             0x01
+#define EFI_VIDEO_DEVICE_CLASS            0x02
+#define EFI_NETWORK_DEVICE_CLASS          0x04
+#define EFI_INPUT_DEVICE_CLASS            0x08
+#define EFI_ON_BOARD_DEVICE_CLASS         0x10
+#define EFI_OTHER_DEVICE_CLASS            0x20
+
+#define EFI_SETUP_APPLICATION_SUBCLASS    0x00
+#define EFI_GENERAL_APPLICATION_SUBCLASS  0x01
+#define EFI_FRONT_PAGE_SUBCLASS           0x02
+#define EFI_SINGLE_USE_SUBCLASS           0x03  ///< Used to display a single entity ,and then exit.
+
+///
+/// Used to flag dynamically created op-codes. This is meaningful to the IFR Library set
+/// and the browser because we need to distinguish between compiled NV map data and created data.
+/// We do not allow new entries to be created in the NV map dynamically, but we do need
+/// to display this information correctly.  To dynamically create op-codes and assume that their
+/// data will be saved, ensure that the NV starting location they refer to is pre-defined in the
+/// NV map.
+///
+#define EFI_IFR_FLAG_CREATED  128
+
+
+#pragma pack(1)
+//
+// IFR Structure definitions
+//
+typedef struct {
+  UINT8                             OpCode;
+  UINT8                             Length;
+} FRAMEWORK_EFI_IFR_OP_HEADER;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  EFI_GUID                          Guid;
+  STRING_REF                        FormSetTitle;
+  STRING_REF                        Help;
+  EFI_PHYSICAL_ADDRESS              CallbackHandle;
+  UINT16                            Class;
+  UINT16                            SubClass;
+  UINT16                            NvDataSize; ///< Set once; the size of the NV data as defined in the script.
+} FRAMEWORK_EFI_IFR_FORM_SET;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            FormId;
+  STRING_REF                        FormTitle;
+} FRAMEWORK_EFI_IFR_FORM;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            LabelId;
+} EFI_IFR_LABEL;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  STRING_REF                        SubTitle;
+} FRAMEWORK_EFI_IFR_SUBTITLE;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  STRING_REF                        Help;
+  STRING_REF                        Text;
+  STRING_REF                        TextTwo;
+  UINT8                             Flags;  ///< This is included solely for purposes of interactive/dynamic support.
+  UINT16                            Key;    ///< The value to be passed to the caller to identify this particular op-code.
+} FRAMEWORK_EFI_IFR_TEXT;
+
+//
+// goto
+//
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            FormId;
+  STRING_REF                        Prompt;
+  STRING_REF                        Help;   ///< The string Token for the context-help.
+  UINT8                             Flags;  ///< This is included solely for purposes of interactive/dynamic support.
+  UINT16                            Key;    ///< The value to be passed to the caller to identify this particular op-code.
+} FRAMEWORK_EFI_IFR_REF;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+} EFI_IFR_END_FORM;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+} EFI_IFR_END_FORM_SET;
+
+//
+// Also notice that the IFR_ONE_OF and IFR_CHECK_BOX are identical in structure......
+// code assumes this to be true, if this ever changes we need to revisit the InitializeTagStructures code
+//
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            QuestionId; ///< The ID designating what the question is about...
+  UINT8                             Width;      ///< The Size of the Data being saved.
+  STRING_REF                        Prompt;     ///< The String Token for the Prompt.
+  STRING_REF                        Help;       ///< The string Token for the context-help.
+} FRAMEWORK_EFI_IFR_ONE_OF;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            QuestionId; ///< The offset in NV for storage of the data.
+  UINT8                             MaxEntries; ///< The maximum number of options in the ordered list (=size of NVStore).
+  STRING_REF                        Prompt;     ///< The string token for the prompt.
+  STRING_REF                        Help;       ///< The string token for the context-help.
+} FRAMEWORK_EFI_IFR_ORDERED_LIST;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            QuestionId; ///< The ID designating what the question is about...
+  UINT8                             Width;      ///< The Size of the Data being saved.
+  STRING_REF                        Prompt;     ///< The String Token for the Prompt.
+  STRING_REF                        Help;       ///< The string Token for the context-help.
+  UINT8                             Flags;      ///< If non-zero, it means that it is the default option.
+  UINT16                            Key;        ///< Value to be passed to caller to identify this particular op-code.
+} FRAMEWORK_EFI_IFR_CHECKBOX, EFI_IFR_CHECK_BOX;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  STRING_REF                        Option;     ///< The string token describing the option.
+  UINT16                            Value;      ///< The value associated with this option that is stored in the NVRAM.
+  UINT8                             Flags;      ///< If non-zero, it means that it is the default option.
+  UINT16                            Key;        ///< Value to be passed to caller to identify this particular op-code.
+} FRAMEWORK_EFI_IFR_ONE_OF_OPTION;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            QuestionId; ///< The ID designating what the question is about...
+  UINT8                             Width;      ///< The Size of the Data being saved.
+  STRING_REF                        Prompt;     ///< The String Token for the Prompt.
+  STRING_REF                        Help;       ///< The string Token for the context-help.
+  UINT8                             Flags;      ///< This is included solely for purposes of interactive/dynamic support.
+  UINT16                            Key;        ///< The value to be passed to caller to identify this particular op-code.
+  UINT16                            Minimum;
+  UINT16                            Maximum;
+  UINT16                            Step;       ///< Zero means manual input. Otherwise, arrow selection is called for.
+  UINT16                            Default;
+} FRAMEWORK_EFI_IFR_NUMERIC;
+
+//
+// There is an interesting twist with regards to Time and Date.  This is one of the few items which can accept input
+// from a user, and may or may not need to use storage in the NVRAM space.  The decided method for determining 
+// if NVRAM space will be used (only for a TimeOp or DateOp) is:  If .QuestionId == 0 && .Width == 0 (normally an 
+// impossibility) then use system resources to store the data away and not NV resources.  In other words, the setup
+// engine will call gRT->SetTime, and gRT->SetDate for the saving of data, and the values displayed will be from the
+// gRT->GetXXXX series of calls.
+//
+typedef struct {
+  FRAMEWORK_EFI_IFR_NUMERIC         Hour;
+  FRAMEWORK_EFI_IFR_NUMERIC         Minute;
+  FRAMEWORK_EFI_IFR_NUMERIC         Second;
+} FRAMEWORK_EFI_IFR_TIME;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_NUMERIC         Year;
+  FRAMEWORK_EFI_IFR_NUMERIC         Month;
+  FRAMEWORK_EFI_IFR_NUMERIC         Day;
+} FRAMEWORK_EFI_IFR_DATE;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            QuestionId;///< The ID designating what the question is about...
+  UINT8                             Width;     ///< The Size of the Data being saved.
+  STRING_REF                        Prompt;    ///< The String Token for the Prompt.
+  STRING_REF                        Help;      ///< The string Token for the context-help.
+  UINT8                             Flags;     ///< This is included solely for purposes of interactive/dynamic support.
+  UINT16                            Key;       ///< The value to be passed to caller to identify this particular op-code.
+  UINT8                             MinSize;   ///< Minimum allowable sized password.
+  UINT8                             MaxSize;   ///< Maximum allowable sized password.
+  UINT16                            Encoding;
+} FRAMEWORK_EFI_IFR_PASSWORD;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            QuestionId; ///< The ID designating what the question is about...
+  UINT8                             Width;      ///< The Size of the Data being saved. 
+  STRING_REF                        Prompt;     ///< The String Token for the Prompt.
+  STRING_REF                        Help;       ///< The string Token for the context-help.
+  UINT8                             Flags;      ///< This is included solely for purposes of interactive/dynamic support.
+  UINT16                            Key;        ///< The value to be passed to caller to identify this particular op-code.
+  UINT8                             MinSize;    ///< Minimum allowable sized password.
+  UINT8                             MaxSize;    ///< Maximum allowable sized password.
+} FRAMEWORK_EFI_IFR_STRING;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+} EFI_IFR_END_ONE_OF;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            Value;
+  UINT16                            Key;
+} EFI_IFR_HIDDEN;
+
+///
+/// Inconsistent with specification here:
+/// The following defintion may not comply with Framework Specification HII 0.92. To 
+/// keep the inconsistant is for implementation needed.
+///@{
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT8                             Flags;
+} EFI_IFR_SUPPRESS;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT8                             Flags;
+} EFI_IFR_GRAY_OUT;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  STRING_REF                        Popup;
+  UINT8                             Flags;
+} EFI_IFR_INCONSISTENT;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            QuestionId;   ///< The offset into variable storage.
+  UINT8                             Width;        ///< The size of variable storage.
+  UINT16                            Value;        ///< The value to compare against.
+} FRAMEWORK_EFI_IFR_EQ_ID_VAL;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            QuestionId;   ///< The offset into variable storage.
+  UINT8                             Width;        ///< The size of variable storage.
+  UINT16                            ListLength;
+  UINT16                            ValueList[1];
+} FRAMEWORK_EFI_IFR_EQ_ID_LIST;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            QuestionId1;  ///< The offset into variable storage for first value to compare.
+  UINT8                             Width;        ///< The size of variable storage (must be same for both).
+  UINT16                            QuestionId2;  ///< The offset into variable storage for second value to compare.
+} FRAMEWORK_EFI_IFR_EQ_ID_ID;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            VariableId;   ///< The offset into variable storage.
+  UINT16                            Value;        ///< The value to compare against.
+} EFI_IFR_EQ_VAR_VAL;
+///@}
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+} FRAMEWORK_EFI_IFR_AND;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+} FRAMEWORK_EFI_IFR_OR;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+} FRAMEWORK_EFI_IFR_NOT;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+} EFI_IFR_END_EXPR, EFI_IFR_END_IF;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            FormId;
+  STRING_REF                        Prompt;
+  STRING_REF                        Help;
+  UINT8                             Flags;
+  UINT16                            Key;
+} EFI_IFR_SAVE_DEFAULTS;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  STRING_REF                        Help;
+  STRING_REF                        Text;
+  STRING_REF                        TextTwo;    ///< Optional text.
+} EFI_IFR_INVENTORY;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  EFI_GUID                          Guid;       ///< GUID for the variable.
+  UINT16                            VarId;      ///< The variable store ID, as referenced elsewhere in the form.
+  UINT16                            Size;       ///< The size of the variable storage.
+} FRAMEWORK_EFI_IFR_VARSTORE;
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            VarId;      ///< The variable store ID, as referenced elsewhere in the form.
+} EFI_IFR_VARSTORE_SELECT;
+
+///
+/// Used for the ideqid VFR statement where two variable stores may be referenced in the
+/// same VFR statement.
+/// A browser should treat this as an FRAMEWORK_EFI_IFR_VARSTORE_SELECT statement and assume that all following
+/// IFR opcodes use the VarId as defined here.
+///
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  UINT16                            VarId;          ///< The variable store ID, as referenced elsewhere in the form.
+  UINT16                            SecondaryVarId; ///< The variable store ID, as referenced elsewhere in the form.
+} EFI_IFR_VARSTORE_SELECT_PAIR;
+
+///
+/// Save defaults and restore defaults have same structure.
+///
+#define EFI_IFR_RESTORE_DEFAULTS  EFI_IFR_SAVE_DEFAULTS
+
+typedef struct {
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;
+  STRING_REF                        Title;        ///< The string token for the banner title.
+  UINT16                            LineNumber;   ///< 1-based line number.
+  UINT8                             Alignment;    ///< Left, center, or right-aligned.
+} EFI_IFR_BANNER;
+
+#define EFI_IFR_BANNER_ALIGN_LEFT   0
+#define EFI_IFR_BANNER_ALIGN_CENTER 1
+#define EFI_IFR_BANNER_ALIGN_RIGHT  2
+#define EFI_IFR_BANNER_TIMEOUT      0xFF
+
+#pragma pack()
+
+#endif

IntelFrameworkPkg/Include/Framework/Hob.h

@@ -0,0 +1,34 @@
+/** @file
+  This file defines the data structures per HOB specification v0.9.
+
+Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+  @par Revision Reference:
+  These definitions are from the HOB Spec 0.9 that were not adopted by the PI specifications.
+
+**/
+
+#ifndef _HOB_H_
+#define _HOB_H_
+
+///
+/// Capsule volume HOB -- identical to a firmware volume.
+/// This macro is defined to comply with the hob Framework Spec. And the marco was
+/// retired in the PI1.0 specification.  
+///
+#define EFI_HOB_TYPE_CV           0x0008
+
+typedef struct {
+  EFI_HOB_GENERIC_HEADER            Header;
+  EFI_PHYSICAL_ADDRESS              BaseAddress;
+  UINT64                            Length;
+} EFI_HOB_CAPSULE_VOLUME;
+
+#endif

IntelFrameworkPkg/Include/Framework/PeiCis.h

@@ -0,0 +1,211 @@
+/** @file
+  The Include file for definitions in the Intel Platform Innovation Framework for EFI
+  Pre-EFI Initialization Core Interface Specification (PEI CIS) Version 0.91.
+
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+**/
+
+#ifndef __PEICIS_H__
+#define __PEICIS_H__
+
+#include <Ppi/PciCfg.h>
+//
+// Framework PEI Specification Revision information
+//
+#define FRAMEWORK_PEI_SPECIFICATION_MAJOR_REVISION    0
+#define FRAMEWORK_PEI_SPECIFICATION_MINOR_REVISION    91
+
+
+//
+// PEI services signature and Revision defined in Framework PEI spec
+//
+#define FRAMEWORK_PEI_SERVICES_SIGNATURE               0x5652455320494550ULL
+#define FRAMEWORK_PEI_SERVICES_REVISION               ((FRAMEWORK_PEI_SPECIFICATION_MAJOR_REVISION<<16) | (FRAMEWORK_PEI_SPECIFICATION_MINOR_REVISION))
+
+
+
+typedef struct _FRAMEWORK_EFI_PEI_SERVICES FRAMEWORK_EFI_PEI_SERVICES;
+
+/**
+  The PEI Dispatcher will invoke each PEIM one time.  During this pass, the PEI 
+  Dispatcher will pass control to the PEIM at the AddressOfEntryPoint in the PE Header. 
+
+  @param  FfsHeader        The pointer to the FFS file header.
+  @param  PeiServices      Describes the list of possible PEI Services.
+
+  @return Status code
+
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_PEIM_ENTRY_POINT)(
+  IN EFI_FFS_FILE_HEADER            *FfsHeader,
+  IN EFI_PEI_SERVICES               **PeiServices
+  );
+  
+/**
+  This service abstracts the capability of the PEI 
+  Foundation to discover instances of firmware volumes in the system. 
+  Given the input file pointer, this service searches for the next 
+  matching file in the Firmware File System (FFS) volume.
+
+  @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.
+  @param  Instance         This instance of the firmware volume to find. The value 0 is the Boot Firmware Volume (BFV).
+  @param  FwVolHeader      The pointer to the firmware volume header of the volume to return.
+
+  @retval EFI_SUCCESS           The volume was found.
+  @retval EFI_NOT_FOUND         The volume was not found.
+  @retval EFI_INVALID_PARAMETER FwVolHeader is NULL
+
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_PEI_FFS_FIND_NEXT_VOLUME)(
+  IN FRAMEWORK_EFI_PEI_SERVICES     **PeiServices,
+  IN UINTN                          Instance,
+  IN OUT EFI_FIRMWARE_VOLUME_HEADER **FwVolHeader
+  );
+    
+/**
+  This service abstracts the capability of the PEI 
+  Foundation to discover instances of firmware files in the system. 
+  Given the input file pointer, this service searches for the next matching 
+  file in the Firmware File System (FFS) volume.
+
+  @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.
+  @param  SearchType       A filter to find files only of this type.
+  @param  FwVolHeader      The pointer to the firmware volume header of the volume to search. This parameter 
+                           must point to a valid FFS volume.
+  @param  FileHeader       The pointer to the current file from which to begin searching. Upon return this pointer will be 
+                           updated to reflect the file found.
+
+  @retval EFI_SUCCESS      The file was found.
+  @retval EFI_NOT_FOUND    The file was not found.
+  @retval EFI_NOT_FOUND    The header checksum was not zero.
+
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_PEI_FFS_FIND_NEXT_FILE)(
+  IN FRAMEWORK_EFI_PEI_SERVICES     **PeiServices,
+  IN EFI_FV_FILETYPE                SearchType,
+  IN EFI_FIRMWARE_VOLUME_HEADER     *FwVolHeader,
+  IN OUT EFI_FFS_FILE_HEADER        **FileHeader
+  );
+
+/**
+  Given the input file pointer, this service searches for the next 
+  matching file in the Firmware File System (FFS) volume. 
+
+  @param  PeiServices      An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.
+  @param  SectionType      The value of the section type to find.
+  @param  FfsFileHeader    A pointer to the file header that contains the set of sections to be searched.
+  @param  SectionData      A pointer to the discovered section, if successful.
+
+  @retval EFI_SUCCESS      The section was found.
+  @retval EFI_NOT_FOUND    The section was not found.
+
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_PEI_FFS_FIND_SECTION_DATA)(
+  IN FRAMEWORK_EFI_PEI_SERVICES     **PeiServices,
+  IN EFI_SECTION_TYPE               SectionType,
+  IN EFI_FFS_FILE_HEADER            *FfsFileHeader,
+  IN OUT VOID                       **SectionData
+  );
+
+///
+///  FRAMEWORK_EFI_PEI_SERVICES is a collection of functions whose implementation is provided by the PEI
+///  Foundation. The table may be located in the temporary or permanent memory, depending upon the capabilities 
+///  and phase of execution of PEI.
+///  
+///  These services fall into various classes, including the following:
+///  - Managing the boot mode.
+///  - Allocating both early and permanent memory.
+///  - Supporting the Firmware File System (FFS).
+///  - Abstracting the PPI database abstraction.
+///  - Creating Hand-Off Blocks (HOBs).
+///        
+struct _FRAMEWORK_EFI_PEI_SERVICES {
+  EFI_TABLE_HEADER                  Hdr;
+  //
+  // PPI Functions
+  //
+  EFI_PEI_INSTALL_PPI               InstallPpi;
+  EFI_PEI_REINSTALL_PPI             ReInstallPpi;
+  EFI_PEI_LOCATE_PPI                LocatePpi;
+  EFI_PEI_NOTIFY_PPI                NotifyPpi;
+  //
+  // Boot Mode Functions
+  //
+  EFI_PEI_GET_BOOT_MODE             GetBootMode;
+  EFI_PEI_SET_BOOT_MODE             SetBootMode;
+  //
+  // HOB Functions
+  //
+  EFI_PEI_GET_HOB_LIST              GetHobList;
+  EFI_PEI_CREATE_HOB                CreateHob;
+  //
+  // Firmware Volume Functions
+  //
+  EFI_PEI_FFS_FIND_NEXT_VOLUME      FfsFindNextVolume;
+  EFI_PEI_FFS_FIND_NEXT_FILE        FfsFindNextFile;
+  EFI_PEI_FFS_FIND_SECTION_DATA     FfsFindSectionData;
+  //
+  // PEI Memory Functions
+  //
+  EFI_PEI_INSTALL_PEI_MEMORY        InstallPeiMemory;
+  EFI_PEI_ALLOCATE_PAGES            AllocatePages;
+  EFI_PEI_ALLOCATE_POOL             AllocatePool;
+  EFI_PEI_COPY_MEM                  CopyMem;
+  EFI_PEI_SET_MEM                   SetMem;
+  //
+  // (the following interfaces are installed by publishing PEIM)
+  // Status Code
+  //
+  EFI_PEI_REPORT_STATUS_CODE        ReportStatusCode;
+  //
+  // Reset
+  //
+  EFI_PEI_RESET_SYSTEM              ResetSystem;
+  ///
+  /// Inconsistent with specification here: 
+  /// In Framework Spec, PeiCis0.91, CpuIo and PciCfg are NOT pointers. 
+  ///
+  
+  //
+  // I/O Abstractions
+  //
+  EFI_PEI_CPU_IO_PPI                *CpuIo;
+  EFI_PEI_PCI_CFG_PPI               *PciCfg;
+};
+///
+/// Enumeration of reset types defined in the Framework Specification PeiCis.
+///
+typedef enum {
+  ///
+  /// Used to induce a system-wide reset. This sets all circuitry within the 
+  /// system to its initial state.  This type of reset is asynchronous to system
+  /// operation and operates withgout regard to cycle boundaries.  EfiColdReset 
+  /// is tantamount to a system power cycle.
+  ///
+  EfiPeiResetCold,
+  ///
+  /// Used to induce a system-wide initialization. The processors are set to their
+  /// initial state, and pending cycles are not corrupted.  If the system does 
+  /// not support this reset type, then an EfiResetCold must be performed.
+  ///
+  EfiPeiResetWarm,
+} EFI_PEI_RESET_TYPE;
+
+#endif  
+

IntelFrameworkPkg/Include/Framework/SmmCis.h

@@ -0,0 +1,557 @@
+/** @file
+  Include file for definitions in the Intel Platform Innovation Framework for EFI
+  System Management Mode Core Interface Specification (SMM CIS) version 0.91.
+
+Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef _SMM_CIS_H_
+#define _SMM_CIS_H_
+
+//
+// Share some common definitions with PI SMM
+//
+#include <Pi/PiSmmCis.h>
+#include <Protocol/SmmCpuIo.h>
+
+typedef struct _EFI_SMM_SYSTEM_TABLE      EFI_SMM_SYSTEM_TABLE;
+
+//
+// SMM Base specification constant and types
+//
+#define EFI_SMM_SYSTEM_TABLE_REVISION (0 << 16) | (0x09)
+
+/**
+  Allocates pool memory from SMRAM for IA-32, or runtime memory for
+  the Itanium processor family.
+
+  @param  PoolType         The type of pool to allocate. The only supported type 
+                           is EfiRuntimeServicesData.
+  @param  Size             The number of bytes to allocate from the pool.
+  @param  Buffer           A pointer to a pointer to the allocated buffer if the 
+                           call succeeds.  Otherwise, undefined.
+
+  @retval EFI_SUCCESS           The requested number of bytes was allocated.
+  @retval EFI_OUT_OF_RESOURCES  The pool requested could not be allocated.
+  @retval EFI_UNSUPPORTED       In runtime.
+  @note  Inconsistent with specification here:
+         In Framework Spec, this definition is named EFI_SMM_ALLOCATE_POOL.  
+         To avoid a naming conflict, the definition is renamed.
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_SMMCORE_ALLOCATE_POOL)(
+  IN EFI_MEMORY_TYPE                PoolType,
+  IN UINTN                          Size,
+  OUT VOID                          **Buffer
+  );
+
+/**
+  Returns pool memory to the system.
+
+  @param  Buffer           The pointer to the buffer to free.
+
+  @retval EFI_SUCCESS           The memory was returned to the system.
+  @retval EFI_INVALID_PARAMETER Buffer was invalid.
+  @retval EFI_UNSUPPORTED       In runtime.
+  @note  Inconsistent with specification here:
+         In Framework Spec, this definition is named EFI_SMM_FREE_POOL.  
+         To avoid a naming conflict, the definition is renamed. 
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_SMMCORE_FREE_POOL)(
+  IN VOID                   *Buffer
+  );
+
+/**
+  Allocates memory pages from the system.
+
+  @param  Type             The type of allocation to perform.
+  @param  MemoryType       The only supported type is EfiRuntimeServicesData.
+  @param  NumberofPages    The number of contiguous 4 KB pages to allocate.
+  @param  Memory           Pointer to a physical address. On input, the way in which
+                           the address is used depends on the value of Type. On output, the address
+                           is set to the base of the page range that was allocated.
+
+  @retval EFI_SUCCESS           The requested pages were allocated.
+  @retval EFI_OUT_OF_RESOURCES  The pages requested could not be allocated.
+  @retval EFI_NOT_FOUND         The requested pages could not be found.
+  @retval EFI_INVALID_PARAMETER Type is not AllocateAnyPages or AllocateMaxAddress
+                                or AllocateAddress. Or, MemoryType is in the range EfiMaxMemoryType..0x7FFFFFFF.
+  @note  Inconsistent with specification here:
+         In the Framework Spec, this definition is named EFI_SMM_ALLOCATE_PAGES.  
+         To avoid a naming conflict, the definition here is renamed.
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_SMMCORE_ALLOCATE_PAGES)(
+  IN EFI_ALLOCATE_TYPE      Type,
+  IN EFI_MEMORY_TYPE        MemoryType,
+  IN UINTN                  NumberOfPages,
+  OUT EFI_PHYSICAL_ADDRESS  *Memory
+  );
+
+/**
+  Frees memory pages for the system.
+
+  @param  Memory           The base physical address of the pages to be freed.
+  @param  NumberOfPages    The number of contiguous 4 KB pages to free.
+
+  @retval EFI_SUCCESS           The requested memory pages were freed.
+  @retval EFI_INVALID_PARAMETER Memory is not a page-aligned address or NumberOfPages is invalid.
+  @retval EFI_NOT_FOUND         The requested memory pages were not allocated with SmmAllocatePages().
+  
+  @note  Inconsistent with specification here:
+         In the Framework Spec, this definition is named EFI_SMM_FREE_PAGES.  
+         To avoid a naming conflict, the definition here is renamed.
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_SMMCORE_FREE_PAGES)(
+  IN EFI_PHYSICAL_ADDRESS   Memory,
+  IN UINTN                  NumberOfPages
+  );
+
+///
+/// The processor save-state information for IA-32 processors. This information is important in that the
+/// SMM drivers may need to ascertain the state of the processor before invoking the SMI.
+///
+typedef struct {
+  ///
+  /// Reserved for future processors. As such, software should not attempt to interpret or
+  /// write to this region.
+  ///
+  UINT8                 Reserved1[248];
+  ///
+  /// The location of the processor SMBASE, which is the location where the processor
+  /// will pass control upon receipt of an SMI.
+  ///
+  UINT32                SMBASE;
+  ///
+  /// The revision of the SMM save state. This value is set by the processor.
+  ///
+  UINT32                SMMRevId;
+  ///
+  /// The value of the I/O restart field. Allows for restarting an in-process I/O instruction.
+  ///
+  UINT16                IORestart;
+  ///
+  /// Describes behavior that should be commenced in response to a halt instruction.
+  ///
+  UINT16                AutoHALTRestart;
+  ///
+  /// Reserved for future processors. As such, software should not attempt to interpret or
+  /// write to this region.
+  ///
+  UINT8                 Reserved2[164];
+
+  //
+  // Registers in IA-32 processors. 
+  //
+  UINT32                ES;
+  UINT32                CS;
+  UINT32                SS;
+  UINT32                DS;
+  UINT32                FS;
+  UINT32                GS;
+  UINT32                LDTBase;
+  UINT32                TR;
+  UINT32                DR7;
+  UINT32                DR6;
+  UINT32                EAX;
+  UINT32                ECX;
+  UINT32                EDX;
+  UINT32                EBX;
+  UINT32                ESP;
+  UINT32                EBP;
+  UINT32                ESI;
+  UINT32                EDI;
+  UINT32                EIP;
+  UINT32                EFLAGS;
+  UINT32                CR3;
+  UINT32                CR0;
+} EFI_SMI_CPU_SAVE_STATE;
+
+///
+/// The processor save-state information for the Itanium processor family. This information is
+/// important in that the SMM drivers may need to ascertain the state of the processor before invoking
+/// the PMI. This structure is mandatory and must be 512 byte aligned.
+/// 
+typedef struct {
+  UINT64   reserved;
+  UINT64   r1;
+  UINT64   r2;
+  UINT64   r3;
+  UINT64   r4;
+  UINT64   r5;
+  UINT64   r6;
+  UINT64   r7;
+  UINT64   r8;
+  UINT64   r9;
+  UINT64   r10;
+  UINT64   r11;
+  UINT64   r12;
+  UINT64   r13;
+  UINT64   r14;
+  UINT64   r15;
+  UINT64   r16;
+  UINT64   r17;
+  UINT64   r18;
+  UINT64   r19;
+  UINT64   r20;
+  UINT64   r21;
+  UINT64   r22;
+  UINT64   r23;
+  UINT64   r24;
+  UINT64   r25;
+  UINT64   r26;
+  UINT64   r27;
+  UINT64   r28;
+  UINT64   r29;
+  UINT64   r30;
+  UINT64   r31;
+
+  UINT64   pr;
+
+  UINT64   b0;
+  UINT64   b1;
+  UINT64   b2;
+  UINT64   b3;
+  UINT64   b4;
+  UINT64   b5;
+  UINT64   b6;
+  UINT64   b7;
+
+  // application registers
+  UINT64   ar_rsc;
+  UINT64   ar_bsp;
+  UINT64   ar_bspstore;
+  UINT64   ar_rnat;
+
+  UINT64   ar_fcr;
+
+  UINT64   ar_eflag;
+  UINT64   ar_csd;
+  UINT64   ar_ssd;
+  UINT64   ar_cflg;
+  UINT64   ar_fsr;
+  UINT64   ar_fir;
+  UINT64   ar_fdr;
+
+  UINT64   ar_ccv;
+
+  UINT64   ar_unat;
+
+  UINT64   ar_fpsr;
+
+  UINT64   ar_pfs;
+  UINT64   ar_lc;
+  UINT64   ar_ec;
+
+  // control registers
+  UINT64   cr_dcr;
+  UINT64   cr_itm;
+  UINT64   cr_iva;
+  UINT64   cr_pta;
+  UINT64   cr_ipsr;
+  UINT64   cr_isr;
+  UINT64   cr_iip;
+  UINT64   cr_ifa;
+  UINT64   cr_itir;
+  UINT64   cr_iipa;
+  UINT64   cr_ifs;
+  UINT64   cr_iim;
+  UINT64   cr_iha;
+
+  // debug registers
+  UINT64   dbr0;
+  UINT64   dbr1;
+  UINT64   dbr2;
+  UINT64   dbr3;
+  UINT64   dbr4;
+  UINT64   dbr5;
+  UINT64   dbr6;
+  UINT64   dbr7;
+
+  UINT64   ibr0;
+  UINT64   ibr1;
+  UINT64   ibr2;
+  UINT64   ibr3;
+  UINT64   ibr4;
+  UINT64   ibr5;
+  UINT64   ibr6;
+  UINT64   ibr7;
+
+  // virtual registers
+  UINT64   int_nat;         // nat bits for R1-R31
+
+} EFI_PMI_SYSTEM_CONTEXT;
+
+///
+/// The processor save-state information for IA-32 and Itanium processors. This information is
+/// important in that the SMM drivers may need to ascertain the state of the processor before invoking
+/// the SMI or PMI.
+///
+typedef union {
+  ///
+  /// The processor save-state information for IA-32 processors. 
+  ///
+  EFI_SMI_CPU_SAVE_STATE     Ia32SaveState;
+  ///
+  /// Note: Inconsistency with the Framework SMM CIS spec - Itanium save state not included.
+  ///
+  /// The processor save-state information for Itanium processors.
+  ///
+  /// EFI_PMI_SYSTEM_CONTEXT ItaniumSaveState;
+} EFI_SMM_CPU_SAVE_STATE;
+
+///
+/// The optional floating point save-state information for IA-32 processors. If the optional floating
+/// point save is indicated for any handler, the following data structure must be preserved.
+///
+typedef struct {
+  UINT16                Fcw;
+  UINT16                Fsw;
+  UINT16                Ftw;
+  UINT16                Opcode;
+  UINT32                Eip;
+  UINT16                Cs;
+  UINT16                Rsvd1;
+  UINT32                DataOffset;
+  UINT16                Ds;
+  UINT8                 Rsvd2[10];
+  UINT8                 St0Mm0[10], Rsvd3[6];
+  UINT8                 St0Mm1[10], Rsvd4[6];
+  UINT8                 St0Mm2[10], Rsvd5[6];
+  UINT8                 St0Mm3[10], Rsvd6[6];
+  UINT8                 St0Mm4[10], Rsvd7[6];
+  UINT8                 St0Mm5[10], Rsvd8[6];
+  UINT8                 St0Mm6[10], Rsvd9[6];
+  UINT8                 St0Mm7[10], Rsvd10[6];
+  UINT8                 Rsvd11[22*16];
+} EFI_SMI_OPTIONAL_FPSAVE_STATE;
+
+///
+/// The optional floating point save-state information for the Itanium processor family. If the optional
+/// floating point save is indicated for any handler, then this data structure must be preserved. 
+/// 
+typedef struct {
+  UINT64   f2[2];
+  UINT64   f3[2];
+  UINT64   f4[2];
+  UINT64   f5[2];
+  UINT64   f6[2];
+  UINT64   f7[2];
+  UINT64   f8[2];
+  UINT64   f9[2];
+  UINT64   f10[2];
+  UINT64   f11[2];
+  UINT64   f12[2];
+  UINT64   f13[2];
+  UINT64   f14[2];
+  UINT64   f15[2];
+  UINT64   f16[2];
+  UINT64   f17[2];
+  UINT64   f18[2];
+  UINT64   f19[2];
+  UINT64   f20[2];
+  UINT64   f21[2];
+  UINT64   f22[2];
+  UINT64   f23[2];
+  UINT64   f24[2];
+  UINT64   f25[2];
+  UINT64   f26[2];
+  UINT64   f27[2];
+  UINT64   f28[2];
+  UINT64   f29[2];
+  UINT64   f30[2];
+  UINT64   f31[2];
+} EFI_PMI_OPTIONAL_FLOATING_POINT_CONTEXT;
+
+///
+/// The processor save-state information for IA-32 and Itanium processors. If the optional floating
+/// point save is indicated for any handler, then this data structure must be preserved.
+///
+typedef union {
+  /// 
+  /// The optional floating point save-state information for IA-32 processors. 
+  ///
+  EFI_SMI_OPTIONAL_FPSAVE_STATE             Ia32FpSave;
+  ///
+  /// The optional floating point save-state information for Itanium processors. 
+  ///
+  EFI_PMI_OPTIONAL_FLOATING_POINT_CONTEXT   ItaniumFpSave;
+} EFI_SMM_FLOATING_POINT_SAVE_STATE;
+
+/**
+  This function is the main entry point for an SMM handler dispatch
+  or communicate-based callback.
+
+  @param  SmmImageHandle   A unique value returned by the SMM infrastructure
+                           in response to registration for a communicate-based callback or dispatch.
+  @param  CommunicationBuffer
+                           An optional buffer that will be populated
+                           by the SMM infrastructure in response to a non-SMM agent (preboot or runtime)
+                           invoking the EFI_SMM_BASE_PROTOCOL.Communicate() service.
+  @param  SourceSize       If CommunicationBuffer is non-NULL, this field
+                           indicates the size of the data payload in this buffer.
+
+  @return Status Code
+
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_SMM_HANDLER_ENTRY_POINT)(
+  IN EFI_HANDLE             SmmImageHandle,
+  IN OUT VOID               *CommunicationBuffer OPTIONAL,
+  IN OUT UINTN              *SourceSize OPTIONAL
+  );
+
+/**
+  The SmmInstallConfigurationTable() function is used to maintain the list
+  of configuration tables that are stored in the System Management System
+  Table.  The list is stored as an array of (GUID, Pointer) pairs.  The list
+  must be allocated from pool memory with PoolType set to EfiRuntimeServicesData.
+
+  @param  SystemTable      A pointer to the SMM System Table.
+  @param  Guid             A pointer to the GUID for the entry to add, update, or remove.
+  @param  Table            A pointer to the buffer of the table to add.
+  @param  TableSize        The size of the table to install.
+
+  @retval EFI_SUCCESS           The (Guid, Table) pair was added, updated, or removed.
+  @retval EFI_INVALID_PARAMETER Guid is not valid.
+  @retval EFI_NOT_FOUND         An attempt was made to delete a non-existent entry.
+  @retval EFI_OUT_OF_RESOURCES  There is not enough memory available to complete the operation.
+
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_SMM_INSTALL_CONFIGURATION_TABLE)(
+  IN EFI_SMM_SYSTEM_TABLE         *SystemTable,
+  IN EFI_GUID                     *Guid,
+  IN VOID                         *Table,
+  IN UINTN                        TableSize
+  );
+
+//
+// System Management System Table (SMST)
+//
+struct _EFI_SMM_SYSTEM_TABLE {
+  ///
+  /// The table header for the System Management System Table (SMST). 
+  ///
+  EFI_TABLE_HEADER                    Hdr;
+
+  ///
+  /// A pointer to a NULL-terminated Unicode string containing the vendor name. It is
+  /// permissible for this pointer to be NULL.
+  ///
+  CHAR16                              *SmmFirmwareVendor;
+  ///
+  /// The particular revision of the firmware.
+  ///
+  UINT32                              SmmFirmwareRevision;
+
+  ///
+  /// Adds, updates, or removes a configuration table entry from the SMST. 
+  ///
+  EFI_SMM_INSTALL_CONFIGURATION_TABLE SmmInstallConfigurationTable;
+
+  //
+  // I/O Services
+  //
+  ///
+  /// A GUID that designates the particular CPU I/O services. 
+  ///
+  EFI_GUID                            EfiSmmCpuIoGuid;
+  ///
+  /// Provides the basic memory and I/O interfaces that are used to abstract accesses to
+  /// devices.
+  ///
+  EFI_SMM_CPU_IO_INTERFACE            SmmIo;
+
+  //
+  // Runtime memory service
+  //
+  ///
+  ///
+  /// Allocates pool memory from SMRAM for IA-32 or runtime memory for the
+  /// Itanium processor family.
+  ///
+  EFI_SMMCORE_ALLOCATE_POOL           SmmAllocatePool;
+  ///
+  /// Returns pool memory to the system. 
+  ///
+  EFI_SMMCORE_FREE_POOL               SmmFreePool;
+  ///
+  /// Allocates memory pages from the system. 
+  ///
+  EFI_SMMCORE_ALLOCATE_PAGES          SmmAllocatePages;
+  ///
+  /// Frees memory pages for the system.
+  ///
+  EFI_SMMCORE_FREE_PAGES              SmmFreePages;
+
+  //
+  // MP service
+  //
+  
+  /// Inconsistent with specification here:
+  ///  In Framework Spec, this definition does not exist. This method is introduced in PI1.1 specification for 
+  ///  the implementation needed.
+  EFI_SMM_STARTUP_THIS_AP             SmmStartupThisAp;
+
+  //
+  // CPU information records
+  //
+  ///
+  /// A 1-relative number between 1 and the NumberOfCpus field. This field designates
+  /// which processor is executing the SMM infrastructure. This number also serves as an
+  /// index into the CpuSaveState and CpuOptionalFloatingPointState
+  /// fields.
+  ///
+  UINTN                               CurrentlyExecutingCpu;
+  ///
+  /// The number of EFI Configuration Tables in the buffer
+  /// SmmConfigurationTable.
+  ///
+  UINTN                               NumberOfCpus;
+  ///
+  /// A pointer to the EFI Configuration Tables. The number of entries in the table is
+  /// NumberOfTableEntries.
+  ///
+  EFI_SMM_CPU_SAVE_STATE              *CpuSaveState;
+  ///
+  /// A pointer to a catenation of the EFI_SMM_FLOATING_POINT_SAVE_STATE.
+  /// The size of this entire table is NumberOfCpus* size of the
+  /// EFI_SMM_FLOATING_POINT_SAVE_STATE. These fields are populated only if
+  /// there is at least one SMM driver that has registered for a callback with the
+  /// FloatingPointSave field in EFI_SMM_BASE_PROTOCOL.RegisterCallback() set to TRUE.
+  ///
+  EFI_SMM_FLOATING_POINT_SAVE_STATE   *CpuOptionalFloatingPointState;
+
+  //
+  // Extensibility table
+  //
+  ///
+  /// The number of EFI Configuration Tables in the buffer
+  /// SmmConfigurationTable.
+  ///
+  UINTN                               NumberOfTableEntries;
+  ///
+  /// A pointer to the EFI Configuration Tables. The number of entries in the table is
+  /// NumberOfTableEntries.
+  ///
+  EFI_CONFIGURATION_TABLE             *SmmConfigurationTable;
+};
+
+#endif

IntelFrameworkPkg/Include/Framework/StatusCode.h

@@ -0,0 +1,161 @@
+/** @file
+  Status Code Definitions, according to Intel Platform Innovation Framework
+  for EFI Status Codes Specification
+
+Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+  @par Revision Reference:
+  Intel Platform Innovation Framework for EFI Status Codes Specification
+  Version 0.92.
+
+**/
+
+#ifndef _FRAMEWORK_STATUS_CODE_H_
+#define _FRAMEWORK_STATUS_CODE_H_
+
+//
+// Required for X64 defines for CPU exception types
+//
+#include <Protocol/DebugSupport.h>
+
+///
+/// Software Class DXE BS Driver Subclass Progress Code definitions.
+///
+/// Inconsistent with specification here: 
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. 
+///
+///@{
+#define EFI_SW_DXE_BS_PC_BEGIN_CONNECTING_DRIVERS     (EFI_SUBCLASS_SPECIFIC | 0x00000005)
+#define EFI_SW_DXE_BS_PC_VERIFYING_PASSWORD           (EFI_SUBCLASS_SPECIFIC | 0x00000006)
+///@}
+
+///
+/// Software Class DXE RT Driver Subclass Progress Code definitions.
+///
+/// Inconsistent with specification here: 
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. 
+///
+///@{
+#define EFI_SW_DXE_RT_PC_S0 (EFI_SUBCLASS_SPECIFIC | 0x00000000)
+#define EFI_SW_DXE_RT_PC_S1 (EFI_SUBCLASS_SPECIFIC | 0x00000001)
+#define EFI_SW_DXE_RT_PC_S2 (EFI_SUBCLASS_SPECIFIC | 0x00000002)
+#define EFI_SW_DXE_RT_PC_S3 (EFI_SUBCLASS_SPECIFIC | 0x00000003)
+#define EFI_SW_DXE_RT_PC_S4 (EFI_SUBCLASS_SPECIFIC | 0x00000004)
+#define EFI_SW_DXE_RT_PC_S5 (EFI_SUBCLASS_SPECIFIC | 0x00000005)
+///@}
+
+///
+/// Software Subclass definitions.
+///
+/// Inconsistent with specification here: 
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. 
+///
+#define EFI_SOFTWARE_X64_EXCEPTION        (EFI_SOFTWARE | 0x00130000)
+
+///
+/// Software Class X64 Exception Subclass Error Code definitions.
+/// These exceptions are derived from the debug protocol definitions in the EFI
+/// specification.
+///
+/// Inconsistent with specification here: 
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. 
+///
+///@{
+#define EFI_SW_EC_X64_DIVIDE_ERROR      EXCEPT_X64_DIVIDE_ERROR
+#define EFI_SW_EC_X64_DEBUG             EXCEPT_X64_DEBUG
+#define EFI_SW_EC_X64_NMI               EXCEPT_X64_NMI
+#define EFI_SW_EC_X64_BREAKPOINT        EXCEPT_X64_BREAKPOINT
+#define EFI_SW_EC_X64_OVERFLOW          EXCEPT_X64_OVERFLOW
+#define EFI_SW_EC_X64_BOUND             EXCEPT_X64_BOUND
+#define EFI_SW_EC_X64_INVALID_OPCODE    EXCEPT_X64_INVALID_OPCODE
+#define EFI_SW_EC_X64_DOUBLE_FAULT      EXCEPT_X64_DOUBLE_FAULT
+#define EFI_SW_EC_X64_INVALID_TSS       EXCEPT_X64_INVALID_TSS
+#define EFI_SW_EC_X64_SEG_NOT_PRESENT   EXCEPT_X64_SEG_NOT_PRESENT
+#define EFI_SW_EC_X64_STACK_FAULT       EXCEPT_X64_STACK_FAULT
+#define EFI_SW_EC_X64_GP_FAULT          EXCEPT_X64_GP_FAULT
+#define EFI_SW_EC_X64_PAGE_FAULT        EXCEPT_X64_PAGE_FAULT
+#define EFI_SW_EC_X64_FP_ERROR          EXCEPT_X64_FP_ERROR
+#define EFI_SW_EC_X64_ALIGNMENT_CHECK   EXCEPT_X64_ALIGNMENT_CHECK
+#define EFI_SW_EC_X64_MACHINE_CHECK     EXCEPT_X64_MACHINE_CHECK
+#define EFI_SW_EC_X64_SIMD              EXCEPT_X64_SIMD
+///@}
+
+///
+/// Software Class EFI After Life Subclass Progress Code definitions.
+///
+///@{
+#define EFI_SW_AL_PC_ENTRY_POINT    (EFI_SUBCLASS_SPECIFIC | 0x00000000)
+#define EFI_SW_AL_PC_RETURN_TO_LAST (EFI_SUBCLASS_SPECIFIC | 0x00000001)
+///@}
+
+///
+/// Software Class DXE Core Subclass Error Code definitions.
+///
+/// Inconsistent with specification here: 
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. 
+///
+#define EFI_SW_CSM_LEGACY_ROM_INIT                (EFI_SUBCLASS_SPECIFIC | 0x00000000)   
+
+///
+/// IO Bus Class ATA/ATAPI Subclass Progress Code definitions.
+///
+///
+/// Inconsistent with specification here: 
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. 
+///
+///@{
+#define EFI_IOB_ATA_BUS_SMART_ENABLE          (EFI_SUBCLASS_SPECIFIC | 0x00000000)
+#define EFI_IOB_ATA_BUS_SMART_DISABLE         (EFI_SUBCLASS_SPECIFIC | 0x00000001)
+#define EFI_IOB_ATA_BUS_SMART_OVERTHRESHOLD   (EFI_SUBCLASS_SPECIFIC | 0x00000002)
+#define EFI_IOB_ATA_BUS_SMART_UNDERTHRESHOLD  (EFI_SUBCLASS_SPECIFIC | 0x00000003)
+///@}
+
+///
+/// IO Bus Class ATA/ATAPI Subclass Error Code definitions.
+///
+///
+/// Inconsistent with specification here: 
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. 
+///
+///@{
+#define EFI_IOB_ATA_BUS_SMART_NOTSUPPORTED  (EFI_SUBCLASS_SPECIFIC | 0x00000000)
+#define EFI_IOB_ATA_BUS_SMART_DISABLED      (EFI_SUBCLASS_SPECIFIC | 0x00000001)
+///@}
+
+///
+/// The reason that the processor was disabled.
+///
+/// Inconsistent with specification here: 
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. 
+///
+///@{
+#define EFI_CPU_CAUSE_NOT_DISABLED              0x0000
+///@}
+
+///
+/// Software Class PEI Module Subclass Progress Code definitions.
+///
+///@{
+#define EFI_SW_PEIM_PC_RECOVERY_BEGIN  EFI_SW_PEI_PC_RECOVERY_BEGIN
+#define EFI_SW_PEIM_PC_CAPSULE_LOAD    EFI_SW_PEI_PC_CAPSULE_LOAD
+#define EFI_SW_PEIM_PC_CAPSULE_START   EFI_SW_PEI_PC_CAPSULE_START
+#define EFI_SW_PEIM_PC_RECOVERY_USER   EFI_SW_PEI_PC_RECOVERY_USER
+#define EFI_SW_PEIM_PC_RECOVERY_AUTO   EFI_SW_PEI_PC_RECOVERY_AUTO
+///@}
+
+///
+/// Software Class PEI Core Subclass Error Code definitions.
+///
+///@{
+#define EFI_SW_PEIM_CORE_EC_DXE_CORRUPT       EFI_SW_PEI_CORE_EC_DXE_CORRUPT
+#define EFI_SW_PEIM_CORE_EC_DXEIPL_NOT_FOUND  EFI_SW_PEI_CORE_EC_DXEIPL_NOT_FOUND
+///@}
+
+#endif

IntelFrameworkPkg/Include/FrameworkDxe.h

@@ -0,0 +1,32 @@
+/** @file
+  The root header file that provides Framework extension to UEFI/PI for modules. It can be included by 
+  DXE, RUNTIME and SMM type modules that use Framework definitions.
+
+
+  This header file includes Framework extension definitions common to DXE
+  modules.
+
+Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                          
+    
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+
+#ifndef _FRAMEWORK_DXE_H_
+#define _FRAMEWORK_DXE_H_
+
+#include <PiDxe.h>
+
+#include <Framework/FrameworkInternalFormRepresentation.h>
+#include <Framework/FirmwareVolumeImageFormat.h>
+#include <Framework/FirmwareVolumeHeader.h>
+#include <Framework/Hob.h>
+#include <Framework/BootScript.h>
+#include <Framework/StatusCode.h>
+#include <Framework/DxeCis.h>
+
+#endif

IntelFrameworkPkg/IntelFrameworkPkg.dec

@@ -0,0 +1,186 @@
+## @file
+# Intel Framework Package Reference Implementations
+#
+# This package provides definitions and libraries that comply to Intel Framework Specifications.
+# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
+#
+#    This program and the accompanying materials are licensed and made available
+#    under the terms and conditions of the BSD License which accompanies this distribution.
+#    The full text of the license may be found at http://opensource.org/licenses/bsd-license.php
+#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
+#    OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+##
+
+[Defines]
+  DEC_SPECIFICATION              = 0x00010005
+  PACKAGE_NAME                   = IntelFrameworkPkg
+  PACKAGE_UNI_FILE               = IntelFrameworkPkg.uni
+  PACKAGE_GUID                   = 2759ded5-bb57-4b06-af4f-c398fa552719
+  PACKAGE_VERSION                = 0.96
+
+[Includes]
+  Include                        # Root include for the package
+
+[Guids]
+  ## Include/Guid/DataHubRecords.h
+  gEfiCacheSubClassGuid          = { 0x7f0013a7, 0xdc79, 0x4b22, { 0x80, 0x99, 0x11, 0xf7, 0x5f, 0xdc, 0x82, 0x9d }}
+
+  ## Include/Guid/DataHubRecords.h
+  gEfiMemorySubClassGuid         = { 0x4E8F4EBB, 0x64B9, 0x4e05, { 0x9b, 0x18, 0x4c, 0xfe, 0x49, 0x23, 0x50, 0x97 }}
+
+  ## Include/Guid/DataHubRecords.h
+  gEfiMiscSubClassGuid           = { 0x772484B2, 0x7482, 0x4b91, { 0x9f, 0x9a, 0xad, 0x43, 0xf8, 0x1c, 0x58, 0x81 }}
+
+  ## Include/Guid/DataHubRecords.h
+  gEfiProcessorSubClassGuid      = { 0x26fdeb7e, 0xb8af, 0x4ccf, { 0xaa, 0x97, 0x02, 0x63, 0x3c, 0xe4, 0x8c, 0xa7 }}
+
+  ## Include/Guid/Capsule.h
+  gEfiCapsuleGuid                = { 0x3B6686BD, 0x0D76, 0x4030, { 0xB7, 0x0E, 0xB5, 0x51, 0x9E, 0x2F, 0xC5, 0xA0 }}
+
+  ## Include/Guid/Capsule.h
+  gEfiConfigFileNameGuid         = { 0x98B8D59B, 0xE8BA, 0x48EE, { 0x98, 0xDD, 0xC2, 0x95, 0x39, 0x2F, 0x1E, 0xDB }}
+
+  ## Include/Guid/SmramMemoryReserve.h
+  gEfiSmmPeiSmramMemoryReserveGuid = { 0x6dadf1d1, 0xd4cc, 0x4910, { 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d }}
+
+  ## Include/Guid/SmmCommunicate.h
+  gSmmCommunicateHeaderGuid      = { 0xf328e36c, 0x23b6, 0x4a95, { 0x85, 0x4b, 0x32, 0xe1, 0x95, 0x34, 0xcd, 0x75 }}
+
+  ## Include/Guid/FirmwareFileSystem.h
+  gEfiFirmwareFileSystemGuid     = { 0x7A9354D9, 0x0468, 0x444a, {0x81, 0xCE, 0x0B, 0xF6, 0x17, 0xD8, 0x90, 0xDF }}
+
+  ## Include/Guid/BlockIo.h
+  gEfiPeiIdeBlockIoPpiGuid       = { 0x964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
+
+  ## Include/Guid/BlockIo.h
+  gEfiPei144FloppyBlockIoPpiGuid = { 0xda6855bd, 0x07b7, 0x4c05, { 0x9e, 0xd8, 0xe2, 0x59, 0xfd, 0x36, 0x0e, 0x22 }}
+
+[Ppis]
+  ## Include/Ppi/BootScriptExecuter.h
+  gEfiPeiBootScriptExecuterPpiGuid  = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff }}
+
+  ## Include/Ppi/Security.h
+  gEfiPeiSecurityPpiGuid            = { 0x1388066E, 0x3A57, 0x4EFA, { 0x98, 0xF3, 0xC1, 0x2F, 0x3A, 0x95, 0x8A, 0x29 }}
+
+  ## Include/Ppi/Smbus.h
+  gEfiPeiSmbusPpiGuid               = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xda }}
+
+  ## Include/Ppi/PciCfg.h
+  gEfiPciCfgPpiInServiceTableGuid   = { 0xe1f2eba0, 0xf7b9, 0x4a26, { 0x86, 0x20, 0x13, 0x12, 0x21, 0x64, 0x2a, 0x90 }}
+
+  ## Include/Ppi/ReadOnlyVariable.h
+  gEfiPeiReadOnlyVariablePpiGuid    = { 0x3CDC90C6, 0x13FB, 0x4A75, { 0x9E, 0x79, 0x59, 0xE9, 0xDD, 0x78, 0xB9, 0xFA }}
+
+  ## Include/Ppi/SectionExtraction.h
+  gEfiPeiSectionExtractionPpiGuid   = { 0x4F89E208, 0xE144, 0x4804, { 0x9E, 0xC8, 0x0F, 0x89, 0x4F, 0x7E, 0x36, 0xD7 }}
+
+  ## Include/Ppi/FvLoadFile.h
+  gEfiPeiFvFileLoaderPpiGuid        = { 0x7e1f0d85, 0x4ff,  0x4bb2, { 0x86, 0x6a, 0x31, 0xa2, 0x99, 0x6a, 0x48, 0xa8 }}
+
+  ## Include/Ppi/FindFv.h
+  gEfiFindFvPpiGuid                 = { 0x36164812, 0xa023, 0x44e5, { 0xbd, 0x85, 0x05, 0xbf, 0x3c, 0x77, 0x00, 0xaa }}
+  
+  ## Include/Ppi/S3Resume.h
+  gEfiPeiS3ResumePpiGuid            = { 0x4426CCB2, 0xE684, 0x4a8a, { 0xae, 0x40, 0x20, 0xd4, 0xb0, 0x25, 0xb7, 0x10 }}
+
+[Protocols]
+  ## Include/Protocol/AcpiS3Save.h
+  gEfiAcpiS3SaveProtocolGuid     = { 0x125F2DE1, 0xFB85, 0x440C, { 0xA5, 0x4C, 0x4D, 0x99, 0x35, 0x8A, 0x8D, 0x38 }}
+
+  ## Include/Protocol/AcpiSupport.h
+  gEfiAcpiSupportProtocolGuid    = { 0xdbff9d55, 0x89b7, 0x46da, { 0xbd, 0xdf, 0x67, 0x7d, 0x3d, 0xc0, 0x24, 0x1d }}
+
+  ## Include/Protocol/BootScriptSave.h
+  gEfiBootScriptSaveProtocolGuid = { 0x470e1529, 0xb79e, 0x4e32, { 0xa0, 0xfe, 0x6a, 0x15, 0x6d, 0x29, 0xf9, 0xb2 }}
+
+  ## Include/Protocol/LegacyBios.h
+  gEfiLegacyBiosProtocolGuid     = { 0xdb9a1e3d, 0x45cb, 0x4abb, { 0x85, 0x3b, 0xe5, 0x38, 0x7f, 0xdb, 0x2e, 0x2d }}
+
+  ## Include/Protocol/LegacyBiosPlatform.h
+  gEfiLegacyBiosPlatformProtocolGuid = { 0x783658a3, 0x4172, 0x4421, { 0xa2, 0x99, 0xe0, 0x09, 0x07, 0x9c, 0x0c, 0xb4 }}
+
+  ## Include/Protocol/LegacyInterrupt.h
+  gEfiLegacyInterruptProtocolGuid = { 0x31ce593d, 0x108a, 0x485d, { 0xad, 0xb2, 0x78, 0xf2, 0x1f, 0x29, 0x66, 0xbe }}
+
+  ## Include/Protocol/LegacyRegion.h
+  gEfiLegacyRegionProtocolGuid   = { 0x0fc9013a, 0x0568, 0x4ba9, { 0x9b, 0x7e, 0xc9, 0xc3, 0x90, 0xa6, 0x60, 0x9b }}
+
+  ## Include/Protocol/Legacy8259.h
+  gEfiLegacy8259ProtocolGuid     = { 0x38321dba, 0x4fe0, 0x4e17, { 0x8a, 0xec, 0x41, 0x30, 0x55, 0xea, 0xed, 0xc1 }}
+
+  ## Include/Protocol/CpuIo.h
+  gEfiCpuIoProtocolGuid          = { 0xB0732526, 0x38C8, 0x4b40, { 0x88, 0x77, 0x61, 0xc7, 0xb0, 0x6a, 0xac, 0x45 }}
+
+  ## Include/Protocol/DataHub.h
+  gEfiDataHubProtocolGuid        = { 0xae80d021, 0x618e, 0x11d4, { 0xbc, 0xd7, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81 }}
+
+  ## Include/Protocol/FirmwareVolume.h
+  gEfiFirmwareVolumeProtocolGuid = { 0x389F751F, 0x1838, 0x4388, { 0x83, 0x90, 0xcd, 0x81, 0x54, 0xbd, 0x27, 0xf8 }}
+
+  ## Include/Protocol/SectionExtraction.h
+  gEfiSectionExtractionProtocolGuid = { 0x448F5DA4, 0x6DD7, 0x4FE1, { 0x93, 0x07, 0x69, 0x22, 0x41, 0x92, 0x21, 0x5D }}
+
+  ## Include/Protocol/FrameworkHii.h
+  gEfiHiiProtocolGuid            = { 0xd7ad636e, 0xb997, 0x459b, { 0xbf, 0x3f, 0x88, 0x46, 0x89, 0x79, 0x80, 0xe1 }}
+
+  ## Include/Protocol/FrameworkHii.h
+  gEfiHiiCompatibilityProtocolGuid = { 0x5542cce1, 0xdf5c, 0x4d1b, { 0xab, 0xca, 0x36, 0x4f, 0x77, 0xd3, 0x99, 0xfb }}
+
+  ## Include/Protocol/FrameworkMpService.h
+  gFrameworkEfiMpServiceProtocolGuid = { 0xf33261e7, 0x23cb, 0x11d5, {0xbd, 0x5c, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81}}
+
+  ## Include/Protocol/SmmBase.h
+  gEfiSmmBaseProtocolGuid        = { 0x1390954D, 0xda95, 0x4227, { 0x93, 0x28, 0x72, 0x82, 0xc2, 0x17, 0xda, 0xa8 }}
+
+  ## Include/Protocol/SmmAccess.h
+  gEfiSmmAccessProtocolGuid      = { 0x3792095a, 0xe309, 0x4c1e, { 0xaa, 0x01, 0x85, 0xf5, 0x65, 0x5a, 0x17, 0xf1 }}
+
+  ## Include/Protocol/SmmControl.h
+  gEfiSmmControlProtocolGuid     = { 0x8d12e231, 0xc667, 0x4fd1, { 0x98, 0xf2, 0x24, 0x49, 0xa7, 0xe7, 0xb2, 0xe5 }}
+
+  ## Include/Protocol/SmmSwDispatch.h
+  gEfiSmmSwDispatchProtocolGuid  = { 0xe541b773, 0xdd11, 0x420c, { 0xb0, 0x26, 0xdf, 0x99, 0x36, 0x53, 0xf8, 0xbf }}
+
+  ## Include/Protocol/SmmSxDispatch.h
+  gEfiSmmSxDispatchProtocolGuid  = { 0x14fc52be, 0x01dc, 0x426c, { 0x91, 0xae, 0xa2, 0x3c, 0x3e, 0x22, 0x0a, 0xe8 }}
+
+  ## Include/Protocol/SmmPeriodicTimerDispatch.h
+  gEfiSmmPeriodicTimerDispatchProtocolGuid = { 0x9cca03fc, 0x4c9e, 0x4a19, { 0x9b, 0x06, 0xed, 0x7b, 0x47, 0x9b, 0xde, 0x55 }}
+
+  ## Include/Protocol/SmmUsbDispatch.h
+  gEfiSmmUsbDispatchProtocolGuid = { 0xa05b6ffd, 0x87af, 0x4e42, { 0x95, 0xc9, 0x62, 0x28, 0xb6, 0x3c, 0xf3, 0xf3 }}
+
+  ## Include/Protocol/SmmGpiDispatch.h
+  gEfiSmmGpiDispatchProtocolGuid = { 0xe0744b81, 0x9513, 0x49cd, { 0x8c, 0xea, 0xe9, 0x24, 0x5e, 0x70, 0x39, 0xda }}
+
+  ## Include/Protocol/SmmStandbyButtonDispatch.h
+  gEfiSmmStandbyButtonDispatchProtocolGuid = { 0x78965b98, 0xb0bf, 0x449e, { 0x8b, 0x22, 0xd2, 0x91, 0x4e, 0x49, 0x8a, 0x98 }}
+
+  ## Include/Protocol/SmmPowerButtonDispatch.h
+  gEfiSmmPowerButtonDispatchProtocolGuid = { 0xb709efa0, 0x47a6, 0x4b41, { 0xb9, 0x31, 0x12, 0xec, 0xe7, 0xa8, 0xee, 0x56 }}
+
+  ## Include/Protocol/SmmIchnDispatch.h
+  gEfiSmmIchnDispatchProtocolGuid = { 0xc50b323e, 0x9075, 0x4f2a, { 0xac, 0x8e, 0xd2, 0x59, 0x6a, 0x10, 0x85, 0xcc }}
+
+  ## Include/Protocol/SmmCpuIo.h
+  gEfiSmmCpuIoGuid  = { 0x5f439a0b, 0x45d8, 0x4682, {0xa4, 0xf4, 0xf0, 0x57, 0x6b, 0x51, 0x34, 0x41}}
+  
+  ## Include/Protocol/FrameworkFormCallback.h
+  gEfiFormCallbackProtocolGuid   = { 0xF3E4543D, 0xCF35, 0x6CEF, { 0x35, 0xC4, 0x4F, 0xE6, 0x34, 0x4D, 0xFC, 0x54 }}
+
+  ## Include/Protocol/FrameworkFormBrowser.h
+  gEfiFormBrowserProtocolGuid    = { 0xE5A1333E, 0xE1B4, 0x4D55, { 0xCE, 0xEB, 0x35, 0xC3, 0xEF, 0x13, 0x34, 0x43 }}
+
+  ## Include/Protocol/FrameworkFormBrowser.h
+  gEfiFormBrowserCompatibilityProtocolGuid    = { 0xfb7c852, 0xadca, 0x4853, { 0x8d, 0xf, 0xfb, 0xa7, 0x1b, 0x1c, 0xe1, 0x1a }}
+  
+  ## Include/Protocol/FrameworkFirmwareVolumeBlock.h
+  gFramerworkEfiFirmwareVolumeBlockProtocolGuid = { 0xDE28BC59, 0x6228, 0x41BD, { 0xBD, 0xF6, 0xA3, 0xB9, 0xAD, 0xB5, 0x8D, 0xA1 }}    
+
+  ## Include/Protocol/SmmCpuSaveState.h
+  gEfiSmmCpuSaveStateProtocolGuid = { 0x21f302ad, 0x6e94, 0x471b, {0x84, 0xbc, 0xb1, 0x48, 0x0, 0x40, 0x3a, 0x1d}}
+
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  IntelFrameworkPkgExtra.uni

IntelFrameworkPkg/IntelFrameworkPkg.dsc

@@ -0,0 +1,75 @@
+## @file
+# Intel Framework Package Reference Implementations
+#
+# This DSC file is used for Package Level build.
+#
+# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+#
+#    This program and the accompanying materials
+#    are licensed and made available under the terms and conditions of the BSD License
+#    which accompanies this distribution. The full text of the license may be found at
+#    http://opensource.org/licenses/bsd-license.php
+#
+#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+##
+
+################################################################################
+#
+# Defines Section - statements that will be processed to create a Makefile.
+#
+################################################################################
+[Defines]
+  PLATFORM_NAME                  = IntelFramework
+  PLATFORM_GUID                  = E76EB141-6EDB-43f3-A455-EF24A79673DD
+  PLATFORM_VERSION               = 0.96
+  DSC_SPECIFICATION              = 0x00010005
+  OUTPUT_DIRECTORY               = Build/IntelFramework
+  SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC|ARM
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
+  SKUID_IDENTIFIER               = DEFAULT
+
+################################################################################
+#
+# Pcd Section - list of all EDK II PCD Entries defined by this Platform
+#
+################################################################################
+[PcdsFixedAtBuild]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f
+
+[PcdsPatchableInModule]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000
+
+[PcdsFeatureFlag]
+  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE
+  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE
+
+###################################################################################################
+#
+# Components Section - list of the modules and components that will be processed by compilation
+#                      tools and the EDK II tools to generate PE32/PE32+/Coff image files.
+#
+# Note: The EDK II DSC file is not used to specify how compiled binary images get placed
+#       into firmware volume images. This section is just a list of modules to compile from
+#       source into UEFI-compliant binaries.
+#       It is the FDF file that contains information on combining binary files into firmware
+#       volume images, whose concept is beyond UEFI and is described in PI specification.
+#       Binary modules do not need to be listed in this section, as they should be
+#       specified in the FDF file. For example: Shell binary (Shell_Full.efi), FAT binary (Fat.efi),
+#       Logo (Logo.bmp), and etc.
+#       There may also be modules listed in this section that are not required in the FDF file,
+#       When a module listed here is excluded from FDF file, then UEFI-compliant binary will be
+#       generated for it, but the binary will not be put into any firmware volume.
+#
+###################################################################################################
+[Components]
+  IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
+  IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf
+  IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
+  IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf
+  IntelFrameworkPkg/Library/PeiHobLibFramework/PeiHobLibFramework.inf
+
+[BuildOptions]
+  *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+

IntelFrameworkPkg/IntelFrameworkPkg.uni

@@ -0,0 +1,22 @@
+// /** @file
+// Intel Framework Package Reference Implementations
+//
+// This package provides definitions and libraries that comply to Intel Framework Specifications.
+//
+// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+//
+// This program and the accompanying materials are licensed and made available
+// under the terms and conditions of the BSD License which accompanies this distribution.
+// The full text of the license may be found at http://opensource.org/licenses/bsd-license.php
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
+// OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
+// **/
+
+
+#string STR_PACKAGE_ABSTRACT            #language en-US "Intel Framework Package Reference Implementations"
+
+#string STR_PACKAGE_DESCRIPTION         #language en-US "This package provides definitions and libraries that comply to Intel Framework specifications."
+
+
+

IntelFrameworkPkg/IntelFrameworkPkgExtra.uni

@@ -0,0 +1,18 @@
+// /** @file
+// IntelFramework Package Localized Strings and Content.
+//
+// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+//
+// This program and the accompanying materials are licensed and made available
+// under the terms and conditions of the BSD License which accompanies this distribution.
+// The full text of the license may be found at http://opensource.org/licenses/bsd-license.php
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
+// OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
+// **/
+
+#string STR_PROPERTIES_PACKAGE_NAME 
+#language en-US 
+"IntelFramework package"
+
+

LegacyBios/BlockIoDxe/BlockIoDxe.inf

@@ -61,7 +61,7 @@
   gBlockIoVendorGuid
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

LegacyBios/KeyboardDxe/KeyboardDxe.inf

@@ -45,7 +45,7 @@
 
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

LegacyBios/Region2Dxe/LegacyRegion2Dxe.inf

@@ -44,7 +44,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 
 [LibraryClasses]
   UefiDriverEntryPoint

LegacyBios/VideoDxe/VideoDxe.inf

@@ -42,7 +42,7 @@
 #  VesaBiosExtensions.h
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec

LegacyBios/VideoDxe/VideoDxe2.inf

@@ -43,7 +43,7 @@
 #  VesaBiosExtensions.h
 
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec

Library/DuetTimerLib/DuetTimerLib.inf

@@ -40,7 +40,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 
 [LibraryClasses]
   BaseLib

Library/GenericBdsLib/GenericBdsLib.inf

@@ -44,7 +44,7 @@
   GenericBdsStrings.uni
   
 [Packages]
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec

Library/MemLogLibDefault/MemLogLibDefault.inf

@@ -21,7 +21,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 
 [LibraryClasses]
   BaseLib

Library/OpensslLib/OpensslLibNull.inf

@@ -22,7 +22,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
 
 [Sources]
   OpensslLibNull.c

Library/OpensslLib/openssl-1.0.1e/OpensslLib.inf

@@ -24,7 +24,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   #CryptoPkg/CryptoPkg.dec
 
 #

Library/OsxBdsPlatformLib/PlatformBds.inf

@@ -36,7 +36,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
   

Library/VBoxPeCoffLib/VBoxPeCoffLib.inf

@@ -56,7 +56,7 @@
 
 [Packages]
 #  VBoxPkg/VBoxPkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   MdePkg/MdePkg.dec
 
 [LibraryClasses]

Library/VideoBiosPatchLib/VideoBiosPatchLib.inf

@@ -29,7 +29,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Clover/CloverPkg.dec
+  CloverPkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 

Library/WaveLib/WaveLib.inf

@@ -32,7 +32,7 @@
 
 [Packages]
     MdePkg/MdePkg.dec
-    Clover/CloverPkg.dec
+    CloverPkg.dec
 
 [LibraryClasses]
     BaseMemoryLib