VirtualBox

Ignore:
Timestamp:
Aug 12, 2020 4:09:12 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
139865
Message:

Devices/EFI: Merge edk-stable202005 and make it build, bugref:4643

Location:
trunk/src/VBox/Devices/EFI/FirmwareNew
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/EFI/FirmwareNew

  • TabularUnified trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

    r80721 r85718  
    55#  the capsule runtime services are ready.
    66#
    7 #  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
     7#  Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
     8#  Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
    89#  SPDX-License-Identifier: BSD-2-Clause-Patent
    910#
     
    2223# The following information is for reference only and not required by the build tools.
    2324#
    24 #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64
     25#  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 RISCV64
    2526#
    2627
     
    2930  CapsuleService.h
    3031
    31 [Sources.Ia32, Sources.EBC, Sources.ARM, Sources.AARCH64]
     32[Sources.Ia32, Sources.EBC, Sources.ARM, Sources.AARCH64, Sources.RISCV64]
    3233  SaveLongModeContext.c
    3334
    34 [Sources.Ia32, Sources.X64, Sources.ARM, Sources.AARCH64]
     35[Sources.Ia32, Sources.X64, Sources.ARM, Sources.AARCH64, Sources.RISCV64]
    3536  CapsuleCache.c
    3637
    37 [Sources.Ia32, Sources.X64, Sources.EBC]
     38[Sources.Ia32, Sources.X64, Sources.EBC, Sources.RISCV64]
    3839  CapsuleReset.c
    3940
     
    8384
    8485[FeaturePcd]
    85   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset   ## CONSUMES
     86  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset        ## CONSUMES
     87  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportProcessCapsuleAtRuntime   ## CONSUMES
    8688
    8789[FeaturePcd.X64]
  • TabularUnified trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c

    r80721 r85718  
    55  the capsule runtime services are ready.
    66
    7 Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
     7Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
    88SPDX-License-Identifier: BSD-2-Clause-Patent
    99
     
    139139    //
    140140    if ((CapsuleHeader->Flags & CAPSULE_FLAGS_PERSIST_ACROSS_RESET) == 0) {
    141       if (EfiAtRuntime ()) {
     141      if (EfiAtRuntime () && !FeaturePcdGet (PcdSupportProcessCapsuleAtRuntime)) {
    142142        Status = EFI_OUT_OF_RESOURCES;
    143143      } else {
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