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