saft: update 'flashrom_util' to use new syntax

saft_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)
 
 saft_flashrom_util is based on utility 'flashrom'.
 
 Original tool syntax:
@@ skipping 199 matching lines @@
         keep_temp_files: boolean flag to control cleaning of temporary files
     """
 
     def __init__(self, verbose=False, keep_temp_files=False):
         """ constructor of flashrom_util. help(flashrom_util) for more info """
         self.verbose = verbose
         self.keep_temp_files = keep_temp_files
         self.bios_layout = {}
         self.os_if = chromeos_interface.ChromeOSInterface(True)
         self.os_if.init(tempfile.gettempdir())
+        self._target_command = ''
         self._enable_bios_access()
 
     def _enable_bios_access(self):
         if not self.os_if.target_hosted():
             return
-        value = int(self.os_if.run_shell_command_get_output(
-            'iotools mmio_read32 0xfed1f410')[0], 0)
-        value = (value & 0xffff0000) + 0x460
-        self.os_if.run_shell_command(
-            'iotools mmio_write32 0xfed1f410 0x%x' % value)
+        self._target_command = '-p internal:bus=spi'

[vb, 2011/03/02 17:50:08]

why not to make it 'flashrom -p internal:bus=spi' - just a thought.

[Hung-Te, 2011/03/03 06:52:29]

 Because I'm not sure if SAFT will need to deal with EC in the future, so trying
to keep max flexibility here.

 
     def get_temp_filename(self, prefix):
         ''' (internal) Returns name of a temporary file in self.tmp_root '''
         (fd, name) = tempfile.mkstemp(prefix=prefix)
         os.close(fd)
         return name
 
     def remove_temp_file(self, filename):
         """ (internal) Removes a temp file if self.keep_temp_files is false. """
         if self.keep_temp_files:
@@ skipping 50 matching lines @@
 
         scraper = LayoutScraper(self.os_if)
         self.bios_layout = scraper.get_layout(file_name)
 
     def read_whole(self):
         '''
         Reads whole flash ROM data.
         Returns the data read from flash ROM, or empty string for other error.
         '''
         tmpfn = self.get_temp_filename('rd_')
-        cmd = 'flashrom -r "%s"' % (tmpfn)
+        cmd = 'flashrom %s -r "%s"' % (self._target_command, tmpfn)
         if self.verbose:
             print 'flashrom_util.read_whole(): ', cmd
 
         self.os_if.run_shell_command(cmd)
         result = open(tmpfn, 'rb').read()
         self.set_bios_layout(tmpfn)
 
         # clean temporary resources
         self.remove_temp_file(tmpfn)
         return result
 
     def write_partial(self, base_image, write_list, write_layout_map=None):
         '''
         Writes data in sections of write_list to flash ROM.
         An exception is raised if write operation fails.
         '''
 
         if write_layout_map:
             layout_map = write_layout_map
         else:
             layout_map = self.bios_layout
 
         tmpfn = self.get_temp_filename('wr_')
         open(tmpfn, 'wb').write(base_image)
         layout_fn = self.create_layout_file(layout_map)
 
-        cmd = 'flashrom -l "%s" -i %s -w "%s"' % (
-                layout_fn, ' -i '.join(write_list), tmpfn)
+        cmd = 'flashrom %s -l "%s" -i %s -w "%s"' % (
+                self._target_command, layout_fn, ' -i '.join(write_list), tmpfn)
         if self.verbose:
             print 'flashrom.write_partial(): ', cmd
 
         self.os_if.run_shell_command(cmd)
 
         # clean temporary resources
         self.remove_temp_file(tmpfn)
         self.remove_temp_file(layout_fn)
 
     def write_whole(self, base_image):
         '''Write the whole base image. '''
         layout_map = { 'all': (0, len(base_image) - 1) }
         self.write_partial(base_image, ('all',), layout_map)