Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/OptionRomPkg/OptionRomPkg.dsc

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• OptionRomPkg/OptionRomPkg.dsc (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/OptionRomPkg/OptionRomPkg.dsc

@@ -7 +7 @@
 # A single driver can support mixes of EFI 1.1, UEFI 2.0 and UEFI 2.1.
 #
-# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
@@ -102 +102 @@
   OptionRomPkg/Library/GopBltLib/GopBltLib.inf
 
-  OptionRomPkg/Application/BltLibSample/BltLibSample.inf
-
   OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
   OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
   OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf
+  OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf
 
+[Components.IA32, Components.X64, Components.IPF]
+  OptionRomPkg/Application/BltLibSample/BltLibSample.inf