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, 37 insertions, 33 deletions

diff --git a/common/ec_features.c b/common/ec_features.c
index 2147c1b48a..a45204b7a1 100644
--- a/common/ec_features.c
+++ b/common/ec_features.c
@@ -1,4 +1,4 @@
-/* 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.
  */
@@ -15,97 +15,97 @@ uint32_t get_feature_flags0(void)
 {
 	uint32_t result = 0
 #ifdef CONFIG_FW_LIMITED_IMAGE
-		| EC_FEATURE_MASK_0(EC_FEATURE_LIMITED)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_LIMITED)
 #endif
 #ifdef CONFIG_FLASH_CROS
-		| EC_FEATURE_MASK_0(EC_FEATURE_FLASH)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_FLASH)
 #endif
 #ifdef CONFIG_FANS
-		| EC_FEATURE_MASK_0(EC_FEATURE_PWM_FAN)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_PWM_FAN)
 #endif
 #ifdef CONFIG_KEYBOARD_BACKLIGHT
-		| EC_FEATURE_MASK_0(EC_FEATURE_PWM_KEYB)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_PWM_KEYB)
 #endif
 #ifdef HAS_TASK_LIGHTBAR
-		| EC_FEATURE_MASK_0(EC_FEATURE_LIGHTBAR)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_LIGHTBAR)
 #endif
 #ifdef CONFIG_LED_COMMON
-		| EC_FEATURE_MASK_0(EC_FEATURE_LED)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_LED)
 #endif
 #ifdef HAS_TASK_MOTIONSENSE
-		| EC_FEATURE_MASK_0(EC_FEATURE_MOTION_SENSE)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_MOTION_SENSE)
 #endif
 #ifdef HAS_TASK_KEYSCAN
-		| EC_FEATURE_MASK_0(EC_FEATURE_KEYB)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_KEYB)
 #endif
 #ifdef CONFIG_PSTORE
-		| EC_FEATURE_MASK_0(EC_FEATURE_PSTORE)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_PSTORE)
 #endif
 #ifdef CONFIG_HOSTCMD_X86
-		| EC_FEATURE_MASK_0(EC_FEATURE_PORT80)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_PORT80)
 #endif
 #ifdef CONFIG_TEMP_SENSOR
-		| EC_FEATURE_MASK_0(EC_FEATURE_THERMAL)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_THERMAL)
 #endif
 #if (defined CONFIG_BACKLIGHT_LID) || (defined CONFIG_BACKLIGHT_REQ_GPIO)
-		| EC_FEATURE_MASK_0(EC_FEATURE_BKLIGHT_SWITCH)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_BKLIGHT_SWITCH)
 #endif
 #ifdef CONFIG_WIRELESS
-		| EC_FEATURE_MASK_0(EC_FEATURE_WIFI_SWITCH)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_WIFI_SWITCH)
 #endif
 #ifdef CONFIG_HOSTCMD_EVENTS
-		| EC_FEATURE_MASK_0(EC_FEATURE_HOST_EVENTS)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_HOST_EVENTS)
 #endif
 #ifdef CONFIG_COMMON_GPIO
-		| EC_FEATURE_MASK_0(EC_FEATURE_GPIO)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_GPIO)
 #endif
 #ifdef CONFIG_I2C_CONTROLLER
-		| EC_FEATURE_MASK_0(EC_FEATURE_I2C)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_I2C)
 #endif
 #ifdef CONFIG_CHARGER
-		| EC_FEATURE_MASK_0(EC_FEATURE_CHARGER)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_CHARGER)
 #endif
 #if (defined CONFIG_BATTERY)
-		| EC_FEATURE_MASK_0(EC_FEATURE_BATTERY)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_BATTERY)
 #endif
 #ifdef CONFIG_BATTERY_SMART
-		| EC_FEATURE_MASK_0(EC_FEATURE_SMART_BATTERY)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_SMART_BATTERY)
 #endif
 #ifdef CONFIG_AP_HANG_DETECT
-		| EC_FEATURE_MASK_0(EC_FEATURE_HANG_DETECT)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_HANG_DETECT)
 #endif
 #if 0
 		| EC_FEATURE_MASK_0(EC_FEATURE_PMU) /* Obsolete */
 #endif
 #ifdef CONFIG_HOSTCMD_PD
-		| EC_FEATURE_MASK_0(EC_FEATURE_SUB_MCU)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_SUB_MCU)
 #endif
 #ifdef CONFIG_CHARGE_MANAGER
-		| EC_FEATURE_MASK_0(EC_FEATURE_USB_PD)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_USB_PD)
 #endif
 #ifdef CONFIG_ACCEL_FIFO
-		| EC_FEATURE_MASK_0(EC_FEATURE_MOTION_SENSE_FIFO)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_MOTION_SENSE_FIFO)
 #endif
 #ifdef CONFIG_VSTORE
-		| EC_FEATURE_MASK_0(EC_FEATURE_VSTORE)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_VSTORE)
 #endif
 #ifdef CONFIG_USB_MUX_VIRTUAL
-		| EC_FEATURE_MASK_0(EC_FEATURE_USBC_SS_MUX_VIRTUAL)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_USBC_SS_MUX_VIRTUAL)
 #endif
 #ifdef CONFIG_HOSTCMD_RTC
-		| EC_FEATURE_MASK_0(EC_FEATURE_RTC)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_RTC)
 #endif
 #ifdef CONFIG_SPI_FP_PORT
-		| EC_FEATURE_MASK_0(EC_FEATURE_FINGERPRINT)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_FINGERPRINT)
 #endif
 #ifdef HAS_TASK_CENTROIDING
-		| EC_FEATURE_MASK_0(EC_FEATURE_TOUCHPAD)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_TOUCHPAD)
 #endif
 #if defined(HAS_TASK_RWSIG) || defined(HAS_TASK_RWSIG_RO)
-		| EC_FEATURE_MASK_0(EC_FEATURE_RWSIG)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_RWSIG)
 #endif
 #ifdef CONFIG_DEVICE_EVENT
-		| EC_FEATURE_MASK_0(EC_FEATURE_DEVICE_EVENT)
+			  | EC_FEATURE_MASK_0(EC_FEATURE_DEVICE_EVENT)
 #endif
 		;
 	return board_override_feature_flags0(result);
@@ -113,7 +113,8 @@ uint32_t get_feature_flags0(void)
 
 uint32_t get_feature_flags1(void)
 {
-	uint32_t result = EC_FEATURE_MASK_1(EC_FEATURE_UNIFIED_WAKE_MASKS)
+	uint32_t result =
+		EC_FEATURE_MASK_1(EC_FEATURE_UNIFIED_WAKE_MASKS)
 #ifdef CONFIG_HOST_EVENT64
 		| EC_FEATURE_MASK_1(EC_FEATURE_HOST_EVENT64)
 #endif
@@ -150,6 +151,9 @@ uint32_t get_feature_flags1(void)
 #ifdef CONFIG_POWER_S4_RESIDENCY
 		| EC_FEATURE_MASK_1(EC_FEATURE_S4_RESIDENCY)
 #endif
+#ifdef CONFIG_USB_MUX_AP_CONTROL
+		| EC_FEATURE_MASK_1(EC_FEATURE_TYPEC_AP_MUX_SET)
+#endif
 		;
 	return board_override_feature_flags1(result);
 }
@@ -164,7 +168,7 @@ __overridable uint32_t board_override_feature_flags1(uint32_t flags1)
 	return flags1;
 }
 
-static int cc_feat(int argc, char **argv)
+static int cc_feat(int argc, const char **argv)
 {
 	ccprintf(" 0-31: 0x%08x\n", get_feature_flags0());
 	ccprintf("32-63: 0x%08x\n", get_feature_flags1());