BaseTools: use existing shared variable

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenVar.py

diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/Python/AutoGen/GenVar.py
index d222e6ed5e7ed608793cbc578e279a63bae2dc92..7a29a0edca4585b9b64bc15f8e375daf5e7513da 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenVar.py
+++ b/BaseTools/Source/Python/AutoGen/GenVar.py
@@ -20,6 +20,7 @@ import copy
 from Common.VariableAttributes import VariableAttributes\r
 from Common.Misc import *\r
 import collections\r
+import Common.DataType as DataType\r
 \r
 var_info = collections.namedtuple("uefi_var", "pcdindex,pcdname,defaultstoragename,skuname,var_name, var_guid, var_offset,var_attribute,pcd_default_value, default_value, data_type")\r
 NvStorageHeaderSize = 28\r
@@ -141,7 +142,7 @@ class VariableMgr(object):
             default_data_buffer = ""\r
             others_data_buffer = ""\r
             tail = None\r
-            default_sku_default = indexedvarinfo.get(index).get(("DEFAULT","STANDARD"))\r
+            default_sku_default = indexedvarinfo.get(index).get(("DEFAULT",DataType.TAB_DEFAULT_STORES_DEFAULT))\r
 \r
             if default_sku_default.data_type not in ["UINT8","UINT16","UINT32","UINT64","BOOLEAN"]:\r
                 var_max_len = max([len(var_item.default_value.split(",")) for var_item in sku_var_info.values()])\r
@@ -154,13 +155,13 @@ class VariableMgr(object):
             for item in default_data_buffer:\r
                 default_data_array += unpack("B",item)\r
 \r
-            if ("DEFAULT","STANDARD") not in var_data:\r
-                var_data[("DEFAULT","STANDARD")] = collections.OrderedDict()\r
-            var_data[("DEFAULT","STANDARD")][index] = (default_data_buffer,sku_var_info[("DEFAULT","STANDARD")])\r
+            if ("DEFAULT",DataType.TAB_DEFAULT_STORES_DEFAULT) not in var_data:\r
+                var_data[("DEFAULT",DataType.TAB_DEFAULT_STORES_DEFAULT)] = collections.OrderedDict()\r
+            var_data[("DEFAULT",DataType.TAB_DEFAULT_STORES_DEFAULT)][index] = (default_data_buffer,sku_var_info[("DEFAULT",DataType.TAB_DEFAULT_STORES_DEFAULT)])\r
 \r
             for (skuid,defaultstoragename) in indexedvarinfo.get(index):\r
                 tail = None\r
-                if (skuid,defaultstoragename) == ("DEFAULT","STANDARD"):\r
+                if (skuid,defaultstoragename) == ("DEFAULT",DataType.TAB_DEFAULT_STORES_DEFAULT):\r
                     continue\r
                 other_sku_other = indexedvarinfo.get(index).get((skuid,defaultstoragename))\r
 \r
@@ -189,7 +190,7 @@ class VariableMgr(object):
         if not var_data:\r
             return []\r
 \r
-        pcds_default_data = var_data.get(("DEFAULT","STANDARD"),{})\r
+        pcds_default_data = var_data.get(("DEFAULT",DataType.TAB_DEFAULT_STORES_DEFAULT),{})\r
         NvStoreDataBuffer = ""\r
         var_data_offset = collections.OrderedDict()\r
         offset = NvStorageHeaderSize\r
@@ -219,7 +220,7 @@ class VariableMgr(object):
 \r
         data_delta_structure_buffer = ""\r
         for skuname,defaultstore in var_data:\r
-            if (skuname,defaultstore) == ("DEFAULT","STANDARD"):\r
+            if (skuname,defaultstore) == ("DEFAULT",DataType.TAB_DEFAULT_STORES_DEFAULT):\r
                 continue\r
             pcds_sku_data = var_data.get((skuname,defaultstore))\r
             delta_data_set = []\r