Fix SAFT operation on Alex.

saft_utility.py

 #!/usr/bin/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.
 
 '''Test utility for verifying ChromeOS firmware.'''
 
 import datetime
 import functools
 import getopt
@@ skipping 780 matching lines @@
             continue # ignore line breaks
         if not CHROS_IF.exec_exists(prog):
             missing_execs.append(prog)
     if missing_execs:
         usage('Program(s) %s not found in PATH' % ' '.join(missing_execs), 1)
 
     if 'image_file' not in opt_dictionary:
         usage(retv=1)
 
     FST.init_fw_test(opt_dictionary, CHROS_IF)
+
+    if not FLASHROM_HANDLER.firmware_sections_equal():
+        # This is a temporary measure needed to address the fact that the
+        # development BIOS image is built with 'normal' firmware in section B
+        # and 'development' firmware in section A. SAFT operation requires
+        # 'normal' flavor in both sections. Note that this fix does not affect
+        # the file of the new image, only the flashrom contents.
+        CHROS_IF.log('modify firmware A to match B')
+        FLASHROM_HANDLER.copy_from_to('b', 'a')
     CHROS_IF.log('program the new image')
     FLASHROM_HANDLER.write_whole()
     CHROS_IF.log('restart')
     CHROS_IF.run_shell_command('reboot')
     return 0
 
 
 if __name__ == '__main__':
     try:
         main(sys.argv)
     except (getopt.GetoptError, ImportError):
         usage(sys.exc_info()[1], 1)
     except (FwError, flashrom_handler.FlashromHandlerError):
         MSG = 'Error: %s' % str(sys.exc_info()[1])
         print MSG
         CHROS_IF.log(MSG)
         sys.exit(1)
 
     sys.exit(0)