BaseTools: Collect DynamicHii PCD values and assign it to VPD PCD Value

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / BuildClassObject.py

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index da265b68f1af510e844dc3d804e53e1c3ff2c446..6150557cfbfd2a052057da963267422b1a0876c6 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -122,12 +122,16 @@ class StructurePcd(PcdClassObject):
         return self.TypeName\r
 \r
     def AddDefaultValue (self, FieldName, Value, FileName="", LineNo=0):\r
+        if FieldName in self.DefaultValues:\r
+            del self.DefaultValues[FieldName]\r
         self.DefaultValues[FieldName] = [Value.strip(), FileName, LineNo]\r
         return self.DefaultValues[FieldName]\r
 \r
     def AddOverrideValue (self, FieldName, Value, SkuName, FileName="", LineNo=0):\r
         if SkuName not in self.SkuOverrideValues:\r
             self.SkuOverrideValues[SkuName] = collections.OrderedDict({})\r
+        if FieldName in self.SkuOverrideValues[SkuName]:\r
+            del self.SkuOverrideValues[SkuName][FieldName]\r
         self.SkuOverrideValues[SkuName][FieldName] = [Value.strip(), FileName, LineNo]\r
         return self.SkuOverrideValues[SkuName][FieldName]\r
 \r