Refactor site_fmap, flashrom_utils and gbb_utils module into client/cros.

client/site_tests/hardware_Components/firmware_hash.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.
 
 
 import hashlib
 import optparse
 import os
 import sys
 import tempfile
 
 
 # This file may be shared by autotest framework and some command line tools
 # setting PYTHONPATH, so we need to try different importing paths here.
 try:
-    from autotest_lib.client.common_lib import flashrom_util
-    from autotest_lib.client.common_lib import site_fmap
+    from autotest_lib.client.cros import flashrom_util
+    from autotest_lib.client.cros import fmap
 except ImportError:
     # try to load from pre-defined PYTHONPATH
     import flashrom_util
-    import site_fmap
+    import fmap
 
 
 def get_bios_ro_hash(file_source=None, exception_type=Exception):
     """
     Returns a hash of Read Only (BIOS) firmware parts,
     to confirm we have proper keys / boot code / recovery image installed.
 
     Args:
         file_source: None to read BIOS from system flash rom, or any string
         value as the file name of firmware image to read.
     """
     # hash_ro_list: RO section to be hashed
     hash_src = ''
     hash_ro_list = ['FV_BSTUB', 'FV_GBB', 'FVDEV']
     hash_ro_section = 'RO_SECTION'
 
     flashrom = flashrom_util.FlashromUtility()
     flashrom.initialize(flashrom.TARGET_BIOS, target_file=file_source)
 
     image = flashrom.get_current_image()
-    fmap_obj = site_fmap.fmap_decode(image)
+    fmap_obj = fmap.fmap_decode(image)
     if not fmap_obj:
         raise exception_type('No FMAP structure in flashrom.')
 
     # XXX Allowing the FMAP to override our default layout may be an exploit
     # here, because vendor can provide fake (non-used) GBB/BSTUB in unused
     # area.  However since the flash memory layout may change, we need to
     # trust FMAP here.
     # TODO(hungte) we can check that FMAP must reside in RO section, and the
     # BSTUB must be aligned to bottom of firmware.
-    hash_src = hash_src + site_fmap.fmap_encode(fmap_obj)
+    hash_src = hash_src + fmap.fmap_encode(fmap_obj)
 
     # New firmware spec defined new "RO_SECTION" which includes all sections to
     # be hashed. When that section exists, we should override hash_ro_list.
     if hash_ro_section in flashrom.layout:
         hash_ro_list = [hash_ro_section]
 
     for section in hash_ro_list:
         src = flashrom.read_section(section)
         if not src:
             raise exception_type('Cannot get section [%s] from flashrom' %
@@ skipping 84 matching lines @@
     elif target == 'ec':
         print get_ec_hash(image)
 
     # Remove the temporary GBB-modified file.
     if modified_image:
         os.remove(modified_image)
 
 
 if __name__ == "__main__":
     main()