Add EC hash in hardware_Components database

client/common_lib/flashrom_util.py

 #!/usr/bin/env python
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 This module provides convenience routines to access Flash ROM (EEPROM).
  - flashrom_util is a low level wrapper of flashrom(8) program.
  - FlashromUtility is a high level object which provides more advanced
    features like journaling-alike (log-based) changing.
@@ skipping 768 matching lines @@
             from_image = self.get_latest_changed_image()
         return self.flashrom.get_section(from_image, self.layout, section)
 
     def write_section(self, section, data):
         """ Change the section data of latest changed image. """
         new_image = self.get_latest_changed_image()
         new_image = self.flashrom.put_section(new_image, self.layout, section, \
                                               data)
         return self.image_copy(section, section, new_image)
 
-    def verify_sections(self, from_list, to_list, from_image, to_image):
+    def get_verification_image(self, from_image, pad_value=chr(0)):
         """
-        Compares if sections in from_list and to_list are the same, skipping
-        by self.skip_verify description.
-
-        If from_list and to_list are both empty list ([]), compare whole image
+        Returns an image derived from from_image with "skip verification"
+        regions padded by pad_value.
         """
-        # simplify arguments and local variables
-        from_list = csv_to_list(from_list)
-        to_list = csv_to_list(to_list)
-        flashrom = self.flashrom
         layout = self.layout
 
         # decode skip_verify with layout, and then modify images
         for verify_tuple in csv_to_list(self.skip_verify):
             (name, offset, size) = verify_tuple.split(':')
             name = name.strip()
             offset = int(offset.strip(), 0)
             size = int(size.strip(), 0)
-            assert name in layout, "(verify_sec) Unknown section name: " + name
+            assert name in layout, "(make_verify) Unknown section name: " + name
             if self.is_debug:
                 print " ** skipping range: %s +%d [%d]" % (name, offset, size)
             # XXX we use the layout's internal structure here...
             offset = layout[name][0] + offset
-            from_image = from_image[:offset] + (chr(0)*size) + \
+            from_image = from_image[:offset] + (pad_value * size) + \
                          from_image[(offset + size):]
-            to_image = to_image[:offset] + (chr(0) * size) + \
-                       to_image[(offset + size):]
+        return from_image
+
+    def verify_sections(self, from_list, to_list, from_image, to_image):
+        """
+        Compares if sections in from_list and to_list are the same, skipping
+        by self.skip_verify description.
+
+        If from_list and to_list are both empty list ([]), compare whole image
+        """
+        # simplify arguments and local variables
+        from_list = csv_to_list(from_list)
+        to_list = csv_to_list(to_list)
+        flashrom = self.flashrom
+
+        # prepare verification image
+        if self.skip_verify:
+            from_image = self.get_verification_image(from_image)
+            to_image = self.get_verification_image(to_image)
 
         # compare sections in image
         if not (from_list or to_list):
             return from_image == to_image
         for (f, t) in zip(from_list, to_list):
             data_f = flashrom.get_section(from_image, layout, f)
             data_t = flashrom.get_section(to_image, layout, t)
             if data_f != data_t:
                 return False
         return True
@@ skipping 90 matching lines @@
 except ImportError:
     # print 'using mocks'
     utils = mock_utils()
     TestError = mock_TestError
 
 
 # main stub
 if __name__ == "__main__":
     # TODO(hungte) provide unit tests or command line usage
     pass