2 files changed, 5 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/CommonDataClass/CommonClass.py b/BaseTools/Source/Python/CommonDataClass/CommonClass.py
index 5a924ec2d6..e6c4495c95 100644
--- a/BaseTools/Source/Python/CommonDataClass/CommonClass.py
+++ b/BaseTools/Source/Python/CommonDataClass/CommonClass.py
@@ -270,19 +270,22 @@ class PpiClass(GuidProtocolPpiCommonClass):
 #
 class SkuInfoClass(object):
     def __init__(self, SkuIdName = '', SkuId = '', VariableName = '', VariableGuid = '', VariableOffset = '', 
-                 HiiDefaultValue = '', VpdOffset = '', DefaultValue = '', VariableGuidValue = '', VariableAttribute = ''):
+                 HiiDefaultValue = '', VpdOffset = '', DefaultValue = '', VariableGuidValue = '', VariableAttribute = '', DefaultStore = None):
         self.SkuIdName = SkuIdName
         self.SkuId = SkuId
         
         #
         # Used by Hii
         #
+        if DefaultStore is None:
+            DefaultStore = {}
         self.VariableName = VariableName
         self.VariableGuid = VariableGuid
         self.VariableGuidValue = VariableGuidValue
         self.VariableOffset = VariableOffset
         self.HiiDefaultValue = HiiDefaultValue
         self.VariableAttribute = VariableAttribute
+        self.DefaultStoreDict = DefaultStore
         
         #
         # Used by Vpd
diff --git a/BaseTools/Source/Python/CommonDataClass/DataClass.py b/BaseTools/Source/Python/CommonDataClass/DataClass.py
index efeba3e5dc..31ed46c7ec 100644
--- a/BaseTools/Source/Python/CommonDataClass/DataClass.py
+++ b/BaseTools/Source/Python/CommonDataClass/DataClass.py
@@ -64,6 +64,7 @@ MODEL_EFI_BINARY_FILE = 3008
 MODEL_EFI_SKU_ID = 3009
 MODEL_EFI_INCLUDE = 3010
 MODEL_EFI_DEPEX = 3011
+MODEL_EFI_DEFAULT_STORES = 3012
 
 MODEL_PCD = 4000
 MODEL_PCD_FIXED_AT_BUILD = 4001