VirtualBox

Ignore:
Timestamp:
Oct 28, 2015 8:17:18 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
103761
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:
6 edited

Legend:

Unmodified
Added
Removed

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

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.inf

    r48674 r58459  
    11## @file
    2 #  Status Code Handler Driver which produces datahub handler and hook it
    3 #  onto the DXE status code router.
     2#  Status Code Handler Driver which produces datahub handler.
    43#
    5 #  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
     4#  Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
    65#
    76#  This program and the accompanying materials
    … …  
    1817  INF_VERSION                    = 0x00010005
    1918  BASE_NAME                      = DatahubStatusCodeHandlerDxe
     19  MODULE_UNI_FILE                = DatahubStatusCodeHandlerDxe.uni
    2020  FILE_GUID                      = 863D214F-0920-437B-8CAD-88EA83A24E97
    2121  MODULE_TYPE                    = DXE_DRIVER
    … …  
    5454[Guids]
    5555  gEfiEventExitBootServicesGuid                 ## CONSUMES ## Event
    56   gEfiStatusCodeDataTypeStringGuid              ## CONSUMES
    57   gEfiDataHubStatusCodeRecordGuid               ## CONSUMES
    58   gEfiStatusCodeDataTypeDebugGuid               ## CONSUMES
     56  gEfiDataHubStatusCodeRecordGuid               ## PRODUCES ## UNDEFINED # DataRecord Guid
     57  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_PRODUCES ## UNDEFINED # Record data type
    5958 
    6059[Protocols]
    6160  gEfiRscHandlerProtocolGuid                    ## CONSUMES
    6261  gEfiDataHubProtocolGuid                       ## CONSUMES
    63   gEfiStatusCodeRuntimeProtocolGuid             ## CONSUMES
     62  gEfiStatusCodeRuntimeProtocolGuid             ## UNDEFINED
    6463
    6564[FeaturePcd]
    66   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub
     65  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub ## CONSUMES
    6766
    6867[Depex]
    6968  gEfiRscHandlerProtocolGuid AND
    7069  gEfiDataHubProtocolGuid
    71  
     70
     71[UserExtensions.TianoCore."ExtraFiles"]
     72  DatahubStatusCodeHandlerDxeExtra.uni

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c

    r48674 r58459  
    22  Serial I/O status code reporting worker.
    33
    4   Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2006 - 2014, 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
    … …  
    8787                  Buffer,
    8888                  sizeof (Buffer),
    89                   "ERROR: C%x:V%x I%x",
     89                  "ERROR: C%08x:V%08x I%x",
    9090                  CodeType,
    9191                  Value,
    … …  
    123123                  Buffer,
    124124                  sizeof (Buffer),
    125                   "PROGRESS CODE: V%x I%x\n\r",
     125                  "PROGRESS CODE: V%08x I%x\n\r",
    126126                  Value,
    127127                  Instance
    … …  
    146146                  Buffer,
    147147                  sizeof (Buffer),
    148                   "Undefined: C%x:V%x I%x\n\r",
     148                  "Undefined: C%08x:V%08x I%x\n\r",
    149149                  CodeType,
    150150                  Value,

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

    r48674 r58459  
    22#  Status code PEIM which produces Status Code PPI.
    33#
    4 #  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
     4#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
    55#
    66#  This program and the accompanying materials
    … …  
    1717  INF_VERSION                    = 0x00010005
    1818  BASE_NAME                      = StatusCodePei
     19  MODULE_UNI_FILE                = StatusCodePei.uni
    1920  FILE_GUID                      = 1EC0F53A-FDE0-4576-8F25-7A1A410F58EB
    2021  MODULE_TYPE                    = PEIM
    … …  
    5657[Guids]
    5758  gMemoryStatusCodeRecordGuid                   ## SOMETIMES_CONSUMES ## HOB
    58   gEfiStatusCodeDataTypeStringGuid              ## CONSUMES
     59  gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES ## UNDEFINED # String Data Type
    5960
    6061[Ppis]
    … …  
    6364
    6465[FeaturePcd]
    65   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM
    66   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
    67   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
     66  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM ## CONSUMES
     67  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES
     68  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES
    6869
    6970
    7071[Pcd]
    71   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
     72  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory  ## SOMETIMES_CONSUMES
    7273
    7374[Depex]
    7475  TRUE
     76
     77[UserExtensions.TianoCore."ExtraFiles"]
     78  StatusCodePeiExtra.uni

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c

    r48674 r58459  
    22  Serial I/O status code reporting worker.
    33
    4   Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2006 - 2014, 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         
    … …  
    8585                  Buffer,
    8686                  sizeof (Buffer),
    87                   "ERROR: C%x:V%x I%x",
     87                  "ERROR: C%08x:V%08x I%x",
    8888                  CodeType,
    8989                  Value,
    … …  
    121121                  Buffer,
    122122                  sizeof (Buffer),
    123                   "PROGRESS CODE: V%x I%x\n\r",
     123                  "PROGRESS CODE: V%08x I%x\n\r",
    124124                  Value,
    125125                  Instance
    … …  
    144144                  Buffer,
    145145                  sizeof (Buffer),
    146                   "Undefined: C%x:V%x I%x\n\r",
     146                  "Undefined: C%08x:V%08x I%x\n\r",
    147147                  CodeType,
    148148                  Value,

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

    r48674 r58459  
    11## @file
    2 #  Status Code Runtime Dxe driver that supports multiple devices and produces
    3 #  Status Code Runtime Protocol.
     2#  Status Code Runtime Dxe driver produces Status Code Runtime Protocol.
    43#
    5 #  Copyright (c) 2006 - 2011, 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                      = StatusCodeRuntimeDxe
     19  MODULE_UNI_FILE                = StatusCodeRuntimeDxe.uni
    2020  FILE_GUID                      = FEDE0A1B-BCA2-4A9F-BB2B-D9FD7DEC2E9F
    2121  MODULE_TYPE                    = DXE_RUNTIME_DRIVER
    … …  
    6363
    6464[Guids]
    65   gEfiDataHubStatusCodeRecordGuid               ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)
    66   gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)
    67   gMemoryStatusCodeRecordGuid                   ## CONSUMES ## HOB
     65  gEfiDataHubStatusCodeRecordGuid               ## SOMETIMES_PRODUCES ## UNDEFINED # DataRecord Guid
     66  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_PRODUCES ## UNDEFINED # Record data type
     67  gMemoryStatusCodeRecordGuid                   ## SOMETIMES_CONSUMES ## HOB
    6868  gEfiEventVirtualAddressChangeGuid             ## CONSUMES ## Event
    69   gEfiStatusCodeDataTypeStringGuid              ## CONSUMES
     69  gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES ## UNDEFINED
    7070
    7171[Protocols]
    7272  gEfiStatusCodeRuntimeProtocolGuid             ## PRODUCES
    73   gEfiDataHubProtocolGuid                       ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)
     73  gEfiDataHubProtocolGuid                       ## SOMETIMES_CONSUMES # Needed if Data Hub is supported for status code
    7474
    7575[FeaturePcd]
    76   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn
    77   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM
    78   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub
    79   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
    80   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
     76  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn              ## CONSUMES
     77  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM     ## CONSUMES
     78  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub ## CONSUMES
     79  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory             ## CONSUMES
     80  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial             ## CONSUMES
    8181
    8282[Pcd]
    83   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
     83  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## SOMETIMES_CONSUMES
    8484
    8585[Depex]
    8686  TRUE
     87[UserExtensions.TianoCore."ExtraFiles"]
     88  StatusCodeRuntimeDxeExtra.uni
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette