commit 5b07139a26622bd20860184dd260073ce01cf6f3
author Alex Chou <Alex.Chou@quanta.corp-partner.google.com> Thu Aug 13 09:45:14 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Fri Aug 14 14:00:04 2020 +0000
tree 9446a151084315c016dbfca975b1b5f1cb90cb63
parent 79010b51af317876aba865f08729874309ad5604

gooftool: Use cros_config as the primary way to identify FP SKU

BUG=b:163301565
TEST=manually test on the DUT

Change-Id: Ifbf1008040f5edcd650d9e8a7df958467e1427ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/factory/+/2352951
Tested-by: Alex Chou <alex.chou@quanta.corp-partner.google.com>
Reviewed-by: Stimim Chen <stimim@chromium.org>
Commit-Queue: Alex Chou <alex.chou@quanta.corp-partner.google.com>

py/gooftool/commands.py

diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index cf97522..43ed85f 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -76,18 +76,15 @@
 
   if _has_fpmcu is None:
     FPMCU_PATH = '/dev/cros_fp'
-    has_fpmcu_path = os.path.exists(FPMCU_PATH)
     has_cros_config_fpmcu = False
     cros_config_output = Shell(['cros_config', '/fingerprint', 'board'])
     if cros_config_output.success and cros_config_output.stdout:
       has_cros_config_fpmcu = True
 
-    if has_fpmcu_path is False and has_cros_config_fpmcu is True:
+    if not os.path.exists(FPMCU_PATH) and has_cros_config_fpmcu:
       raise Error('FPMCU found in cros_config but missing in %s.' % FPMCU_PATH)
-    if has_fpmcu_path is True and has_cros_config_fpmcu is False:
-      raise Error('FPMCU found in %s but missing in cros_config.' % FPMCU_PATH)
 
-    _has_fpmcu = has_fpmcu_path
+    _has_fpmcu = has_cros_config_fpmcu
 
   return _has_fpmcu