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, 39 insertions, 39 deletions

diff --git a/board/adlrvpp_npcx/board.h b/board/adlrvpp_npcx/board.h
index c787beea84..ff214ddec2 100644
--- a/board/adlrvpp_npcx/board.h
+++ b/board/adlrvpp_npcx/board.h
@@ -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.
  */
@@ -20,76 +20,76 @@
  * which purpose.
  */
 /* Power sequencing */
-#define GPIO_EC_SPI_OE_N		GPIO_EC_SPI_OE_MECC
-#define GPIO_PG_EC_ALL_SYS_PWRGD	GPIO_ALL_SYS_PWRGD
-#define GPIO_PG_EC_RSMRST_ODL		GPIO_RSMRST_PWRGD
-#define GPIO_PCH_SLP_S0_L		GPIO_PCH_SLP_S0_N
-#define GPIO_PG_EC_DSW_PWROK		GPIO_VCCPDSW_3P3
-#define GPIO_SLP_SUS_L			GPIO_PM_SLP_SUS_EC_N
-#define GPIO_SYS_RESET_L		GPIO_SYS_RST_ODL
-#define GPIO_PCH_RSMRST_L		GPIO_PM_RSMRST_N
-#define GPIO_PCH_PWRBTN_L		GPIO_PM_PWRBTN_N
-#define GPIO_EN_PP3300_A		GPIO_EC_DS3
-#define GPIO_SYS_PWROK_EC		GPIO_SYS_PWROK
-#define GPIO_PCH_DSW_PWROK		GPIO_EC_DSW_PWROK
+#define GPIO_EC_SPI_OE_N GPIO_EC_SPI_OE_MECC
+#define GPIO_PG_EC_ALL_SYS_PWRGD GPIO_ALL_SYS_PWRGD
+#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_PWRGD
+#define GPIO_PCH_SLP_S0_L GPIO_PCH_SLP_S0_N
+#define GPIO_PG_EC_DSW_PWROK GPIO_VCCPDSW_3P3
+#define GPIO_SLP_SUS_L GPIO_PM_SLP_SUS_EC_N
+#define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL
+#define GPIO_PCH_RSMRST_L GPIO_PM_RSMRST_N
+#define GPIO_PCH_PWRBTN_L GPIO_PM_PWRBTN_N
+#define GPIO_EN_PP3300_A GPIO_EC_DS3
+#define GPIO_SYS_PWROK_EC GPIO_SYS_PWROK
+#define GPIO_PCH_DSW_PWROK GPIO_EC_DSW_PWROK
 
 /* Sensors */
-#define GPIO_TABLET_MODE_L		GPIO_SLATE_MODE_INDICATION
-#define GPIO_CPU_PROCHOT		GPIO_PROCHOT_EC_N
+#define GPIO_TABLET_MODE_L GPIO_SLATE_MODE_INDICATION
+#define GPIO_CPU_PROCHOT GPIO_PROCHOT_EC_N
 
 /* Buttons */
-#define GPIO_LID_OPEN			GPIO_SMC_LID
-#define GPIO_VOLUME_UP_L		GPIO_VOLUME_UP
-#define GPIO_VOLUME_DOWN_L		GPIO_VOL_DN_EC
-#define GPIO_POWER_BUTTON_L		GPIO_MECH_PWR_BTN_ODL
+#define GPIO_LID_OPEN GPIO_SMC_LID
+#define GPIO_VOLUME_UP_L GPIO_VOLUME_UP
+#define GPIO_VOLUME_DOWN_L GPIO_VOL_DN_EC
+#define GPIO_POWER_BUTTON_L GPIO_MECH_PWR_BTN_ODL
 
 /* H1 */
-#define GPIO_WP_L			GPIO_EC_FLASH_WP_ODL
-#define GPIO_PACKET_MODE_EN		GPIO_EC_H1_PACKET_MODE
-#define GPIO_ENTERING_RW		GPIO_EC_ENTERING_RW
+#define GPIO_WP_L GPIO_EC_FLASH_WP_ODL
+#define GPIO_PACKET_MODE_EN GPIO_EC_H1_PACKET_MODE
+#define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW
 
 /* AC & Battery */
-#define GPIO_DC_JACK_PRESENT		GPIO_STD_ADP_PRSNT
-#define GPIO_AC_PRESENT			GPIO_BC_ACOK
-#define CONFIG_BATTERY_PRESENT_GPIO	GPIO_BAT_DET
+#define GPIO_DC_JACK_PRESENT GPIO_STD_ADP_PRSNT
+#define GPIO_AC_PRESENT GPIO_BC_ACOK
+#define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_DET
 
 /* eSPI/Host communication */
-#define GPIO_ESPI_RESET_L		GPIO_LPC_ESPI_RST_N
-#define GPIO_PCH_WAKE_L			GPIO_SMC_WAKE_SCI_N_MECC
-#define GPIO_EC_INT_L			GPIO_EC_PCH_MKBP_INT_ODL
+#define GPIO_ESPI_RESET_L GPIO_LPC_ESPI_RST_N
+#define GPIO_PCH_WAKE_L GPIO_SMC_WAKE_SCI_N_MECC
+#define GPIO_EC_INT_L GPIO_EC_PCH_MKBP_INT_ODL
 
 /* LED */
-#define GPIO_BAT_LED_RED_L		GPIO_LED_1_L
-#define GPIO_PWR_LED_WHITE_L		GPIO_LED_2_L
+#define GPIO_BAT_LED_RED_L GPIO_LED_1_L
+#define GPIO_PWR_LED_WHITE_L GPIO_LED_2_L
 
 /* FAN */
-#define GPIO_FAN_POWER_EN		GPIO_THERM_SEN_MECC
+#define GPIO_FAN_POWER_EN GPIO_THERM_SEN_MECC
 
 /* I2C ports & Configs */
 /* Charger */
-#define I2C_PORT_CHARGER	NPCX_I2C_PORT7_0
+#define I2C_PORT_CHARGER NPCX_I2C_PORT7_0
 
 /* Battery */
-#define I2C_PORT_BATTERY	NPCX_I2C_PORT7_0
+#define I2C_PORT_BATTERY NPCX_I2C_PORT7_0
 
 /* Board ID */
-#define I2C_PORT_PCA9555_BOARD_ID_GPIO	NPCX_I2C_PORT7_0
+#define I2C_PORT_PCA9555_BOARD_ID_GPIO NPCX_I2C_PORT7_0
 
 /* Port 80 */
-#define I2C_PORT_PORT80		NPCX_I2C_PORT7_0
+#define I2C_PORT_PORT80 NPCX_I2C_PORT7_0
 
 /* USB-C I2C */
-#define I2C_PORT_TYPEC_0	NPCX_I2C_PORT0_0
+#define I2C_PORT_TYPEC_0 NPCX_I2C_PORT0_0
 /*
  * Note: I2C for Type-C Port-1 is swapped with Type-C Port-2
  *       on the RVP to reduce BOM stuffing options.
  */
-#define I2C_PORT_TYPEC_1	NPCX_I2C_PORT2_0
+#define I2C_PORT_TYPEC_1 NPCX_I2C_PORT2_0
 #if defined(HAS_TASK_PD_C2)
-#define I2C_PORT_TYPEC_2	NPCX_I2C_PORT1_0
+#define I2C_PORT_TYPEC_2 NPCX_I2C_PORT1_0
 #endif
 #if defined(HAS_TASK_PD_C3)
-#define I2C_PORT_TYPEC_3	NPCX_I2C_PORT3_0
+#define I2C_PORT_TYPEC_3 NPCX_I2C_PORT3_0
 #endif
 
 #ifndef __ASSEMBLER__