diff options
| author | Zhang, Chao B <chao.b.zhang@intel.com> | 2019-06-21 10:24:10 +0800 |
|---|---|---|
| committer | Zhang, Chao B <chao.b.zhang@intel.com> | 2019-06-21 10:25:25 +0800 |
| commit | 57ec204e69138f5ff46cf6712692213332a8599b (patch) | |
| tree | 28e8380f0cc18ca5151e4e313d26316260ed5465 /MdeModulePkg/Universal/BdsDxe | |
| parent | 425d8d487fe20e76281fd7da074592508d03f9c0 (diff) | |
| download | edk2-57ec204e69138f5ff46cf6712692213332a8599b.tar.gz edk2-57ec204e69138f5ff46cf6712692213332a8599b.tar.bz2 edk2-57ec204e69138f5ff46cf6712692213332a8599b.zip | |
Revert "Capsule-on-Disk entire Patch
This reverts commit 0d4aa276d1f6e0cb9d71a7fb88b30c416ba6d5a3,
6470a43160183cd48cad8901c912a48811f18b13,
fd7286089542ee7a98cfea00be45ceb3561e0b20,
7837d1249807b4248079699097bc993254235d7a,
6b32af2e105f9b5454a55b581f2dc365c5eb6397,
8636f70b5a763ed1c03b292708f9c5543e531ea9,
f17935321a5b818a66e999632ef371b374b98f0c
due to incorrect review process.
Cc: Wei6 Xu <wei6.xu@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Zhang, Chao B <chao.b.zhang@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Diffstat (limited to 'MdeModulePkg/Universal/BdsDxe')
| -rw-r--r-- | MdeModulePkg/Universal/BdsDxe/BdsDxe.inf | 3 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf index 3d13c725ce..6913389d34 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -5,7 +5,7 @@ # gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry
# interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.
#
-# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
@@ -95,7 +95,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed ## CONSUMES
- gEfiMdeModulePkgTokenSpaceGuid.PcdCapsuleOnDiskSupport ## CONSUMES
[Depex]
TRUE
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c index 2a4ae9f488..9d312bd982 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c @@ -5,7 +5,7 @@ After DxeCore finish DXE phase, gEfiBdsArchProtocolGuid->BdsEntry will be invoked
to enter BDS phase.
-Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -552,10 +552,6 @@ BdsFormalizeOSIndicationVariable ( OsIndicationSupport = EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY;
}
- if (PcdGetBool(PcdCapsuleOnDiskSupport)) {
- OsIndicationSupport |= EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED;
- }
-
Status = gRT->SetVariable (
EFI_OS_INDICATIONS_SUPPORT_VARIABLE_NAME,
&gEfiGlobalVariableGuid,
|