Changeset 39183 in vbox

Timestamp:

Nov 3, 2011 9:13:14 AM (13 years ago)

Author:

vboxsync

Message:

EFI: backed r74635,r74636

Location:

trunk/src/VBox/Devices/EFI

Files:

• Firmware2/VBoxPkg/VBoxPkg.dsc (modified) (1 diff)
• Firmware2/VBoxPkg/VBoxPkgX64.dsc (modified) (1 diff)
• efi_build.conf (modified) (1 diff)

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

@@ -111 +111 @@
   # r9628
   ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
-  # r9668
-  ExtractGuidedSectionLib|OvmfPkg/Library/SecExtractGuidedSectionLib/SecExtractGuidedSectionLib.inf
 
 [LibraryClasses.common.PEI_CORE]

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

@@ -99 +99 @@
   # r9628
   ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
-  # r9668
-  ExtractGuidedSectionLib|OvmfPkg/Library/SecExtractGuidedSectionLib/SecExtractGuidedSectionLib.inf
 
 [LibraryClasses.common.PEI_CORE]

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=9700 
+EDK_REV=9650 
 #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 backed_r9488_SecurityStub" # partly backed of r9488, affect loading AppleACPI kext.  
 EDK_PATCHES="$EDK_PATCHES SwitchStack_wrong_assert"