From: Yonghong Zhu <yonghong.zhu@intel.com>
Date: Thu, 15 Mar 2018 11:40:18 +0000 (+0800)
Subject: BaseTools: Fix bug for VOID* DynamicDefault Pcd use Flexible format
X-Git-Tag: edk2-stable201903~2093
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=316b43dee56837ed7d382e8de4a78d6bb9d14eb7

BaseTools: Fix bug for VOID* DynamicDefault Pcd use Flexible format

define a flexible pcd format in Dyanmic/DynamicExDefault section,
it cause build error.
[PcdsDynamicExDefault.common.DEFAULT]
  pcdToken.Name|{GUID("11111111-2222-42eb-b5eb-fef31d207cb4")}

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
---

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 2086b4c69d..7d44fdcf8b 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1720,14 +1720,6 @@ def AnalyzeDscPcd(Setting, PcdType, DataType=''):
             Type = DataType
         if len(FieldList) > 2:
             Size = FieldList[2]
-        else:
-            if Type == 'VOID*':
-                if Value.startswith("L"):
-                    Size = str((len(Value)- 3 + 1) * 2)
-                elif Value.startswith("{"):
-                    Size = str(len(Value.split(",")))
-                else:
-                    Size = str(len(Value) -2 + 1 )
         if DataType == "":
             IsValid = (len(FieldList) <= 1)
         else: