BaseTools: Update SkuId as SKU_ID type to follow current implementation

[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 98e1a4cdae7b4f9f4e3732ab2d501e1f6ac74a7b..65d0bea36c58c03114958c21f1dfe1bd7a4debf5 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenVar.py
+++ b/BaseTools/Source/Python/AutoGen/GenVar.py
@@ -51,10 +51,32 @@ class VariableMgr(object):
         self.VarInfo = []\r
         self.DefaultStoreMap = DefaultStoreMap\r
         self.SkuIdMap = SkuIdMap\r
+        self.VpdRegionSize = 0\r
+        self.VpdRegionOffset = 0\r
+        self.NVHeaderBuff = None\r
+        self.VarDefaultBuff = None\r
+        self.VarDeltaBuff = None\r
 \r
     def append_variable(self,uefi_var):\r
         self.VarInfo.append(uefi_var)\r
 \r
+    def SetVpdRegionMaxSize(self,maxsize):\r
+        self.VpdRegionSize = maxsize\r
+\r
+    def SetVpdRegionOffset(self,vpdoffset):\r
+        self.VpdRegionOffset = vpdoffset\r
+\r
+    def PatchNVStoreDefaultMaxSize(self,maxsize):\r
+        if not self.NVHeaderBuff:\r
+            return ""\r
+        self.NVHeaderBuff = self.NVHeaderBuff[:8] + pack("=Q",maxsize)\r
+        default_var_bin = self.format_data(self.NVHeaderBuff + self.VarDefaultBuff + self.VarDeltaBuff)\r
+        value_str = "{"\r
+        default_var_bin_strip = [ data.strip("""'""") for data in default_var_bin]\r
+        value_str += ",".join(default_var_bin_strip)\r
+        value_str += "}"\r
+        return value_str\r
+\r
     def process_variable_data(self):\r
 \r
         var_data = dict()\r
@@ -115,7 +137,10 @@ class VariableMgr(object):
 \r
         var_data = self.process_variable_data()\r
 \r
-        pcds_default_data = var_data.get(("DEFAULT","STANDARD"))\r
+        if not var_data:\r
+            return []\r
+\r
+        pcds_default_data = var_data.get(("DEFAULT","STANDARD"),{})\r
         NvStoreDataBuffer = ""\r
         var_data_offset = collections.OrderedDict()\r
         offset = NvStorageHeaderSize\r
@@ -141,7 +166,7 @@ class VariableMgr(object):
 \r
         variable_storage_header_buffer = self.PACK_VARIABLE_STORE_HEADER(len(NvStoreDataBuffer) + 28)\r
 \r
-        nv_default_part = self.AlignData(self.PACK_DEFAULT_DATA(0, 0, self.unpack_data(variable_storage_header_buffer+NvStoreDataBuffer)))\r
+        nv_default_part = self.AlignData(self.PACK_DEFAULT_DATA(0, 0, self.unpack_data(variable_storage_header_buffer+NvStoreDataBuffer)), 8)\r
 \r
         data_delta_structure_buffer = ""\r
         for skuname,defaultstore in var_data:\r
@@ -155,9 +180,16 @@ class VariableMgr(object):
                 delta_data = [(item[0] + offset, item[1]) for item in delta_data]\r
                 delta_data_set.extend(delta_data)\r
 \r
-            data_delta_structure_buffer += self.AlignData(self.PACK_DELTA_DATA(skuname,defaultstore,delta_data_set))\r
+            data_delta_structure_buffer += self.AlignData(self.PACK_DELTA_DATA(skuname,defaultstore,delta_data_set), 8)\r
 \r
-        return self.format_data(nv_default_part + data_delta_structure_buffer)\r
+        size = len(nv_default_part + data_delta_structure_buffer) + 16\r
+        maxsize = self.VpdRegionSize if self.VpdRegionSize else size\r
+        NV_Store_Default_Header = self.PACK_NV_STORE_DEFAULT_HEADER(size,maxsize)\r
+\r
+        self.NVHeaderBuff =  NV_Store_Default_Header\r
+        self.VarDefaultBuff =nv_default_part\r
+        self.VarDeltaBuff =  data_delta_structure_buffer\r
+        return self.format_data(NV_Store_Default_Header + nv_default_part + data_delta_structure_buffer)\r
 \r
 \r
     def format_data(self,data):\r
@@ -182,11 +214,13 @@ class VariableMgr(object):
     def dump(self):\r
 \r
         default_var_bin = self.new_process_varinfo()\r
-        value_str = "{"\r
-        default_var_bin_strip = [ data.strip("""'""") for data in default_var_bin]\r
-        value_str += ",".join(default_var_bin_strip)\r
-        value_str += "}"\r
-        return value_str\r
+        if default_var_bin:\r
+            value_str = "{"\r
+            default_var_bin_strip = [ data.strip("""'""") for data in default_var_bin]\r
+            value_str += ",".join(default_var_bin_strip)\r
+            value_str += "}"\r
+            return value_str\r
+        return ""\r
 \r
     def PACK_VARIABLE_STORE_HEADER(self,size):\r
         #Signature: gEfiVariableGuid\r
@@ -202,6 +236,16 @@ class VariableMgr(object):
 \r
         return GuidBuffer + SizeBuffer + FormatBuffer + StateBuffer + reservedBuffer\r
 \r
+    def PACK_NV_STORE_DEFAULT_HEADER(self,size,maxsize):\r
+        Signature = pack('=B',ord('N'))\r
+        Signature += pack("=B",ord('S'))\r
+        Signature += pack("=B",ord('D'))\r
+        Signature += pack("=B",ord('B'))\r
+\r
+        SizeBuffer = pack("=L",size)\r
+        MaxSizeBuffer = pack("=Q",maxsize)\r
+\r
+        return Signature + SizeBuffer + MaxSizeBuffer\r
 \r
     def PACK_VARIABLE_HEADER(self,attribute,namesize,datasize,vendorguid):\r
 \r
@@ -248,9 +292,9 @@ class VariableMgr(object):
 \r
     def PACK_DEFAULT_DATA(self, defaultstoragename,skuid,var_value):\r
         Buffer = ""\r
-        Buffer += pack("=L",8)\r
-        Buffer += pack("=H",int(defaultstoragename))\r
-        Buffer += pack("=H",int(skuid))\r
+        Buffer += pack("=L",4+8+8)\r
+        Buffer += pack("=Q",int(skuid))\r
+        Buffer += pack("=Q",int(defaultstoragename))\r
 \r
         for item in var_value:\r
             Buffer += pack("=B",item)\r
@@ -271,9 +315,9 @@ class VariableMgr(object):
         skuid = self.GetSkuId(skuname)\r
         defaultstorageid = self.GetDefaultStoreId(defaultstoragename)\r
         Buffer = ""\r
-        Buffer += pack("=L",8)\r
-        Buffer += pack("=H",int(skuid))\r
-        Buffer += pack("=H",int(defaultstorageid))\r
+        Buffer += pack("=L",4+8+8)\r
+        Buffer += pack("=Q",int(skuid))\r
+        Buffer += pack("=Q",int(defaultstorageid))\r
         for (delta_offset,value) in delta_list:\r
             Buffer += pack("=L",delta_offset)\r
             Buffer = Buffer[:-1] + pack("=B",value)\r
@@ -284,8 +328,9 @@ class VariableMgr(object):
 \r
     def AlignData(self,data, align = 4):\r
         mybuffer = data\r
-        for i in range(len(data) % align):\r
-            mybuffer += pack("=B",0)\r
+        if (len(data) % align) > 0:\r
+            for i in range(align - (len(data) % align)):\r
+                mybuffer += pack("=B",0)\r
 \r
         return mybuffer\r
 \r