From e8d2a9805286a2fd4f613697cf0cccb4a1ebc90d Mon Sep 17 00:00:00 2001
From: "Gao, Liming" <liming.gao@intel.com>
Date: Wed, 7 Mar 2018 16:15:18 +0800
Subject: [PATCH] MdeModulePkg PCD: Remove unused PCD attribute
 PCD_TYPE_SKU_ENABLED

PcdDb optimization has handled PCD DB for each SKU, not for single PCD.
So, this PCD attribute is not used any more.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
---
 MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h | 3 +--
 MdeModulePkg/Universal/PCD/Dxe/Pcd.inf               | 3 +--
 MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni            | 3 +--
 MdeModulePkg/Universal/PCD/Pei/Pcd.inf               | 3 +--
 MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni           | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
index d670af14e9..5767ac82da 100644
--- a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
+++ b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
@@ -1,7 +1,7 @@
 /** @file
   Guid for Pcd DataBase Signature.
 
-Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2012 - 2018, 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 that accompanies this distribution.
 The full text of the license may be found at
@@ -30,7 +30,6 @@ typedef UINT64 SKU_ID;
 #define PCD_TYPE_DATA         (0x0U << PCD_TYPE_SHIFT)
 #define PCD_TYPE_HII          (0x8U << PCD_TYPE_SHIFT)
 #define PCD_TYPE_VPD          (0x4U << PCD_TYPE_SHIFT)
-#define PCD_TYPE_SKU_ENABLED  (0x2U << PCD_TYPE_SHIFT)
 #define PCD_TYPE_STRING       (0x1U << PCD_TYPE_SHIFT)
 
 #define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 54cd8d9b9f..a20b645a45 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -174,7 +174,6 @@
 #                         PCD_TYPE_DATA
 #                         PCD_TYPE_HII
 #                         PCD_TYPE_VPD
-#                         PCD_TYPE_SKU_ENABLED
 #                         PCD_TYPE_STRING
 #          Datum Type   : indicate PCD vaue type from following macro:
 #                         PCD_DATUM_TYPE_POINTER
@@ -279,7 +278,7 @@
 #            - Variable GUID for HII type PCD
 #            - Token space GUID for dynamicex type PCD 
 #    
-#  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2018, 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
diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
index 922391c3ce..0883ad881e 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
+++ b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
@@ -174,7 +174,6 @@
 // PCD_TYPE_DATA
 // PCD_TYPE_HII
 // PCD_TYPE_VPD
-// PCD_TYPE_SKU_ENABLED
 // PCD_TYPE_STRING
 // Datum Type   : indicate PCD vaue type from following macro:
 // PCD_DATUM_TYPE_POINTER
@@ -279,7 +278,7 @@
 // - Variable GUID for HII type PCD
 // - Token space GUID for dynamicex type PCD
 //
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, 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
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index e1ea5be17f..3cba28944c 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -173,7 +173,6 @@
 #                         PCD_TYPE_DATA
 #                         PCD_TYPE_HII
 #                         PCD_TYPE_VPD
-#                         PCD_TYPE_SKU_ENABLED
 #                         PCD_TYPE_STRING
 #          Datum Type   : indicate PCD vaue type from following macro:
 #                         PCD_DATUM_TYPE_POINTER
@@ -278,7 +277,7 @@
 #            - Variable GUID for HII type PCD
 #            - Token space GUID for dynamicex type PCD 
 #    
-#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2018, 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
diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
index b0d3f1f79a..3e7c5566f0 100644
--- a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
+++ b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
@@ -173,7 +173,6 @@
 // PCD_TYPE_DATA
 // PCD_TYPE_HII
 // PCD_TYPE_VPD
-// PCD_TYPE_SKU_ENABLED
 // PCD_TYPE_STRING
 // Datum Type   : indicate PCD vaue type from following macro:
 // PCD_DATUM_TYPE_POINTER
@@ -278,7 +277,7 @@
 // - Variable GUID for HII type PCD
 // - Token space GUID for dynamicex type PCD
 //
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, 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
-- 
2.39.2