Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-releasefirmware-fpmcu-bloonchipper-release

Generated by: ./util/update_release_branch.py --board bloonchipper
--relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-
fpmcu-bloonchipper-release

Relevant changes:

git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh

ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dc3e9008b8 board/hatch_fp/board.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header

BRANCH=None
BUG=b:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
     Test "aes": PASSED
     Test "cec": PASSED
     Test "cortexm_fpu": PASSED
     Test "crc": PASSED
     Test "flash_physical": PASSED
     Test "flash_write_protect": PASSED
     Test "fpsensor_hw": PASSED
     Test "fpsensor_spi_ro": PASSED
     Test "fpsensor_spi_rw": PASSED
     Test "fpsensor_uart_ro": PASSED
     Test "fpsensor_uart_rw": PASSED
     Test "mpu_ro": PASSED
     Test "mpu_rw": PASSED
     Test "mutex": PASSED
     Test "pingpong": PASSED
     Test "printf": PASSED
     Test "queue": PASSED
     Test "rollback_region0": PASSED
     Test "rollback_region1": PASSED
     Test "rollback_entropy": PASSED
     Test "rtc": PASSED
     Test "sha256": PASSED
     Test "sha256_unrolled": PASSED
     Test "static_if": PASSED
     Test "stdlib": PASSED
     Test "system_is_locked_wp_on": PASSED
     Test "system_is_locked_wp_off": PASSED
     Test "timer_dos": PASSED
     Test "utils": PASSED
     Test "utils_str": PASSED
     Test "stm32f_rtc": PASSED
     Test "panic_data_bloonchipper_v2.0.4277": PASSED
     Test "panic_data_bloonchipper_v2.0.5938": PASSED

Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3

1 files changed, 49 insertions, 46 deletions

diff --git a/extra/usb_power/convert_servo_ina.py b/extra/usb_power/convert_servo_ina.py
index 1c70f31aeb..1deb75cda4 100755
--- a/extra/usb_power/convert_servo_ina.py
+++ b/extra/usb_power/convert_servo_ina.py
@@ -1,11 +1,7 @@
 #!/usr/bin/env python
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-#
-# Ignore indention messages, since legacy scripts use 2 spaces instead of 4.
-# pylint: disable=bad-indentation,docstring-section-indent
-# pylint: disable=docstring-trailing-quotes
 
 """Program to convert power logging config from a servo_ina device
    to a sweetberry config.
@@ -14,67 +10,74 @@
 # Note: This is a py2/3 compatible file.
 
 from __future__ import print_function
+
 import os
 import sys
 
 
 def fetch_records(basename):
-  """Import records from servo_ina file.
+    """Import records from servo_ina file.
 
-  servo_ina files are python imports, and have a list of tuples with
-  the INA data.
-  (inatype, i2caddr, rail name, bus voltage, shunt ohms, mux, True)
+    servo_ina files are python imports, and have a list of tuples with
+    the INA data.
+    (inatype, i2caddr, rail name, bus voltage, shunt ohms, mux, True)
 
-  Args:
-    basename: python import name (filename -.py)
+    Args:
+      basename: python import name (filename -.py)
 
-  Returns:
-    list of tuples as described above.
-  """
-  ina_desc = __import__(basename)
-  return ina_desc.inas
+    Returns:
+      list of tuples as described above.
+    """
+    ina_desc = __import__(basename)
+    return ina_desc.inas
 
 
 def main(argv):
-  if len(argv) != 2:
-    print("usage:")
-    print(" %s input.py" % argv[0])
-    return
+    if len(argv) != 2:
+        print("usage:")
+        print(" %s input.py" % argv[0])
+        return
 
-  inputf = argv[1]
-  basename = os.path.splitext(inputf)[0]
-  outputf = basename + '.board'
-  outputs = basename + '.scenario'
+    inputf = argv[1]
+    basename = os.path.splitext(inputf)[0]
+    outputf = basename + ".board"
+    outputs = basename + ".scenario"
 
-  print("Converting %s to %s, %s" % (inputf, outputf, outputs))
+    print("Converting %s to %s, %s" % (inputf, outputf, outputs))
 
-  inas = fetch_records(basename)
+    inas = fetch_records(basename)
 
+    boardfile = open(outputf, "w")
+    scenario = open(outputs, "w")
 
-  boardfile = open(outputf, 'w')
-  scenario = open(outputs, 'w')
+    boardfile.write("[\n")
+    scenario.write("[\n")
+    start = True
 
-  boardfile.write('[\n')
-  scenario.write('[\n')
-  start = True
+    for rec in inas:
+        if start:
+            start = False
+        else:
+            boardfile.write(",\n")
+            scenario.write(",\n")
 
-  for rec in inas:
-    if start:
-      start = False
-    else:
-      boardfile.write(',\n')
-      scenario.write(',\n')
+        record = (
+            '  {"name": "%s", "rs": %f, "sweetberry": "A", "channel": %d}'
+            % (
+                rec[2],
+                rec[4],
+                rec[1] - 64,
+            )
+        )
+        boardfile.write(record)
+        scenario.write('"%s"' % rec[2])
 
-    record = '  {"name": "%s", "rs": %f, "sweetberry": "A", "channel": %d}' % (
-             rec[2], rec[4], rec[1] - 64)
-    boardfile.write(record)
-    scenario.write('"%s"' % rec[2])
+    boardfile.write("\n")
+    boardfile.write("]")
 
-  boardfile.write('\n')
-  boardfile.write(']')
+    scenario.write("\n")
+    scenario.write("]")
 
-  scenario.write('\n')
-  scenario.write(']')
 
 if __name__ == "__main__":
-  main(sys.argv)
+    main(sys.argv)