Re: [edk2] [Patch] MdeModulePkg PCD: Remove unused PCD attribute PCD_TYPE_SKU_ENABLED

2018-03-13 Thread Zeng, Star 
Please help check the patch at 
https://lists.01.org/pipermail/edk2-devel/2018-March/022668.html.

Thanks,
Star
-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Thomas 
Lamprecht
Sent: Tuesday, March 13, 2018 4:33 PM
To: Gao, Liming ; edk2-devel@lists.01.org
Subject: Re: [edk2] [Patch] MdeModulePkg PCD: Remove unused PCD attribute 
PCD_TYPE_SKU_ENABLED

On 03/07/2018 09:15 AM, Liming Gao wrote:
> 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 
> Cc: Reviewed-by: Liming Gao 

This fails my build here:

[snip]
"gcc" -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror 
-Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h 
-fno-common -DSTRING_ARRAY_NAME=UefiShellDebug1CommandsLibStrings -m64 
-fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" 
-maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie 
-fno-asynchronous-unwind-tables -Wno-address -flto -DUSING_LTO -Os 
-Wno-unused-but-set-variable -Wno-unused-const-variable -DMDEPKG_NDEBUG 
-mno-mmx -mno-sse -D DISABLE_NEW_DEPRECATED_INTERFACES -c -o 
/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib/OUTPUT/./Dmem.obj
 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit
 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit
 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView
 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib
 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib/DEBUG
 -I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include/X64 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Include 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include 
/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
In file included from 
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD/Pei/Service.h:25:0,
 from 
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD/Pei/Service.c:16:
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD/Pei/Service.c:
 In function ‘SetWorker’:
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h:35:78:
 error: ‘PCD_TYPE_SKU_ENABLED’ undeclared (first use in this function) "gcc" -E 
-x assembler-with-cpp -include 
/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/DEBUG/AutoGen.h
 -I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Sec/X64 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Sec 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/DEBUG
 -I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include/X64 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/UefiCpuPkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/UefiCpuPkg/Include 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Include 
/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Sec/X64/SecEntry.nasm > 
/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/OUTPUT/X64/SecEntry.i
 #define PCD_TYPE_ALL_SET  (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | 
PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
  ^
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h:55:37:
 note: in expansion of macro ‘PCD_TYPE_ALL_SET’
 #define PCD_DATABASE_OFFSET_MASK (~(PCD_TYPE_ALL_SET | PCD_DATUM_TYPE_ALL_SET 
| PCD_DATUM_TYPE_UINT8_BOOLEAN))
 ^~~~
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD/Pei/Service.c:683:40:
 note: in expansion of macro ‘PCD_DATABASE_OFFSET_MASK’
   Offset

Re: [edk2] [Patch] MdeModulePkg PCD: Remove unused PCD attribute PCD_TYPE_SKU_ENABLED

2018-03-13 Thread Thomas Lamprecht 
On 03/07/2018 09:15 AM, Liming Gao wrote:
> 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 
> Cc: Reviewed-by: Liming Gao 

This fails my build here:

[snip]
"gcc" -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror 
-Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h 
-fno-common -DSTRING_ARRAY_NAME=UefiShellDebug1CommandsLibStrings -m64 
-fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" 
-maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie 
-fno-asynchronous-unwind-tables -Wno-address -flto -DUSING_LTO -Os 
-Wno-unused-but-set-variable -Wno-unused-const-variable -DMDEPKG_NDEBUG 
-mno-mmx -mno-sse -D DISABLE_NEW_DEPRECATED_INTERFACES -c -o 
/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib/OUTPUT/./Dmem.obj
 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit
 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit
 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView
 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib
 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib/DEBUG
 -I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include/X64 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Include 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include 
/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
In file included from 
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD/Pei/Service.h:25:0,
 from 
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD/Pei/Service.c:16:
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD/Pei/Service.c:
 In function ‘SetWorker’:
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h:35:78:
 error: ‘PCD_TYPE_SKU_ENABLED’ undeclared (first use in this function)
"gcc" -E -x assembler-with-cpp -include 
/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/DEBUG/AutoGen.h
 -I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Sec/X64 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Sec 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/DEBUG
 -I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include/X64 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/UefiCpuPkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/UefiCpuPkg/Include 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg 
-I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Include 
/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Sec/X64/SecEntry.nasm > 
/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/OUTPUT/X64/SecEntry.i
 #define PCD_TYPE_ALL_SET  (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | 
PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
  ^
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h:55:37:
 note: in expansion of macro ‘PCD_TYPE_ALL_SET’
 #define PCD_DATABASE_OFFSET_MASK (~(PCD_TYPE_ALL_SET | PCD_DATUM_TYPE_ALL_SET 
| PCD_DATUM_TYPE_UINT8_BOOLEAN))
 ^~~~
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD/Pei/Service.c:683:40:
 note: in expansion of macro ‘PCD_DATABASE_OFFSET_MASK’
   Offset  = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;
^~~~
/root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h:35:78:
 note: each undeclared identifier is reported only once for each function it 
appears in
 #define PCD_TYPE_ALL_SET  (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | 
PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)

Re: [edk2] [Patch] MdeModulePkg PCD: Remove unused PCD attribute PCD_TYPE_SKU_ENABLED

2018-03-12 Thread Zeng, Star 
Reviewed-by: Star Zeng 

Thanks,
Star
-Original Message-
From: Gao, Liming
Sent: Wednesday, March 7, 2018 4:15 PM
To: edk2-devel@lists.01.org
Cc: Gao, Liming 
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 
Cc: Reviewed-by: Liming Gao 
---
 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 d670af1..5767ac8 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.
+Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
 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 54cd8d9..a20b645 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.
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights 
+reserved.
 #
 #  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 922391c..0883ad8 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.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights 
+reserved.
 //
 // 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 e1ea5be..3cba289 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.
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights 
+reserved.
 #
 #  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 b0d3f1f..3e7c556 100644
--- a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
+++ b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
@@ -

[edk2] [Patch] MdeModulePkg PCD: Remove unused PCD attribute PCD_TYPE_SKU_ENABLED

2018-03-07 Thread Liming Gao 
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 
Cc: Reviewed-by: Liming Gao 
---
 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 d670af1..5767ac8 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.
+Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
 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 54cd8d9..a20b645 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.
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
 #
 #  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 922391c..0883ad8 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.
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
 //
 // 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 e1ea5be..3cba289 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.
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
 #
 #  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 b0d3f1f..3e7c556 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
 //