FAFT: Remove unused FAFT config attributes
Remove unused FAFT config attributes, i.e. long_rec_combo, use_u_boot,
gbb_version, key_checker, key_checker_strict, legacy_text_screen, beep,
devserver, user_power_cycle.
BUG=b:127960655
TEST=Search the code base to ensure no one uses these attributes.
Change-Id: Ia3881ee3f8b4206cea851b2ce6930a5f99e0579d
Reviewed-on: https://chromium-review.googlesource.com/1531318
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Greg Edelston <gredelston@google.com>
diff --git a/server/cros/faft/config/DEFAULTS.py b/server/cros/faft/config/DEFAULTS.py
index c7119a4..04642bd 100644
--- a/server/cros/faft/config/DEFAULTS.py
+++ b/server/cros/faft/config/DEFAULTS.py
@@ -24,25 +24,8 @@
has_keyboard = True
has_powerbutton = True
rec_button_dev_switch = False
- long_rec_combo = False
- use_u_boot = False
ec_capability = list()
- gbb_version = 1.1
spi_voltage = 'pp1800'
- key_checker = [[0x29, 'press'],
- [0x32, 'press'],
- [0x32, 'release'],
- [0x29, 'release'],
- [0x28, 'press'],
- [0x28, 'release']]
- key_checker_strict = [[0x29, 'press'],
- [0x29, 'release'],
- [0x32, 'press'],
- [0x32, 'release'],
- [0x28, 'press'],
- [0x28, 'release'],
- [0x61, 'press'],
- [0x61, 'release']]
# Has eventlog support including proper timestamps. (Only for old boards!
# Never disable this "temporarily, until we get around to implementing it"!)
@@ -59,15 +42,9 @@
# Delay between keypresses in firmware screen
confirm_screen = 3
- # Delay between passing firmware screen and text mode warning screen
- legacy_text_screen = 20
-
# The developer screen timeouts fit our spec
dev_screen_timeout = 30
- # Delay for waiting beep done
- beep = 1
-
# Delay between power-on and plug USB
usb_plug = 10
@@ -99,12 +76,6 @@
# (also known as SHORT_DELAY in hdctools)
hold_pwr_button_poweron = 0.2
- # devserver startup time
- devserver = 10
-
- # Delay for user to power cycle the device
- user_power_cycle = 20
-
# Delay after /sbin/shutdown before pressing power button
powerup_ready = 10
diff --git a/server/cros/faft/config/cyan.py b/server/cros/faft/config/cyan.py
index 1872f1d..e9326cb 100644
--- a/server/cros/faft/config/cyan.py
+++ b/server/cros/faft/config/cyan.py
@@ -13,6 +13,5 @@
'usb', 'smart_usb_charge']
firmware_screen = 28
usb_plug = 28
- long_rec_combo = True
spi_voltage = 'pp1800'
smm_store = False
diff --git a/server/cros/faft/config/link.py b/server/cros/faft/config/link.py
index e9461bb..736c1d1 100644
--- a/server/cros/faft/config/link.py
+++ b/server/cros/faft/config/link.py
@@ -9,8 +9,6 @@
"""FAFT config values for Link."""
firmware_screen = 7
chrome_ec = True
- long_rec_combo = True
- use_u_boot = True
dark_resume_capable = True
ec_capability = ['adc_ectemp', 'battery', 'charging',
'keyboard', 'lid', 'x86', 'thermal',
diff --git a/server/cros/faft/config/octopus.py b/server/cros/faft/config/octopus.py
index 5e50c51..aac18aa 100644
--- a/server/cros/faft/config/octopus.py
+++ b/server/cros/faft/config/octopus.py
@@ -12,7 +12,6 @@
'usb', 'smart_usb_charge']
firmware_screen = 25 # Time from deasserting cold_reset to firmware_screen being shown
usb_plug = 45
- long_rec_combo = True
spi_voltage = 'pp1800'
custom_usb_enable_names = ['EN_USB_A0_5V', 'EN_USB_A1_5V']
smm_store = False
diff --git a/server/cros/faft/config/parrot.py b/server/cros/faft/config/parrot.py
index b502054..98102a5 100644
--- a/server/cros/faft/config/parrot.py
+++ b/server/cros/faft/config/parrot.py
@@ -12,10 +12,4 @@
ec_boot_to_console = 4
dark_resume_capable = True
- key_checker = [[0x29, 'press'],
- [0x32, 'press'],
- [0x32, 'release'],
- [0x29, 'release'],
- [0x47, 'press'],
- [0x47, 'release']]
smm_store = False
diff --git a/server/cros/faft/config/rambi.py b/server/cros/faft/config/rambi.py
index 3609470..c3069e8 100644
--- a/server/cros/faft/config/rambi.py
+++ b/server/cros/faft/config/rambi.py
@@ -12,6 +12,5 @@
ec_capability = ['battery', 'charging', 'keyboard', 'lid', 'x86',
'usb', 'smart_usb_charge']
firmware_screen = 7
- long_rec_combo = True
spi_voltage = 'pp1800'
smm_store = False
diff --git a/server/cros/faft/config/reef.py b/server/cros/faft/config/reef.py
index a142f66..b0fcf22 100644
--- a/server/cros/faft/config/reef.py
+++ b/server/cros/faft/config/reef.py
@@ -12,6 +12,5 @@
'usb', 'smart_usb_charge']
firmware_screen = 25 # Time from deasserting cold_reset to firmware_screen being shown
usb_plug = 45
- long_rec_combo = True
spi_voltage = 'pp1800'
smm_store = False
diff --git a/server/cros/faft/config/skate.py b/server/cros/faft/config/skate.py
index d2dbdde..b8f1bc4 100644
--- a/server/cros/faft/config/skate.py
+++ b/server/cros/faft/config/skate.py
@@ -9,7 +9,6 @@
"""FAFT config values for Skate."""
software_sync_update = 6
chrome_ec = True
- use_u_boot = True
ec_capability = (['battery', 'keyboard', 'arm', 'lid'])
ec_has_powerbtn_cmd = False
has_eventlog = False # No RTC support in firmware
diff --git a/server/cros/faft/config/snow.py b/server/cros/faft/config/snow.py
index 9751f33..9d987ba 100644
--- a/server/cros/faft/config/snow.py
+++ b/server/cros/faft/config/snow.py
@@ -11,5 +11,4 @@
ec_capability = (['battery', 'keyboard', 'arm'])
ec_boot_to_console = 0.4
ec_has_powerbtn_cmd = False
- use_u_boot = True
has_eventlog = False
diff --git a/server/cros/faft/config/spring.py b/server/cros/faft/config/spring.py
index 279c07a..aca24c8 100644
--- a/server/cros/faft/config/spring.py
+++ b/server/cros/faft/config/spring.py
@@ -9,7 +9,6 @@
"""FAFT config values for Spring."""
software_sync_update = 6
chrome_ec = True
- use_u_boot = True
ec_capability = (['battery', 'keyboard', 'arm', 'lid'])
ec_has_powerbtn_cmd = False
has_eventlog = False # No RTC support in firmware
diff --git a/server/cros/faft/config/stout.py b/server/cros/faft/config/stout.py
index ef1be89..6f87357 100644
--- a/server/cros/faft/config/stout.py
+++ b/server/cros/faft/config/stout.py
@@ -7,10 +7,4 @@
class Values():
"""FAFT config values for Stout."""
- key_checker = [[0x29, 'press'],
- [0x32, 'press'],
- [0x32, 'release'],
- [0x29, 'release'],
- [0x43, 'press'],
- [0x43, 'release']]
smm_store = False
diff --git a/server/cros/faft/config/strago.py b/server/cros/faft/config/strago.py
index a5cda77..55ba467 100644
--- a/server/cros/faft/config/strago.py
+++ b/server/cros/faft/config/strago.py
@@ -12,6 +12,5 @@
'usb', 'smart_usb_charge']
firmware_screen = 25 # Time from deasserting cold_reset to firmware_screen being shown
usb_plug = 45
- long_rec_combo = True
spi_voltage = 'pp1800'
smm_store = False
diff --git a/server/cros/faft/firmware_test.py b/server/cros/faft/firmware_test.py
index 0bf4875..7c54c29 100644
--- a/server/cros/faft/firmware_test.py
+++ b/server/cros/faft/firmware_test.py
@@ -897,10 +897,6 @@
def _setup_gbb_flags(self):
"""Setup the GBB flags for FAFT test."""
- if self.faft_config.gbb_version < 1.1:
- logging.info('Skip modifying GBB on versions older than 1.1.')
- return
-
if self.check_setup_done('gbb_flags'):
return