MdePkg: Revert AuditMode/DeployedMode name definition

Revert AuditMode/DeployedMode definition from Customized Secure Boot feature defined in UEFI2.5 Mantis 1263.
The feature has been moved to
  https://github.com/tianocore/edk2-staging/tree/Customized-Secure-Boot
Previous check-in hash is
  SHA-1: 79e7b64727

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: El-Haj-Mahmoud Samer <samer.el-haj-mahmoud@hpe.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
This commit is contained in:
Zhang, Chao B 2016-04-28 13:07:59 +08:00
parent 1a4232b741
commit 4b11f72eb0
2 changed files with 3 additions and 28 deletions

View File

@ -1,7 +1,7 @@
/** @file /** @file
GUID for EFI (NVRAM) Variables. GUID for EFI (NVRAM) Variables.
Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -126,20 +126,6 @@ extern EFI_GUID gEfiGlobalVariableGuid;
/// ///
#define EFI_SETUP_MODE_NAME L"SetupMode" #define EFI_SETUP_MODE_NAME L"SetupMode"
/// ///
/// Whether the system is operating in audit mode (1) or not (0).
/// All other values are reserved. Should be treated as read-only except when DeployedMode is 0.
/// Always becomes read-only after ExitBootServices() is called.
/// Its attribute is BS+RT.
///
#define EFI_AUDIT_MODE_NAME L"AuditMode"
///
/// Whether the system is operating in deployed mode (1) or not (0).
/// All other values are reserved. Should be treated as read-only when its value is 1.
/// Always becomes read-only after ExitBootServices() is called.
/// Its attribute is BS+RT.
///
#define EFI_DEPLOYED_MODE_NAME L"DeployedMode"
///
/// The Key Exchange Key Signature Database. /// The Key Exchange Key Signature Database.
/// Its attribute is NV+BS+RT+AT. /// Its attribute is NV+BS+RT+AT.
/// ///

View File

@ -1,7 +1,7 @@
/** @file /** @file
Image signature database are defined for the signed image validation. Image signature database are defined for the signed image validation.
Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -43,20 +43,9 @@
#define SECURE_BOOT_MODE_ENABLE 1 #define SECURE_BOOT_MODE_ENABLE 1
#define SECURE_BOOT_MODE_DISABLE 0 #define SECURE_BOOT_MODE_DISABLE 0
///
/// Depricated value definition for SetupMode variable
///
#define SETUP_MODE 1 #define SETUP_MODE 1
#define USER_MODE 0 #define USER_MODE 0
///
/// Value definition for SetupMode/DeployedMode/AuditMode variable
///
#define SETUP_MODE_ENABLE 1
#define SETUP_MODE_DISABLE 0
#define DEPLOYED_MODE_ENABLE 1
#define DEPLOYED_MODE_DISABLE 0
#define AUDIT_MODE_ENABLE 1
#define AUDIT_MODE_DISABLE 0
//*********************************************************************** //***********************************************************************
// Signature Database // Signature Database