faft: Move PREAMBLE_USE_RO_NORMAL to FAFTSequence
This flag is used frequently. Move it to FAFTSequence.
BUG=chromium-os:34147
TEST=Run the following tests:
$ run_remote_test.sh --remote=$IP CorruptFwBodyA/control$
$ run_remote_test.sh --remote=$IP CorruptFwBodyB/control$
$ run_remote_test.sh --remote=$IP CorruptBothFwBodyAB/control$
$ run_remote_test.sh --remote=$IP SoftwareSync/control$
$ run_remote_test.sh --remote=$IP RONormalBoot/control$
$ run_remote_test.sh --remote=$IP UpdateECBin/control$
$ run_remote_test.sh --remote=$IP ECWriteProtect/control$
Change-Id: I96930dfb4405a3108204054aa74a177042e1d3ec
Reviewed-on: https://gerrit.chromium.org/gerrit/32204
Reviewed-by: Mike Truty <truty@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
diff --git a/server/cros/faftsequence.py b/server/cros/faftsequence.py
index 33d0603..46c1860 100644
--- a/server/cros/faftsequence.py
+++ b/server/cros/faftsequence.py
@@ -220,6 +220,9 @@
VDAT_FLAG_EC_SOFTWARE_SYNC = 0x00000800
VDAT_FLAG_EC_SLOW_UPDATE = 0x00001000
+ # Firmware preamble flags
+ PREAMBLE_USE_RO_NORMAL = 0x00000001
+
_faft_template = {}
_faft_sequence = ()
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py b/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py
index 0b9bbb4..4fbd467 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py
@@ -21,8 +21,6 @@
"""
version = 1
- PREAMBLE_USE_RO_NORMAL = 1
-
use_ro = False
diff --git a/server/site_tests/firmware_CorruptFwBodyA/firmware_CorruptFwBodyA.py b/server/site_tests/firmware_CorruptFwBodyA/firmware_CorruptFwBodyA.py
index aaf5cb0..f599cc5 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/firmware_CorruptFwBodyA.py
+++ b/server/site_tests/firmware_CorruptFwBodyA/firmware_CorruptFwBodyA.py
@@ -19,8 +19,6 @@
"""
version = 1
- PREAMBLE_USE_RO_NORMAL = 1
-
def ensure_fw_a_boot(self):
"""Ensure firmware A boot this time.
diff --git a/server/site_tests/firmware_CorruptFwBodyB/firmware_CorruptFwBodyB.py b/server/site_tests/firmware_CorruptFwBodyB/firmware_CorruptFwBodyB.py
index 90c4710..df25627 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/firmware_CorruptFwBodyB.py
+++ b/server/site_tests/firmware_CorruptFwBodyB/firmware_CorruptFwBodyB.py
@@ -17,8 +17,6 @@
"""
version = 1
- PREAMBLE_USE_RO_NORMAL = 1
-
def ensure_fw_a_boot(self):
"""Ensure firmware A boot this time.
diff --git a/server/site_tests/firmware_ECWriteProtect/firmware_ECWriteProtect.py b/server/site_tests/firmware_ECWriteProtect/firmware_ECWriteProtect.py
index cc35700..25963a2 100644
--- a/server/site_tests/firmware_ECWriteProtect/firmware_ECWriteProtect.py
+++ b/server/site_tests/firmware_ECWriteProtect/firmware_ECWriteProtect.py
@@ -14,8 +14,6 @@
"""
version = 1
- PREAMBLE_USE_RO_NORMAL = 1
-
def ensure_fw_a_boot(self):
"""Ensure firmware A boot this time."""
diff --git a/server/site_tests/firmware_RONormalBoot/firmware_RONormalBoot.py b/server/site_tests/firmware_RONormalBoot/firmware_RONormalBoot.py
index 4902400..502c388 100644
--- a/server/site_tests/firmware_RONormalBoot/firmware_RONormalBoot.py
+++ b/server/site_tests/firmware_RONormalBoot/firmware_RONormalBoot.py
@@ -21,8 +21,6 @@
"""
version = 1
- PREAMBLE_USE_RO_NORMAL = 1
-
def ensure_fw_a_boot(self):
"""Ensure firmware A boot this time."""
diff --git a/server/site_tests/firmware_SoftwareSync/firmware_SoftwareSync.py b/server/site_tests/firmware_SoftwareSync/firmware_SoftwareSync.py
index 74b3120..07b0e9b 100644
--- a/server/site_tests/firmware_SoftwareSync/firmware_SoftwareSync.py
+++ b/server/site_tests/firmware_SoftwareSync/firmware_SoftwareSync.py
@@ -13,8 +13,6 @@
"""
version = 1
- PREAMBLE_USE_RO_NORMAL = 1
-
def ensure_fw_a_boot(self):
"""Ensure firmware A boot this time."""
diff --git a/server/site_tests/firmware_UpdateECBin/firmware_UpdateECBin.py b/server/site_tests/firmware_UpdateECBin/firmware_UpdateECBin.py
index 9589494..22908d3 100644
--- a/server/site_tests/firmware_UpdateECBin/firmware_UpdateECBin.py
+++ b/server/site_tests/firmware_UpdateECBin/firmware_UpdateECBin.py
@@ -25,8 +25,6 @@
"""
version = 1
- PREAMBLE_USE_RO_NORMAL = 1
-
def ensure_fw_a_boot(self):
"""Ensure firmware A boot this time."""