Changeset 39185 in vbox for trunk

Timestamp:

Nov 3, 2011 10:27:28 AM (13 years ago)

Author:

vboxsync

Message:

EFI: backed r74630,r74631

Location:

trunk/src/VBox/Devices/EFI

Files:

• Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf (modified) (1 diff)
• Firmware2/VBoxPkg/VBoxPkg.dsc (modified) (3 diffs)
• Firmware2/VBoxPkg/VBoxPkgX64.dsc (modified) (4 diffs)
• efi_build.conf (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf

@@ -32 +32 @@
 [Packages]
         MdePkg/MdePkg.dec
-        # r9628 moves ReportStatusCodeLib to MdeModulePkg
-        MdeModulePkg/MdeModulePkg.dec
+        IntelFrameworkPkg/IntelFrameworkPkg.dec
+        IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         VBoxPkg/VBoxPkg.dec
 

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dsc

@@ -109 +109 @@
   #DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
   DebugLib|VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf
-  # r9628
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
 
 [LibraryClasses.common.PEI_CORE]
@@ -119 +118 @@
   MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
   PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
-  # r9628
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
   OemHookStatusCodeLib|VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf
   #OemHookStatusCodeLib|IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
@@ -135 +133 @@
   MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
-  # r9628
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
   OemHookStatusCodeLib|VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf
   #OemHookStatusCodeLib|IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgX64.dsc

@@ -79 +79 @@
   PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
-  # r9643
-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+  OemHookStatusCodeLib|IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
   SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf
   MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
@@ -97 +96 @@
   #DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
   DebugLib|VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf
-  # r9628
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
 
 [LibraryClasses.common.PEI_CORE]
@@ -107 +105 @@
   MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
   PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
-  # r9628
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
-  # r9643
-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+  OemHookStatusCodeLib|IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
   DebugLib|VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf
@@ -122 +118 @@
   MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
-  # r9628
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
-  # r9643
-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+  OemHookStatusCodeLib|IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
   DebugLib|VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf

trunk/src/VBox/Devices/EFI/efi_build.conf

@@ -5 +5 @@
 [ -z "$EDK_TREE" ] && EDK_TREE=/home/vbox/tinderbox/efi/edk2
 FW_TARGET_DIR=/home/vbox/tinderbox/efi/vbox/out
-EDK_REV=9650 
+EDK_REV=9572 
 #EDK_PATCHES="pmtimer pe bds apple no_blocking_partition"
 EDK_PATCHES="pmtimer apple no_blocking_partition rtc ovmf_pei mem_acpi idtgdt memdetect pci_bridge"
 EDK_PATCHES="$EDK_PATCHES r9699" # gcc x64 build fix todo: remove when EDK_REV reaches r9699
-#EDK_PATCHES="$EDK_PATCHES r9573" # gcc i386 build fix todo: remove when EDK_REV reaches r9573
+EDK_PATCHES="$EDK_PATCHES r9573" # gcc i386 build fix todo: remove when EDK_REV reaches r9573
 EDK_PATCHES="$EDK_PATCHES backed_r9488_SecurityStub" # partly backed of r9488, affect loading AppleACPI kext.  
 EDK_PATCHES="$EDK_PATCHES SwitchStack_wrong_assert"