VirtualBox

Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/EFI/Firmware

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf

    r48674 r58459  
    11## @file
    2 # Component description file for UhcPeim PEIM to produce gPeiUsbHostControllerPpiGuid based on gPeiUsbControllerPpiGuid
    3 # which is used to enable recovery function from USB Drivers.
     2# The UhcPeim driver is responsible for managing the behavior of UHCI controller at PEI phase.
    43#
    5 # Usb Host Controller PEIM to support recovery from USB device.
    6 # Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
     4# It produces gPeiUsbHostControllerPpiGuid based on gPeiUsbControllerPpiGuid which is used
     5# to enable recovery function from USB Drivers.
     6#
     7# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
    78#
    89# This program and the accompanying materials
     
    2021  INF_VERSION                    = 0x00010005
    2122  BASE_NAME                      = UhciPei
     23  MODULE_UNI_FILE                = UhciPei.uni
    2224  FILE_GUID                      = C463CEAC-FC57-4f36-88B7-356C750C3BCA
    2325  MODULE_TYPE                    = PEIM
     
    5254
    5355[Ppis]
    54   gPeiUsbHostControllerPpiGuid                  # PPI ALWAYS_PRODUCED
    55   gPeiUsbControllerPpiGuid                      # PPI ALWAYS_CONSUMED
     56  gPeiUsbHostControllerPpiGuid                  ## PRODUCES
     57  gPeiUsbControllerPpiGuid                      ## CONSUMES
    5658
    5759
     
    5961  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid
    6062
    61 
     63[UserExtensions.TianoCore."ExtraFiles"]
     64  UhciPeiExtra.uni
Note: See TracChangeset for help on using the changeset viewer.

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