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, 32 insertions, 27 deletions

diff --git a/board/reef/battery.c b/board/reef/battery.c
index 83a3679b26..52ec2a0471 100644
--- a/board/reef/battery.c
+++ b/board/reef/battery.c
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -20,7 +20,7 @@
 #include "i2c.h"
 #include "util.h"
 
-#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ##args)
 
 enum battery_type {
 	BATTERY_SONY_CORP,
@@ -135,7 +135,7 @@ const struct battery_info batt_info_smp_cos4870 = {
 	 * unwanted low VSYS_Prochot# assertion can be avoided.
 	 */
 	.voltage_min = 6100,
-	.precharge_current = 256,	/* mA */
+	.precharge_current = 256, /* mA */
 	.start_charging_min_c = 0,
 	.start_charging_max_c = 46,
 	.charging_min_c = 0,
@@ -183,7 +183,7 @@ const struct battery_info batt_info_sonycorp = {
 	 * unwanted low VSYS_Prochot# assertion can be avoided.
 	 */
 	.voltage_min = 6100,
-	.precharge_current = 256,	/* mA */
+	.precharge_current = 256, /* mA */
 	.start_charging_min_c = 0,
 	.start_charging_max_c = 50,
 	.charging_min_c = 0,
@@ -240,7 +240,7 @@ const struct battery_info batt_info_panasoic = {
 	 * unwanted low VSYS_Prochot# assertion can be avoided.
 	 */
 	.voltage_min = 6100,
-	.precharge_current = 256,	/* mA */
+	.precharge_current = 256, /* mA */
 	.start_charging_min_c = 0,
 	.start_charging_max_c = 50,
 	.charging_min_c = 0,
@@ -384,7 +384,7 @@ const struct battery_info batt_info_c22n1626 = {
 	 * unwanted low VSYS_Prochot# assertion can be avoided.
 	 */
 	.voltage_min = 6100,
-	.precharge_current = 256,	/* mA */
+	.precharge_current = 256, /* mA */
 	.start_charging_min_c = 0,
 	.start_charging_max_c = 45,
 	.charging_min_c = 0,
@@ -398,7 +398,7 @@ static int batt_smp_cos4870_init(void)
 	int batt_status;
 
 	return battery_status(&batt_status) ? 0 :
-		batt_status & STATUS_INITIALIZED;
+					      batt_status & STATUS_INITIALIZED;
 }
 
 static int batt_sony_corp_init(void)
@@ -411,8 +411,9 @@ static int batt_sony_corp_init(void)
 	 *      : 0b - Allowed to Discharge
 	 *      : 1b - Not Allowed to Discharge
 	 */
-	return sb_read(SB_MANUFACTURER_ACCESS, &batt_status) ? 0 :
-		!(batt_status & SONY_DISCHARGE_DISABLE_FET_BIT);
+	return sb_read(SB_MANUFACTURER_ACCESS, &batt_status) ?
+		       0 :
+		       !(batt_status & SONY_DISCHARGE_DISABLE_FET_BIT);
 }
 
 static int batt_panasonic_init(void)
@@ -425,8 +426,9 @@ static int batt_panasonic_init(void)
 	 *      : 0b - Not Allowed to Discharge
 	 *      : 1b - Allowed to Discharge
 	 */
-	return sb_read(SB_MANUFACTURER_ACCESS, &batt_status) ? 0 :
-		!!(batt_status & PANASONIC_DISCHARGE_ENABLE_FET_BIT);
+	return sb_read(SB_MANUFACTURER_ACCESS, &batt_status) ?
+		       0 :
+		       !!(batt_status & PANASONIC_DISCHARGE_ENABLE_FET_BIT);
 }
 
 static int batt_c22n1626_init(void)
@@ -439,8 +441,9 @@ static int batt_c22n1626_init(void)
 	 *      : 0b - Not Allowed to Discharge
 	 *      : 1b - Allowed to Discharge
 	 */
-	return sb_read(SB_PACK_STATUS, &batt_status) ? 0 :
-		!!(batt_status & C22N1626_DISCHARGE_ENABLE_FET_BIT);
+	return sb_read(SB_PACK_STATUS, &batt_status) ?
+		       0 :
+		       !!(batt_status & C22N1626_DISCHARGE_ENABLE_FET_BIT);
 }
 
 static const struct ship_mode_info ship_mode_info_smp_cos4870 = {
@@ -461,7 +464,7 @@ static const struct ship_mode_info ship_mode_info_panasonic = {
 	.batt_init = batt_panasonic_init,
 };
 
-static const struct ship_mode_info ship_mode_info_c22n1626= {
+static const struct ship_mode_info ship_mode_info_c22n1626 = {
 	.ship_mode_reg = 0x00,
 	.ship_mode_data = 0x0010,
 	.batt_init = batt_c22n1626_init,
@@ -513,7 +516,8 @@ BUILD_ASSERT(ARRAY_SIZE(info) == BATTERY_TYPE_COUNT);
 static inline const struct board_batt_params *board_get_batt_params(void)
 {
 	return &info[board_battery_type == BATTERY_TYPE_COUNT ?
-			DEFAULT_BATTERY_TYPE : board_battery_type];
+			     DEFAULT_BATTERY_TYPE :
+			     board_battery_type];
 }
 
 enum battery_present battery_hw_present(void)
@@ -540,8 +544,9 @@ static int board_get_battery_type(void)
 
 	/* Initialize fast charging parameters */
 	chg_params = board_get_batt_params()->fast_chg_params;
-	prev_chg_profile_info = &chg_params->chg_profile_info[
-					chg_params->default_temp_range_profile];
+	prev_chg_profile_info =
+		&chg_params->chg_profile_info
+			 [chg_params->default_temp_range_profile];
 
 	return board_battery_type;
 }
@@ -571,11 +576,11 @@ int board_cut_off_battery(void)
 {
 	int rv;
 	const struct ship_mode_info *ship_mode_inf =
-				board_get_batt_params()->ship_mode_inf;
+		board_get_batt_params()->ship_mode_inf;
 
 	/* Ship mode command must be sent twice to take effect */
 	rv = sb_write(ship_mode_inf->ship_mode_reg,
-			ship_mode_inf->ship_mode_data);
+		      ship_mode_inf->ship_mode_data);
 	if (rv != EC_SUCCESS)
 		return rv;
 
@@ -591,7 +596,7 @@ static int charger_should_discharge_on_ac(struct charge_state_data *curr)
 
 	/* Do not discharge on AC if the battery is still waking up */
 	if (!(curr->batt.flags & BATT_FLAG_WANT_CHARGE) &&
-		!(curr->batt.status & STATUS_FULLY_CHARGED))
+	    !(curr->batt.status & STATUS_FULLY_CHARGED))
 		return 0;
 
 	/*
@@ -608,8 +613,8 @@ static int charger_should_discharge_on_ac(struct charge_state_data *curr)
 	 * and suspend USB charging and DC/DC converter.
 	 */
 	if (!battery_is_cut_off() &&
-		!(curr->batt.flags & BATT_FLAG_WANT_CHARGE) &&
-		(curr->batt.status & STATUS_FULLY_CHARGED))
+	    !(curr->batt.flags & BATT_FLAG_WANT_CHARGE) &&
+	    (curr->batt.status & STATUS_FULLY_CHARGED))
 		return 1;
 
 	/*
@@ -642,10 +647,10 @@ int charger_profile_override(struct charge_state_data *curr)
 		return 0;
 	}
 
-	return charger_profile_override_common(curr,
-			board_get_batt_params()->fast_chg_params,
-			&prev_chg_profile_info,
-			board_get_batt_params()->batt_info->voltage_max);
+	return charger_profile_override_common(
+		curr, board_get_batt_params()->fast_chg_params,
+		&prev_chg_profile_info,
+		board_get_batt_params()->batt_info->voltage_max);
 }
 
 /*
@@ -671,7 +676,7 @@ enum battery_present battery_is_present(void)
 	 * Battery status will be inactive until it is initialized.
 	 */
 	if (batt_pres == BP_YES && batt_pres_prev != batt_pres &&
-		!battery_is_cut_off()) {
+	    !battery_is_cut_off()) {
 		/* Re-init board battery if battery presence status changes */
 		if (board_get_battery_type() == BATTERY_TYPE_COUNT) {
 			if (bd9995x_get_battery_voltage() >=