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/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc

    r48674 r58459  
    44# This file is used to build all modules in IntelFrameworkModulePkg.
    55#
    6 #Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
     6#Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
    77#This program and the accompanying materials are licensed and made available under
    88#the terms and conditions of the BSD License that accompanies this distribution. 
     
    2323  PLATFORM_NAME                  = IntelFrameworkModuleAll
    2424  PLATFORM_GUID                  = FFF87D9A-E5BB-4AFF-9ADE-8645492E8087
    25   PLATFORM_VERSION               = 0.92
     25  PLATFORM_VERSION               = 0.94
    2626  DSC_SPECIFICATION              = 0x00010005
    2727  OUTPUT_DIRECTORY               = Build/IntelFrameworkModuleAll
     
    8080  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
    8181  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
     82
     83[LibraryClasses.EBC.PEIM]
     84  IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
    8285
    8386[LibraryClasses.common.DXE_DRIVER]
     
    168171[Components.IA32,Components.X64]
    169172  IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
     173  IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
    170174
    171175[Components.IA32,Components.X64,Components.IPF]
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