From 4b11f72eb0526a62a281ebfeac2b34f68cb3939b Mon Sep 17 00:00:00 2001
From: "Zhang, Chao B" <chao.b.zhang@intel.com>
Date: Thu, 28 Apr 2016 13:07:59 +0800
Subject: [PATCH] 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: 79e7b6472797f156d1ff28f3022b25d9c6f250f9

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>
---
 MdePkg/Include/Guid/GlobalVariable.h      | 16 +---------------
 MdePkg/Include/Guid/ImageAuthentication.h | 15 ++-------------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/MdePkg/Include/Guid/GlobalVariable.h b/MdePkg/Include/Guid/GlobalVariable.h
index e58f7a1e8c..08042369a3 100644
--- a/MdePkg/Include/Guid/GlobalVariable.h
+++ b/MdePkg/Include/Guid/GlobalVariable.h
@@ -1,7 +1,7 @@
 /** @file
   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                          
   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        
@@ -126,20 +126,6 @@ extern EFI_GUID gEfiGlobalVariableGuid;
 ///
 #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.
 /// Its attribute is NV+BS+RT+AT.
 ///
diff --git a/MdePkg/Include/Guid/ImageAuthentication.h b/MdePkg/Include/Guid/ImageAuthentication.h
index c733643998..3b3b7b5f40 100644
--- a/MdePkg/Include/Guid/ImageAuthentication.h
+++ b/MdePkg/Include/Guid/ImageAuthentication.h
@@ -1,7 +1,7 @@
 /** @file
   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
   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
@@ -43,20 +43,9 @@
 
 #define SECURE_BOOT_MODE_ENABLE           1
 #define SECURE_BOOT_MODE_DISABLE          0
-///
-/// Depricated value definition for SetupMode variable 
-///
+
 #define SETUP_MODE                        1
 #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