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

    r48674 r58459  
    11## @file
    2 #  This module provides the default logo bitmap picture shown on setup screen,
    3 #  which is corresponding to gEfiDefaultBmpLogoGuid.
     2#  The default logo bitmap picture shown on setup screen, which is corresponding to gEfiDefaultBmpLogoGuid.
    43#
    5 #  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
     4#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
    65#
    76#  This program and the accompanying materials
     
    1817  INF_VERSION                    = 0x00010005
    1918  BASE_NAME                      = Logo
     19  MODULE_UNI_FILE                = Logo.uni
    2020  FILE_GUID                      = 7BB28B99-61BB-11D5-9A5D-0090273FC14D
    2121  MODULE_TYPE                    = USER_DEFINED
     
    2525# The following information is for reference only and not required by the build tools.
    2626#
    27 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
     27#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64
    2828#
    2929
     
    3131  BIN|Logo.bmp|*
    3232
     33[UserExtensions.TianoCore."ExtraFiles"]
     34  LogoExtra.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