BaseTools: Update NV Default Header format to include the max size

[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 7ee39796e345e043c70e8f7b495f2593c26b3fc0..47569d489482f6249553f4b56c0ce7d413e6c7e1 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("=L",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
@@ -118,7 +140,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","STANDARD"),{})\r
         NvStoreDataBuffer = ""\r
         var_data_offset = collections.OrderedDict()\r
         offset = NvStorageHeaderSize\r
@@ -132,11 +154,6 @@ class VariableMgr(object):
             else:\r
                 var_attr_value = 0x07\r
 \r
-#             print "default var_name_buffer"\r
-#             print self.format_data(var_name_buffer)\r
-#             print "default var_buffer"\r
-#             print self.format_data(default_data)\r
-\r
             DataBuffer = self.AlignData(var_name_buffer + default_data)\r
 \r
             data_size = len(DataBuffer)\r
@@ -151,8 +168,6 @@ class VariableMgr(object):
 \r
         nv_default_part = self.AlignData(self.PACK_DEFAULT_DATA(0, 0, self.unpack_data(variable_storage_header_buffer+NvStoreDataBuffer)))\r
 \r
-#         print "default whole data \n",self.format_data(nv_default_part)\r
-\r
         data_delta_structure_buffer = ""\r
         for skuname,defaultstore in var_data:\r
             if (skuname,defaultstore) == ("DEFAULT","STANDARD"):\r
@@ -166,11 +181,15 @@ class VariableMgr(object):
                 delta_data_set.extend(delta_data)\r
 \r
             data_delta_structure_buffer += self.AlignData(self.PACK_DELTA_DATA(skuname,defaultstore,delta_data_set))\r
-#             print "delta data"\r
-#             print delta_data_set\r
-#             print self.format_data(self.AlignData(self.PACK_DELTA_DATA(skuname,defaultstore,delta_data_set)))\r
 \r
-        return self.format_data(nv_default_part + data_delta_structure_buffer)\r
+        size = len(nv_default_part + data_delta_structure_buffer) + 12\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
@@ -184,8 +203,6 @@ class VariableMgr(object):
         return final_data\r
 \r
     def calculate_delta(self, default, theother):\r
-#         print "default data \n", default\r
-#         print "other data \n",theother\r
         if len(default) - len(theother) != 0:\r
             EdkLogger.error("build", FORMAT_INVALID, 'The variable data length is not the same for the same PCD.')\r
         data_delta = []\r
@@ -219,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("=L",maxsize)\r
+\r
+        return Signature + SizeBuffer + MaxSizeBuffer\r
 \r
     def PACK_VARIABLE_HEADER(self,attribute,namesize,datasize,vendorguid):\r
 \r