gooftool: always process EC before BIOS (workaround for buggy EC)

gooftool

 #!/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.
 
 """
 gooftool: Google Factory Tool, providing all Google Required Test
           functionality.
 """
@@ skipping 294 matching lines @@
     ErrorDie('upload_report: failed to upload.')
   return True
 
 
 @GFTLogCommand
 def wpfw():
   """ Enables and verifies firmware write protection. """
   if g_options.debug_dryrun_wpfw:
     ErrorMsg('wpfw is by-passed. This device CANNOT be qualified.')
     return True
-  if EnableWriteProtect('bios') and EnableWriteProtect('ec'):
+  if EnableWriteProtect('ec') and EnableWriteProtect('bios'):
     return True
   ErrorDie('wpfw: failed to enable firmware write protection.')
 
 
 @GFTLogCommand
 def prepare_wipe():
   """ Prepares system to reboot for transitioning to release state. """
   if g_options.debug_dryrun_prepare_wipe:
     ErrorMsg('prepare_wipe is by-passed. This device CANNOT be qualified.')
     return True
@@ skipping 91 matching lines @@
   parser.add_option('--upload_method', metavar='METHOD:PARAM',
                     help='assign the upload method (see gft_upload).')
 
   # Write Protection Wiping, and Finalization
   parser.add_option('--wpfw', action='store_true',
                     help='enable and verify firmware write protection')
   parser.add_option('--prepare_wipe', action='store_true',
                     help='prepare for wiping factory tests and '
                         'transit to release mode in next reboot')
   parser.add_option('--verify', action='store_true',
-                    help='runs: --verify_switch-wp, --verify_switch_dev, '
+                    help='runs: --verify_switch_wp, --verify_switch_dev, '
                          '--verify_hwid, --verify_keys')
   parser.add_option('--finalize', action='store_true',
                     help='runs: --verify, --wpfw, '
                          '--create_report, --upload_report, --prepare_wipe')
   return parser
 
 
 ########################################################################
 # main entry
 
@@ skipping 39 matching lines @@
       return_value = 1
     executed_commands = executed_commands + 1
 
   if executed_commands == 0:
     parser.print_help()
   return return_value
 
 
 if __name__ == '__main__':
   sys.exit(_main())