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

    r48674 r58459  
    11## @file
    22# PEIM to produce gEfiPeiVirtualBlockIoPpiGuid PPI for ATA controllers in the platform.
    3 # This PPI canl be consumed by PEIM which produce gEfiPeiDeviceRecoveryModulePpiGuid
     3# This PPI can be consumed by PEIM which produce gEfiPeiDeviceRecoveryModulePpiGuid
    44# for Atapi CD ROM device.
    55#
    66# This module discovers CDROM devices in Legacy and native mode and installs block IO ppis for them.
    7 # Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
     7# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
    88#
    99# This program and the accompanying materials
     
    2121  INF_VERSION                    = 0x00010005
    2222  BASE_NAME                      = IdeBusPei
     23  MODULE_UNI_FILE                = IdeBusPei.uni
    2324  FILE_GUID                      = B7A5041A-78BA-49e3-B73B-54C757811FB6
    2425  MODULE_TYPE                    = PEIM
     
    5253  PeiServicesTablePointerLib
    5354  MemoryAllocationLib
     55  PcdLib
    5456
    5557[Ppis]
    56   gPeiAtaControllerPpiGuid                      # PPI ALWAYS_CONSUMED
    57   gEfiPeiVirtualBlockIoPpiGuid                  # PPI ALWAYS_PRODUCED
     58  gPeiAtaControllerPpiGuid                      ## CONSUMES
     59  gEfiPeiVirtualBlockIoPpiGuid                  ## PRODUCES
    5860 
    5961[Pcd]
    60   gEfiMdeModulePkgTokenSpaceGuid.PcdSataSpinUpDelayInSecForRecoveryPath
     62  gEfiMdeModulePkgTokenSpaceGuid.PcdSataSpinUpDelayInSecForRecoveryPath   ## CONSUMES
    6163
    6264[Depex]
    6365  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid AND gPeiAtaControllerPpiGuid
    6466
    65 
    66 
     67[UserExtensions.TianoCore."ExtraFiles"]
     68  IdeBusPeiExtra.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