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:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/Firmware

  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Guid/Cper.h

    r48674 r58459  
    22  GUIDs and definitions used for Common Platform Error Record.
    33
    4   Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2011 - 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   GUIDs introduced from UEFI 2.1 Specification.
     14  GUIDs introduced from UEFI 2.3.1 Specification.
    1515
    1616**/
    … …  
    2121#pragma pack(1)
    2222
    23 #define EFI_ERROR_RECORD_SIGNATURE_START   EFI_SIGNATURE_32('C', 'P', 'E', 'R')
     23#define EFI_ERROR_RECORD_SIGNATURE_START   SIGNATURE_32('C', 'P', 'E', 'R')
    2424#define EFI_ERROR_RECORD_SIGNATURE_END     0xFFFFFFFF
    2525
    … …  
    210210  UINT8                  Resv1;
    211211  UINT32                 SectionFlags;
    212   UINT8                  Resv2[3];
    213212  EFI_GUID               SectionType;
    214213  EFI_GUID               FruId;

  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Guid/EventGroup.h

    r48674 r58459  
    11/** @file
    2   GUIDs for gBS->CreateEventEx Event Groups. Defined in UEFI spec 2.0 and PI 1.2.
     2  GUIDs for gBS->CreateEventEx Event Groups. Defined in UEFI spec 2.0 and PI 1.2.1.
    33
    4 Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
     4Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
    55This program and the accompanying materials are licensed and made available under
    66the terms and conditions of the BSD License that accompanies this distribution. 
    … …  
    4545extern EFI_GUID gEfiEventDxeDispatchGuid;
    4646
     47#define EFI_END_OF_DXE_EVENT_GROUP_GUID \
     48  { 0x2ce967a, 0xdd7e, 0x4ffc, { 0x9e, 0xe7, 0x81, 0xc, 0xf0, 0x47, 0x8, 0x80 } }
     49
     50extern EFI_GUID gEfiEndOfDxeEventGroupGuid;
     51
    4752#endif

  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Guid/GlobalVariable.h

    r48674 r58459  
    22  GUID for EFI (NVRAM) Variables.
    33
    4   Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2006 - 2013, 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         
    … …  
    2525extern EFI_GUID gEfiGlobalVariableGuid;
    2626
     27//
     28// Follow UEFI 2.4 spec:
     29// To prevent name collisions with possible future globally defined variables,
     30// other internal firmware data variables that are not defined here must be
     31// saved with a unique VendorGuid other than EFI_GLOBAL_VARIABLE or
     32// any other GUID defined by the UEFI Specification. Implementations must
     33// only permit the creation of variables with a UEFI Specification-defined
     34// VendorGuid when these variables are documented in the UEFI Specification.
     35//
     36// Note: except the globally defined variables defined below, the spec also defines
     37// L"Boot####"      - A boot load option.
     38// L"Driver####"    - A driver load option.
     39// L"Key####"       - Describes hot key relationship with a Boot#### load option.
     40// The attribute for them is NV+BS+RT, #### is a printed hex value, and no 0x or h
     41// is included in the hex value. They can not be expressed as a #define like other globally
     42// defined variables, it is because we can not list the Boot0000, Boot0001, etc one by one.
     43//
     44
     45///
     46/// The language codes that the firmware supports. This value is deprecated.
     47/// Its attribute is BS+RT.
     48///
     49#define EFI_LANG_CODES_VARIABLE_NAME                L"LangCodes"
     50///
     51/// The language code that the system is configured for. This value is deprecated.
     52/// Its attribute is NV+BS+RT.
     53///
     54#define EFI_LANG_VARIABLE_NAME                      L"Lang"
     55///
     56/// The firmware's boot managers timeout, in seconds, before initiating the default boot selection.
     57/// Its attribute is NV+BS+RT.
     58///
     59#define EFI_TIME_OUT_VARIABLE_NAME                  L"Timeout"
     60///
     61/// The language codes that the firmware supports.
     62/// Its attribute is BS+RT.
     63///
     64#define EFI_PLATFORM_LANG_CODES_VARIABLE_NAME       L"PlatformLangCodes"
     65///
     66/// The language code that the system is configured for.
     67/// Its attribute is NV+BS+RT.
     68///
     69#define EFI_PLATFORM_LANG_VARIABLE_NAME             L"PlatformLang"
     70///
     71/// The device path of the default input/output/error output console.
     72/// Its attribute is NV+BS+RT.
     73///
     74#define EFI_CON_IN_VARIABLE_NAME                    L"ConIn"
     75#define EFI_CON_OUT_VARIABLE_NAME                   L"ConOut"
     76#define EFI_ERR_OUT_VARIABLE_NAME                   L"ErrOut"
     77///
     78/// The device path of all possible input/output/error output devices.
     79/// Its attribute is BS+RT.
     80///
     81#define EFI_CON_IN_DEV_VARIABLE_NAME                L"ConInDev"
     82#define EFI_CON_OUT_DEV_VARIABLE_NAME               L"ConOutDev"
     83#define EFI_ERR_OUT_DEV_VARIABLE_NAME               L"ErrOutDev"
     84///
     85/// The ordered boot option load list.
     86/// Its attribute is NV+BS+RT.
     87///
     88#define EFI_BOOT_ORDER_VARIABLE_NAME                L"BootOrder"
     89///
     90/// The boot option for the next boot only.
     91/// Its attribute is NV+BS+RT.
     92///
     93#define EFI_BOOT_NEXT_VARIABLE_NAME                 L"BootNext"
     94///
     95/// The boot option that was selected for the current boot.
     96/// Its attribute is BS+RT.
     97///
     98#define EFI_BOOT_CURRENT_VARIABLE_NAME              L"BootCurrent"
     99///
     100/// The types of boot options supported by the boot manager. Should be treated as read-only.
     101/// Its attribute is BS+RT.
     102///
     103#define EFI_BOOT_OPTION_SUPPORT_VARIABLE_NAME       L"BootOptionSupport"
     104///
     105/// The ordered driver load option list.
     106/// Its attribute is NV+BS+RT.
     107///
     108#define EFI_DRIVER_ORDER_VARIABLE_NAME              L"DriverOrder"
     109///
     110/// Identifies the level of hardware error record persistence
     111/// support implemented by the platform. This variable is
     112/// only modified by firmware and is read-only to the OS.
     113/// Its attribute is NV+BS+RT.
     114///
     115#define EFI_HW_ERR_REC_SUPPORT_VARIABLE_NAME        L"HwErrRecSupport"
     116///
     117/// Whether the system is operating in setup mode (1) or not (0).
     118/// All other values are reserved. Should be treated as read-only.
     119/// Its attribute is BS+RT.
     120///
     121#define EFI_SETUP_MODE_NAME                         L"SetupMode"
     122///
     123/// The Key Exchange Key Signature Database.
     124/// Its attribute is NV+BS+RT+AT.
     125///
     126#define EFI_KEY_EXCHANGE_KEY_NAME                   L"KEK"
     127///
     128/// The public Platform Key.
     129/// Its attribute is NV+BS+RT+AT.
     130///
     131#define EFI_PLATFORM_KEY_NAME                       L"PK"
     132///
     133/// Array of GUIDs representing the type of signatures supported
     134/// by the platform firmware. Should be treated as read-only.
     135/// Its attribute is BS+RT.
     136///
     137#define EFI_SIGNATURE_SUPPORT_NAME                  L"SignatureSupport"
     138///
     139/// Whether the platform firmware is operating in Secure boot mode (1) or not (0).
     140/// All other values are reserved. Should be treated as read-only.
     141/// Its attribute is BS+RT.
     142///
     143#define EFI_SECURE_BOOT_MODE_NAME                   L"SecureBoot"
     144///
     145/// The OEM's default Key Exchange Key Signature Database. Should be treated as read-only.
     146/// Its attribute is BS+RT.
     147///
     148#define EFI_KEK_DEFAULT_VARIABLE_NAME               L"KEKDefault"
     149///
     150/// The OEM's default public Platform Key. Should be treated as read-only.
     151/// Its attribute is BS+RT.
     152///
     153#define EFI_PK_DEFAULT_VARIABLE_NAME                L"PKDefault"
     154///
     155/// The OEM's default secure boot signature store. Should be treated as read-only.
     156/// Its attribute is BS+RT.
     157///
     158#define EFI_DB_DEFAULT_VARIABLE_NAME                L"dbDefault"
     159///
     160/// The OEM's default secure boot blacklist signature store. Should be treated as read-only.
     161/// Its attribute is BS+RT.
     162///
     163#define EFI_DBX_DEFAULT_VARIABLE_NAME               L"dbxDefault"
     164///
     165/// The OEM's default secure boot timestamp signature store. Should be treated as read-only.
     166/// Its attribute is BS+RT.
     167///
     168#define EFI_DBT_DEFAULT_VARIABLE_NAME               L"dbtDefault"
     169///
     170/// Allows the firmware to indicate supported features and actions to the OS.
     171/// Its attribute is BS+RT.
     172///
     173#define EFI_OS_INDICATIONS_SUPPORT_VARIABLE_NAME    L"OsIndicationsSupported"
     174///
     175/// Allows the OS to request the firmware to enable certain features and to take certain actions.
     176/// Its attribute is NV+BS+RT.
     177///
     178#define EFI_OS_INDICATIONS_VARIABLE_NAME            L"OsIndications"
     179///
     180/// Whether the system is configured to use only vendor provided
     181/// keys or not. Should be treated as read-only.
     182/// Its attribute is BS+RT.
     183///
     184#define EFI_VENDOR_KEYS_VARIABLE_NAME               L"VendorKeys"
     185
    27186#endif

  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Guid/ImageAuthentication.h

    r48674 r58459  
    11/** @file
    2   Platform Key, Key Exchange Key, and Image signature database are defined
    3   for the signed image validation.
    4 
    5   Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
     2  Image signature database are defined for the signed image validation.
     3
     4  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
    65  This program and the accompanying materials                         
    76  are licensed and made available under the terms and conditions of the BSD License         
    … …  
    3635///
    3736#define EFI_IMAGE_SECURITY_DATABASE1      L"dbx"
     37
    3838#define SECURE_BOOT_MODE_ENABLE           1
    3939#define SECURE_BOOT_MODE_DISABLE          0
    4040#define SETUP_MODE                        1
    4141#define USER_MODE                         0
    42 ///
    43 /// Globally "SetupMode" variable to specify whether the system is currently operating
    44 /// in setup mode (1) or not (0). All other values are reserved.
    45 ///
    46 #define EFI_SETUP_MODE_NAME               L"SetupMode"
    47 ///
    48 /// Globally "PK" variable for the Platform Key Signature Database.
    49 ///
    50 #define EFI_PLATFORM_KEY_NAME             L"PK"
    51 ///
    52 /// Globally "KEK" variable for the Key Exchange Key Signature Database.
    53 ///
    54 #define EFI_KEY_EXCHANGE_KEY_NAME         L"KEK"
    55 ///
    56 /// Globally "SignatureSupport" variable returns an array of GUIDs,
    57 /// with each GUID representing a type of signature which the platform
    58 /// firmware supports for images and other data.
    59 ///
    60 #define EFI_SIGNATURE_SUPPORT_NAME        L"SignatureSupport"
    61 
    62 ///
    63 /// Globally "SecureBoot" variable to specify whether the platform firmware
    64 /// is operating in Secure boot mode (1) or not (0). All other values are reserved.
    65 ///
    66 #define EFI_SECURE_BOOT_MODE_NAME         L"SecureBoot"
     42
    6743
    6844//***********************************************************************

  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Guid/StatusCodeDataTypeId.h

    r48674 r58459  
    22  GUID used to identify id for the caller who is initiating the Status Code.
    33
    4   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2006 - 2013, 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
    … …  
    149149  EFI_STATUS_CODE_DATA                 DataHeader;
    150150  ///
    151   /// The device path to the controller or the hardware device. Note that this parameter is a
    152   /// variable-length device path structure and not a pointer to such a structure. This
    153   /// structure is populated only if it is a physical device. For virtual devices, the Size
    154   /// field in DataHeader is set to zero and this field is not populated.
    155   ///
    156   UINT8                                *DevicePath;
     151  /// The device path to the controller or the hardware device. Note that this parameter is a 
     152  /// variable-length device path structure and not a pointer to such a structure. This structure is
     153  /// populated only if it is a physical device. For virtual devices, the Size field in DataHeader
     154  /// is set to zero and this field is not populated.
     155  ///
     156  //  EFI_DEVICE_PATH_PROTOCOL         DevicePath;
    157157} EFI_DEVICE_PATH_EXTENDED_DATA;
    158158
    … …  
    224224  UINT16                             AllocResSize;
    225225  ///
    226   /// The device path to the controller or the hardware device that did not get the requested
    227   /// resources. Note that this parameter is the variable-length device path structure and not
    228   /// a pointer to this structure.
    229   ///
    230   UINT8                              *DevicePath;
     226  /// The device path to the controller or the hardware device that did not get the requested 
     227  /// resources. Note that this parameter is the variable-length device path structure and not 
     228  /// a pointer to this structure. 
     229  ///
     230  //  EFI_DEVICE_PATH_PROTOCOL       DevicePath;
    231231  ///
    232232  /// The requested resources in the format of an ACPI 2.0 resource descriptor. This
    233233  /// parameter is not a pointer; it is the complete resource descriptor.
    234234  ///
    235   UINT8                              *ReqRes;
    236   ///
    237   /// The allocated resources in the format of an ACPI 2.0 resource descriptor. This
     235  //  UINT8                          ReqRes[];
     236  ///
     237  /// The allocated resources in the format of an ACPI 2.0 resource descriptor. This 
    238238  /// parameter is not a pointer; it is the complete resource descriptor.
    239239  ///
    240   UINT8                              *AllocRes;
     240  //  UINT8                          AllocRes[];
    241241} EFI_RESOURCE_ALLOC_FAILURE_ERROR_DATA;
    242242
    … …  
    753753  UINT16                         DevicePathSize;
    754754  ///
    755   /// Matches the RemainingDevicePath parameter being passed to the Start()
    756   /// function. Note that this parameter is the variable-length device path and not a pointer
     755  /// Matches the RemainingDevicePath parameter being passed to the Start() function.
     756  /// Note that this parameter is the variable-length device path and not a pointer
    757757  /// to the device path.
    758758  /// 
    759   UINT8                          *RemainingDevicePath;
     759  //  EFI_DEVICE_PATH_PROTOCOL   RemainingDevicePath;
    760760} EFI_STATUS_CODE_START_EXTENDED_DATA;
    761761

  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Guid/WinCertificate.h

    r48674 r58459  
    22  GUID for UEFI WIN_CERTIFICATE structure.
    33
    4   Copyright (c) 2006 - 2010, 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         
    … …  
    7575  ///
    7676  /// This is the standard WIN_CERTIFICATE header, where
    77   /// wCertificateType is set to WIN_CERT_TYPE_UEFI_GUID.
     77  /// wCertificateType is set to WIN_CERT_TYPE_EFI_GUID.
    7878  ///                         
    7979  WIN_CERTIFICATE   Hdr;
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