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/EhciPei/EhciPei.inf

    r48674 r58459  
    11## @file
    2 # Component description file for EhcPeim PEIM to produce gPeiUsb2HostControllerPpiGuid
    3 # based on gPeiUsbControllerPpiGuid which is used to enable recovery function from USB Drivers.
     2# The EhcPeim driver is responsible for managing EHCI host controller at PEI phase.
    43#
    5 # Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
     4# It produces gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid
     5# which is used to enable recovery function from USB Drivers.
     6#
     7# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
    68#
    79# This program and the accompanying materials
     
    1921  INF_VERSION                    = 0x00010005
    2022  BASE_NAME                      = EhciPei
     23  MODULE_UNI_FILE                = EhciPei.uni
    2124  FILE_GUID                      = BAB4F20F-0981-4b5f-A047-6EF83BEEAB3C
    2225  MODULE_TYPE                    = PEIM
     
    5760
    5861[Ppis]
    59   gPeiUsb2HostControllerPpiGuid                 # PPI ALWAYS_PRODUCED
    60   gPeiUsbControllerPpiGuid                      # PPI ALWAYS_CONSUMED
     62  gPeiUsb2HostControllerPpiGuid                 ## PRODUCES
     63  gPeiUsbControllerPpiGuid                      ## CONSUMES
    6164
    6265
     
    6467  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid
    6568
    66 
     69[UserExtensions.TianoCore."ExtraFiles"]
     70  EhciPeiExtra.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