autotest: Update flashrom syntax for "-p" option
This does a simple find/replace of instances where the old flashrom
"-p" syntax is used to specify the target. The new syntax is more
intuitive and more reliable since it removes any ambiguity about
what device is actually being targeted, since some targets such as
the EC can be on different busses on different platforms.
Old syntax:
Host/BIOS ROM: -p internal:bus=spi
EC: -p internal:bus=lpc
New syntax:
Host/BIOS ROM -p host
EC: -p ec
BUG=chrome-os-partner:33452
BRANCH=none
TEST=needs testing
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Change-Id: I5753a2f7402928dafbdaa31f5eec3f49612e1648
Reviewed-on: https://chromium-review.googlesource.com/226951
Reviewed-by: Yusuf Mohsinally <mohsinally@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@chromium.org>
diff --git a/client/cros/faft/utils/saft_flashrom_util.py b/client/cros/faft/utils/saft_flashrom_util.py
index 043f5b6..19bc3a1 100644
--- a/client/cros/faft/utils/saft_flashrom_util.py
+++ b/client/cros/faft/utils/saft_flashrom_util.py
@@ -231,12 +231,12 @@
def _enable_bios_access(self):
if not self.os_if.target_hosted():
return
- self._target_command = '-p internal:bus=spi'
+ self._target_command = '-p host'
def _enable_ec_access(self):
if not self.os_if.target_hosted():
return
- self._target_command = '-p internal:bus=lpc'
+ self._target_command = '-p ec'
def get_temp_filename(self, prefix):
""" (internal) Returns name of a temporary file in self.tmp_root """
diff --git a/client/site_tests/firmware_LockedME/firmware_LockedME.py b/client/site_tests/firmware_LockedME/firmware_LockedME.py
index c757fa3..92d909f 100644
--- a/client/site_tests/firmware_LockedME/firmware_LockedME.py
+++ b/client/site_tests/firmware_LockedME/firmware_LockedME.py
@@ -19,7 +19,7 @@
def flashrom(self, ignore_status=False, args=()):
"""Run flashrom, expect it to work. Fail if it doesn't"""
- extra = ['-p', 'internal:bus=spi'] + list(args)
+ extra = ['-p', 'host'] + list(args)
return utils.run('flashrom', ignore_status=ignore_status, args=extra)
def has_ME(self):
diff --git a/client/site_tests/firmware_RomSize/firmware_RomSize.py b/client/site_tests/firmware_RomSize/firmware_RomSize.py
index 3bab1ab..5d627b2 100644
--- a/client/site_tests/firmware_RomSize/firmware_RomSize.py
+++ b/client/site_tests/firmware_RomSize/firmware_RomSize.py
@@ -8,8 +8,8 @@
class firmware_RomSize(test.test):
version = 3
- TARGET_BIOS = '-p internal:bus=spi'
- TARGET_EC = '-p internal:bus=lpc'
+ TARGET_BIOS = '-p host'
+ TARGET_EC = '-p ec'
def get_size(self, target):
data = utils.system_output("flashrom --get-size %s" % target)
diff --git a/server/site_tests/platform_InstallFW/platform_InstallFW.py b/server/site_tests/platform_InstallFW/platform_InstallFW.py
index 825cd12..2d59ee0 100644
--- a/server/site_tests/platform_InstallFW/platform_InstallFW.py
+++ b/server/site_tests/platform_InstallFW/platform_InstallFW.py
@@ -36,14 +36,14 @@
host.run("sudo /bin/sh %s --mode recovery --update_main "
"--noupdate_ec" % fw_dst)
else:
- host.run("sudo /usr/sbin/flashrom -p internal:bus=spi -w %s"
+ host.run("sudo /usr/sbin/flashrom -p host -w %s"
% fw_dst)
if fw_type == "ec":
if is_shellball:
host.run("sudo /bin/sh %s --mode recovery --update_ec "
"--noupdate_main" % fw_dst)
else:
- host.run("sudo /usr/sbin/flashrom -p internal:bus=lpc -w %s"
+ host.run("sudo /usr/sbin/flashrom -p ec -w %s"
% fw_dst)
# Reboot client after installing the binary.
host.reboot()
