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, 120 insertions, 75 deletions

diff --git a/util/test_kconfig_check.py b/util/test_kconfig_check.py
index cd1b9bf098..3e459006b1 100644
--- a/util/test_kconfig_check.py
+++ b/util/test_kconfig_check.py
@@ -1,4 +1,4 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Copyright 2021 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Test for Kconfig checker"""
@@ -16,7 +16,8 @@ import kconfig_check
 
 # Prefix that we strip from each Kconfig option, when considering whether it is
 # equivalent to a CONFIG option with the same name
-PREFIX = 'PLATFORM_EC_'
+PREFIX = "PLATFORM_EC_"
+
 
 @contextlib.contextmanager
 def capture_sys_output():
@@ -39,38 +40,50 @@ def capture_sys_output():
 # directly from Python. You can still run this test with 'pytest' if you like.
 class KconfigCheck(unittest.TestCase):
     """Tests for the KconfigCheck class"""
+
     def test_simple_check(self):
         """Check it detected a new ad-hoc CONFIG"""
         checker = kconfig_check.KconfigCheck()
-        self.assertEqual(['NEW_ONE'], checker.find_new_adhoc(
-            configs=['NEW_ONE', 'OLD_ONE', 'IN_KCONFIG'],
-            kconfigs=['IN_KCONFIG'],
-            allowed=['OLD_ONE']))
+        self.assertEqual(
+            ["NEW_ONE"],
+            checker.find_new_adhoc(
+                configs=["NEW_ONE", "OLD_ONE", "IN_KCONFIG"],
+                kconfigs=["IN_KCONFIG"],
+                allowed=["OLD_ONE"],
+            ),
+        )
 
     def test_sorted_check(self):
         """Check it sorts the results in order"""
         checker = kconfig_check.KconfigCheck()
         self.assertSequenceEqual(
-            ['ANOTHER_NEW_ONE', 'NEW_ONE'],
+            ["ANOTHER_NEW_ONE", "NEW_ONE"],
             checker.find_new_adhoc(
-                configs=['NEW_ONE', 'ANOTHER_NEW_ONE', 'OLD_ONE', 'IN_KCONFIG'],
-                kconfigs=['IN_KCONFIG'],
-                allowed=['OLD_ONE']))
+                configs=["NEW_ONE", "ANOTHER_NEW_ONE", "OLD_ONE", "IN_KCONFIG"],
+                kconfigs=["IN_KCONFIG"],
+                allowed=["OLD_ONE"],
+            ),
+        )
 
     def check_read_configs(self, use_defines):
+        """Check that kconfigs can be read."""
         checker = kconfig_check.KconfigCheck()
         with tempfile.NamedTemporaryFile() as configs:
-            with open(configs.name, 'w') as out:
-                prefix = '#define ' if use_defines else ''
-                suffix = ' ' if use_defines else '='
-                out.write(f'''{prefix}CONFIG_OLD_ONE{suffix}y
+            with open(configs.name, "w") as out:
+                prefix = "#define " if use_defines else ""
+                suffix = " " if use_defines else "="
+                out.write(
+                    f"""{prefix}CONFIG_OLD_ONE{suffix}y
 {prefix}NOT_A_CONFIG{suffix}
 {prefix}CONFIG_STRING{suffix}"something"
 {prefix}CONFIG_INT{suffix}123
 {prefix}CONFIG_HEX{suffix}45ab
-''')
-            self.assertEqual(['OLD_ONE', 'STRING', 'INT', 'HEX'],
-                             checker.read_configs(configs.name, use_defines))
+"""
+                )
+            self.assertEqual(
+                ["OLD_ONE", "STRING", "INT", "HEX"],
+                checker.read_configs(configs.name, use_defines),
+            )
 
     def test_read_configs(self):
         """Test KconfigCheck.read_configs()"""
@@ -87,22 +100,24 @@ class KconfigCheck(unittest.TestCase):
         Args:
             srctree: Directory to write to
         """
-        with open(os.path.join(srctree, 'Kconfig'), 'w') as out:
-            out.write(f'''config {PREFIX}MY_KCONFIG
+        with open(os.path.join(srctree, "Kconfig"), "w") as out:
+            out.write(
+                f"""config {PREFIX}MY_KCONFIG
 \tbool "my kconfig"
 
 rsource "subdir/Kconfig.wibble"
-''')
-        subdir = os.path.join(srctree, 'subdir')
+"""
+            )
+        subdir = os.path.join(srctree, "subdir")
         os.mkdir(subdir)
-        with open(os.path.join(subdir, 'Kconfig.wibble'), 'w') as out:
-            out.write('menuconfig %sMENU_KCONFIG\n' % PREFIX)
+        with open(os.path.join(subdir, "Kconfig.wibble"), "w") as out:
+            out.write("menuconfig %sMENU_KCONFIG\n" % PREFIX)
 
         # Add a directory which should be ignored
-        bad_subdir = os.path.join(subdir, 'Kconfig')
+        bad_subdir = os.path.join(subdir, "Kconfig")
         os.mkdir(bad_subdir)
-        with open(os.path.join(bad_subdir, 'Kconfig.bad'), 'w') as out:
-            out.write('menuconfig %sBAD_KCONFIG' % PREFIX)
+        with open(os.path.join(bad_subdir, "Kconfig.bad"), "w") as out:
+            out.write("menuconfig %sBAD_KCONFIG" % PREFIX)
 
     def test_find_kconfigs(self):
         """Test KconfigCheck.find_kconfigs()"""
@@ -110,20 +125,23 @@ rsource "subdir/Kconfig.wibble"
         with tempfile.TemporaryDirectory() as srctree:
             self.setup_srctree(srctree)
             files = checker.find_kconfigs(srctree)
-            fnames = [fname[len(srctree):] for fname in files]
-            self.assertEqual(['/Kconfig', '/subdir/Kconfig.wibble'], fnames)
+            fnames = [fname[len(srctree) :] for fname in files]
+            self.assertEqual(["/Kconfig", "/subdir/Kconfig.wibble"], fnames)
 
     def test_scan_kconfigs(self):
         """Test KconfigCheck.scan_configs()"""
         checker = kconfig_check.KconfigCheck()
         with tempfile.TemporaryDirectory() as srctree:
             self.setup_srctree(srctree)
-            self.assertEqual(['MENU_KCONFIG', 'MY_KCONFIG'],
-                             checker.scan_kconfigs(srctree, PREFIX))
+            self.assertEqual(
+                ["MENU_KCONFIG", "MY_KCONFIG"],
+                checker.scan_kconfigs(srctree, PREFIX),
+            )
 
     @classmethod
-    def setup_allowed_and_configs(cls, allowed_fname, configs_fname,
-                                  add_new_one=True):
+    def setup_allowed_and_configs(
+        cls, allowed_fname, configs_fname, add_new_one=True
+    ):
         """Set up the 'allowed' and 'configs' files for tests
 
         Args:
@@ -131,14 +149,14 @@ rsource "subdir/Kconfig.wibble"
             configs_fname: Filename to which CONFIGs to check should be written
             add_new_one: True to add CONFIG_NEW_ONE to the configs_fname file
         """
-        with open(allowed_fname, 'w') as out:
-            out.write('CONFIG_OLD_ONE\n')
-            out.write('CONFIG_MENU_KCONFIG\n')
-        with open(configs_fname, 'w') as out:
-            to_add = ['CONFIG_OLD_ONE', 'CONFIG_MY_KCONFIG']
+        with open(allowed_fname, "w") as out:
+            out.write("CONFIG_OLD_ONE\n")
+            out.write("CONFIG_MENU_KCONFIG\n")
+        with open(configs_fname, "w") as out:
+            to_add = ["CONFIG_OLD_ONE", "CONFIG_MY_KCONFIG"]
             if add_new_one:
-                to_add.append('CONFIG_NEW_ONE')
-            out.write('\n'.join(to_add))
+                to_add.append("CONFIG_NEW_ONE")
+            out.write("\n".join(to_add))
 
     def test_check_adhoc_configs(self):
         """Test KconfigCheck.check_adhoc_configs()"""
@@ -148,12 +166,16 @@ rsource "subdir/Kconfig.wibble"
             with tempfile.NamedTemporaryFile() as allowed:
                 with tempfile.NamedTemporaryFile() as configs:
                     self.setup_allowed_and_configs(allowed.name, configs.name)
-                    new_adhoc, unneeded_adhoc, updated_adhoc = (
-                        checker.check_adhoc_configs(
-                            configs.name, srctree, allowed.name, PREFIX))
-                    self.assertEqual(['NEW_ONE'], new_adhoc)
-                    self.assertEqual(['MENU_KCONFIG'], unneeded_adhoc)
-                    self.assertEqual(['OLD_ONE'], updated_adhoc)
+                    (
+                        new_adhoc,
+                        unneeded_adhoc,
+                        updated_adhoc,
+                    ) = checker.check_adhoc_configs(
+                        configs.name, srctree, allowed.name, PREFIX
+                    )
+                    self.assertEqual(["NEW_ONE"], new_adhoc)
+                    self.assertEqual(["MENU_KCONFIG"], unneeded_adhoc)
+                    self.assertEqual(["OLD_ONE"], updated_adhoc)
 
     def test_check(self):
         """Test running the 'check' subcommand"""
@@ -162,45 +184,57 @@ rsource "subdir/Kconfig.wibble"
                 self.setup_srctree(srctree)
                 with tempfile.NamedTemporaryFile() as allowed:
                     with tempfile.NamedTemporaryFile() as configs:
-                        self.setup_allowed_and_configs(allowed.name,
-                                                       configs.name)
+                        self.setup_allowed_and_configs(
+                            allowed.name, configs.name
+                        )
                         ret_code = kconfig_check.main(
-                            ['-c', configs.name, '-s', srctree,
-                             '-a', allowed.name, '-p', PREFIX, 'check'])
+                            [
+                                "-c",
+                                configs.name,
+                                "-s",
+                                srctree,
+                                "-a",
+                                allowed.name,
+                                "-p",
+                                PREFIX,
+                                "check",
+                            ]
+                        )
                         self.assertEqual(1, ret_code)
-        self.assertEqual('', stdout.getvalue())
-        found = re.findall('(CONFIG_.*)', stderr.getvalue())
-        self.assertEqual(['CONFIG_NEW_ONE'], found)
+        self.assertEqual("", stdout.getvalue())
+        found = re.findall("(CONFIG_.*)", stderr.getvalue())
+        self.assertEqual(["CONFIG_NEW_ONE"], found)
 
     def test_real_kconfig(self):
         """Same Kconfig should be returned for kconfiglib / adhoc"""
         if not kconfig_check.USE_KCONFIGLIB:
-            self.skipTest('No kconfiglib available')
-        zephyr_path = pathlib.Path('../../third_party/zephyr/main').resolve()
+            self.fail("No kconfiglib available")
+        zephyr_path = pathlib.Path(
+            "../../../src/third_party/zephyr/main"
+        ).resolve()
         if not zephyr_path.exists():
-            self.skipTest('No zephyr tree available')
+            self.fail("No zephyr tree available")
+        os.environ["ZEPHYR_BASE"] = str(zephyr_path)
 
         checker = kconfig_check.KconfigCheck()
-        srcdir = 'zephyr'
+        srcdir = "zephyr"
         search_paths = [zephyr_path]
         kc_version = checker.scan_kconfigs(
-            srcdir, search_paths=search_paths, try_kconfiglib=True)
+            srcdir, search_paths=search_paths, try_kconfiglib=True
+        )
         adhoc_version = checker.scan_kconfigs(srcdir, try_kconfiglib=False)
 
         # List of things missing from the Kconfig
         missing = sorted(list(set(adhoc_version) - set(kc_version)))
 
-        # The Kconfig is disjoint in some places, e.g. the boards have their
-        # own Kconfig files which are not included from the main Kconfig
-        missing = [item for item in missing
-                   if not item.startswith('BOARD') and
-                   not item.startswith('VARIANT')]
-
-        # Similarly, some other items are defined in files that are not included
+        # Some items are defined in files that are not included
         # in all cases, only for particular values of $(ARCH)
         self.assertEqual(
-            ['FLASH_LOAD_OFFSET', 'NPCX_HEADER', 'SYS_CLOCK_HW_CYCLES_PER_SEC'],
-            missing)
+            [
+                "TRAP_UNALIGNED_ACCESS",
+            ],
+            missing,
+        )
 
     def test_check_unneeded(self):
         """Test running the 'check' subcommand with unneeded ad-hoc configs"""
@@ -209,18 +243,29 @@ rsource "subdir/Kconfig.wibble"
                 self.setup_srctree(srctree)
                 with tempfile.NamedTemporaryFile() as allowed:
                     with tempfile.NamedTemporaryFile() as configs:
-                        self.setup_allowed_and_configs(allowed.name,
-                                                       configs.name, False)
+                        self.setup_allowed_and_configs(
+                            allowed.name, configs.name, False
+                        )
                         ret_code = kconfig_check.main(
-                            ['-c', configs.name, '-s', srctree,
-                             '-a', allowed.name, '-p', PREFIX, 'check'])
+                            [
+                                "-c",
+                                configs.name,
+                                "-s",
+                                srctree,
+                                "-a",
+                                allowed.name,
+                                "-p",
+                                PREFIX,
+                                "check",
+                            ]
+                        )
                         self.assertEqual(1, ret_code)
-        self.assertEqual('', stderr.getvalue())
-        found = re.findall('(CONFIG_.*)', stdout.getvalue())
-        self.assertEqual(['CONFIG_MENU_KCONFIG'], found)
+        self.assertEqual("", stderr.getvalue())
+        found = re.findall("(CONFIG_.*)", stdout.getvalue())
+        self.assertEqual(["CONFIG_MENU_KCONFIG"], found)
         allowed = kconfig_check.NEW_ALLOWED_FNAME.read_text().splitlines()
-        self.assertEqual(['CONFIG_OLD_ONE'], allowed)
+        self.assertEqual(["CONFIG_OLD_ONE"], allowed)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()