VirtualBox

Changeset 58783 in vbox


Ignore:
Timestamp:
Nov 19, 2015 11:00:45 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
104233
Message:

EFI/Firmware: Enable more features now that we have more room. This commit enables the USB stack to enable booting from USB drives. Only XHCI is enabled for now because the EHCI DXE driver causes debug assertions in our emulation which requires further investigation. Also enable the network stack which enables PXE booting although only the VirtIO network interface is supported for now because we lack a PCNet and E1000 driver in the EDK

Location:
trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/OvmfPkgIa32.dsc

    r58459 r58783  
    491491
    492492  OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf
    493 !ifndef $(VBOX)
    494493  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
     494!ifndef $(VBOX)
    495495  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
    496496  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
     
    588588  # Network Support
    589589  #
    590 !ifndef $(VBOX)
    591590  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
    592591  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
     
    603602  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
    604603  OvmfPkg/VirtioNetDxe/VirtioNet.inf
    605 !endif
    606604
    607605  #
     
    610608!ifndef $(VBOX)
    611609  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
    612 !endif
    613610  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
     611!else
     612  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
     613!endif
    614614  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
    615615  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
  • trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/OvmfPkgIa32.fdf

    r58752 r58783  
    229229
    230230INF  OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf
    231 !ifndef $(VBOX)
    232231INF  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
     232!ifndef $(VBOX)
    233233INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
    234234INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
     
    334334# Network modules
    335335#
    336 !ifndef $(VBOX)
    337336!if $(E1000_ENABLE)
    338337  FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {
     
    354353  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
    355354  INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf
    356 !endif
    357355
    358356#
     
    362360INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
    363361INF  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
     362!else
     363INF  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
     364!endif
    364365INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
    365366INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
    366367INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
    367 !endif
    368368
    369369!ifdef $(CSM_ENABLE)
  • trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/OvmfPkgX64.dsc

    r58459 r58783  
    495495
    496496  OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf
    497 !ifndef $(VBOX)
    498497  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
     498!ifndef $(VBOX)
    499499  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
    500500  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
     
    592592  # Network Support
    593593  #
    594 !ifndef $(VBOX)
    595594  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
    596595  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
     
    607606  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
    608607  OvmfPkg/VirtioNetDxe/VirtioNet.inf
    609 !endif
    610608
    611609  #
     
    614612!ifndef $(VBOX)
    615613  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
    616 !endif
    617614  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
     615!else
     616  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
     617!endif
    618618  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
    619619  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
  • trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/OvmfPkgX64.fdf

    r58752 r58783  
    227227
    228228INF  OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf
    229 !ifndef $(VBOX)
    230229INF  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
     230!ifndef $(VBOX)
    231231INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
    232232INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
     
    332332# Network modules
    333333#
    334 !ifndef $(VBOX)
    335334!if $(E1000_ENABLE)
    336335  FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {
     
    352351  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
    353352  INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf
    354 !endif
    355353
    356354#
     
    360358INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
    361359INF  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
     360!else
     361INF  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
     362!endif
    362363INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
    363364INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
    364365INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
    365 !endif
    366366
    367367!ifdef $(CSM_ENABLE)
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette