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/MdePkg/Include/Pi/PiBootMode.h

    r48674 r58459  
    22  Present the boot mode values in PI.
    33
    4   Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
    55  This program and the accompanying materials                         
    66  are licensed and made available under the terms and conditions of the BSD License         
     
    1212
    1313  @par Revision Reference:
    14   PI Version 1.0
     14  PI Version 1.2.1A
    1515
    1616**/
     
    3434#define BOOT_ON_S4_RESUME                             0x05
    3535#define BOOT_ON_S5_RESUME                             0x06
     36#define BOOT_WITH_MFG_MODE_SETTINGS                   0x07
    3637#define BOOT_ON_S2_RESUME                             0x10
    3738#define BOOT_ON_S3_RESUME                             0x11
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