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, 26 insertions, 25 deletions

diff --git a/include/gpio_list.h b/include/gpio_list.h
index 6bd43187d9..17fc0d3b09 100644
--- a/include/gpio_list.h
+++ b/include/gpio_list.h
@@ -1,4 +1,4 @@
-/* Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -8,35 +8,35 @@
 #include "gpio_signal.h"
 
 #ifdef CONFIG_COMMON_GPIO_SHORTNAMES
-#define GPIO(name, pin, flags) {GPIO_NAME_BY_##pin, GPIO_##pin, flags},
+#define GPIO(name, pin, flags) { GPIO_NAME_BY_##pin, GPIO_##pin, flags },
 #define GPIO_INT(name, pin, flags, signal) \
-		{GPIO_NAME_BY_##pin, GPIO_##pin, flags},
+	{ GPIO_NAME_BY_##pin, GPIO_##pin, flags },
 #else
-#define GPIO(name, pin, flags) {#name, GPIO_##pin, flags},
-#define GPIO_INT(name, pin, flags, signal) {#name, GPIO_##pin, flags},
+#define GPIO(name, pin, flags) { #name, GPIO_##pin, flags },
+#define GPIO_INT(name, pin, flags, signal) { #name, GPIO_##pin, flags },
 #endif
 
-#define UNIMPLEMENTED(name) {#name, UNIMPLEMENTED_GPIO_BANK, 0, GPIO_DEFAULT},
+#define UNIMPLEMENTED(name) { #name, UNIMPLEMENTED_GPIO_BANK, 0, GPIO_DEFAULT },
 
 /* GPIO signal list. */
 __const_data const struct gpio_info gpio_list[] = {
-	#include "gpio.wrap"
+#include "gpio.wrap"
 };
 
 BUILD_ASSERT(ARRAY_SIZE(gpio_list) == GPIO_COUNT);
 
-#define UNUSED(pin) {GPIO_##pin},
+#define UNUSED(pin) { GPIO_##pin },
 /* Unconnected pin list. */
 __const_data const struct unused_pin_info unused_pin_list[] = {
-	#include "gpio.wrap"
+#include "gpio.wrap"
 };
 
 const int unused_pin_count = ARRAY_SIZE(unused_pin_list);
 
 /* GPIO Interrupt Handlers */
 #define GPIO_INT(name, pin, flags, signal) signal,
-void (* const gpio_irq_handlers[])(enum gpio_signal signal) = {
-	#include "gpio.wrap"
+void (*const gpio_irq_handlers[])(enum gpio_signal signal) = {
+#include "gpio.wrap"
 };
 const int gpio_ih_count = ARRAY_SIZE(gpio_irq_handlers);
 
@@ -47,7 +47,7 @@ const int gpio_ih_count = ARRAY_SIZE(gpio_irq_handlers);
  *
  * This constraint is handled within gpio.wrap.
  */
-#define GPIO_INT(name, pin, flags, signal)	\
+#define GPIO_INT(name, pin, flags, signal) \
 	BUILD_ASSERT(GPIO_##name < ARRAY_SIZE(gpio_irq_handlers));
 #include "gpio.wrap"
 
@@ -64,8 +64,9 @@ const int gpio_ih_count = ARRAY_SIZE(gpio_irq_handlers);
  * The compiler will complain if we use the same name twice. The linker ignores
  * anything that gets by.
  */
-#define PIN(a, b...) static const int _pin_ ## a ## _ ## b \
-	__attribute__((unused, section(".unused"))) = __LINE__;
+#define PIN(a, b...)                    \
+	static const int _pin_##a##_##b \
+		__attribute__((unused, section(".unused"))) = __LINE__;
 #include "gpio.wrap"
 
 #include "ioexpander.h"
@@ -83,7 +84,7 @@ const int gpio_ih_count = ARRAY_SIZE(gpio_irq_handlers);
  *      - flags: the same as the flags of GPIO.
  *
  */
-#define IOEX(name, expin, flags) {#name, IOEX_##expin, flags},
+#define IOEX(name, expin, flags) { #name, IOEX_##expin, flags },
 /*
  *  Define the IO expander IO which supports interrupt in gpio.inc by
  *  the format:
@@ -97,18 +98,18 @@ const int gpio_ih_count = ARRAY_SIZE(gpio_irq_handlers);
  *      - flags: the same as the flags of GPIO.
  *      - handler: the IOEX IO's interrupt handler.
  */
-#define IOEX_INT(name, expin, flags, handler) {#name, IOEX_##expin, flags},
+#define IOEX_INT(name, expin, flags, handler) { #name, IOEX_##expin, flags },
 
 /* IO expander signal list. */
 const struct ioex_info ioex_list[] = {
-	#include "gpio.wrap"
+#include "gpio.wrap"
 };
 BUILD_ASSERT(ARRAY_SIZE(ioex_list) == IOEX_COUNT);
 
 /* IO Expander Interrupt Handlers */
 #define IOEX_INT(name, expin, flags, handler) handler,
-void (* const ioex_irq_handlers[])(enum ioex_signal signal) = {
-	#include "gpio.wrap"
+void (*const ioex_irq_handlers[])(enum ioex_signal signal) = {
+#include "gpio.wrap"
 };
 const int ioex_ih_count = ARRAY_SIZE(ioex_irq_handlers);
 /*
@@ -116,9 +117,9 @@ const int ioex_ih_count = ARRAY_SIZE(ioex_irq_handlers);
  * IOEX's declaration in the gpio.inc
  * file.
  */
-#define IOEX_INT(name, expin, flags, handler)		\
-	BUILD_ASSERT(IOEX_##name - IOEX_SIGNAL_START	\
-		     < ARRAY_SIZE(ioex_irq_handlers));
+#define IOEX_INT(name, expin, flags, handler)          \
+	BUILD_ASSERT(IOEX_##name - IOEX_SIGNAL_START < \
+		     ARRAY_SIZE(ioex_irq_handlers));
 #include "gpio.wrap"
 
 #define IOEX(name, expin, flags) expin
@@ -128,9 +129,9 @@ const int ioex_ih_count = ARRAY_SIZE(ioex_irq_handlers);
  * number declared is greater or equal to CONFIG_IO_EXPANDER_PORT_COUNT.
  * The linker ignores anything that gets by.
  */
-#define EXPIN(a, b, c...) \
-	static const int _expin_ ## a ## _ ## b ## _ ## c \
-	__attribute__((unused, section(".unused"))) = __LINE__; \
+#define EXPIN(a, b, c...)                                               \
+	static const int _expin_##a##_##b##_##c                         \
+		__attribute__((unused, section(".unused"))) = __LINE__; \
 	BUILD_ASSERT(a < CONFIG_IO_EXPANDER_PORT_COUNT);
 
 #include "gpio.wrap"