diff options
author | Tom Hughes <tomhughes@chromium.org> | 2022-09-21 14:10:01 -0700 |
---|---|---|
committer | Tom Hughes <tomhughes@chromium.org> | 2022-09-22 12:49:33 -0700 |
commit | 2bcf863b492fe7ed8105c853814dba6ed32ba719 (patch) | |
tree | fcf6ce5810f9ff9e3c8cce434812dd75492269ed /zephyr/Kconfig | |
parent | e5fb0b9ba488614b5684e640530f00821ab7b943 (diff) | |
parent | 28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff) | |
download | chrome-ec-firmware-fpmcu-bloonchipper-release.tar.gz |
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
Diffstat (limited to 'zephyr/Kconfig')
-rw-r--r-- | zephyr/Kconfig | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/zephyr/Kconfig b/zephyr/Kconfig index 6e17b9ed13..62b9fac62c 100644 --- a/zephyr/Kconfig +++ b/zephyr/Kconfig @@ -1,10 +1,12 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. rsource "app/Kconfig" rsource "drivers/Kconfig" rsource "emul/Kconfig" +rsource "fake/Kconfig" +rsource "mock/Kconfig" rsource "subsys/Kconfig" if ZTEST @@ -72,6 +74,7 @@ rsource "Kconfig.throttle_ap" rsource "Kconfig.usba" rsource "Kconfig.usbc" rsource "Kconfig.watchdog" +rsource "Kconfig.wireless_charger" # Define PLATFORM_EC_... options to enable EC features. Each Kconfig should be # matched by a line in zephyr/shim/include/config_chip.h which #defines the @@ -327,7 +330,7 @@ config PLATFORM_EC_EXTPOWER_GPIO Enable shimming the extpower_gpio module, which provides GPIO-based external power presence detection features. The project should define a GPIO pin named GPIO_AC_PRESENT, with - extpower_interrupt configured as the handler in gpio_map.h. + extpower_interrupt configured as the handler. config PLATFORM_EC_FLASH_CROS bool @@ -429,7 +432,7 @@ config PLATFORM_EC_LID_SWITCH behaviour. For example, when the lid is opened, the device may automatically power on. - This requires a GPIO named GPIO_LID_OPEN to be defined in gpio_map.h. + This requires a GPIO named GPIO_LID_OPEN to be defined or aliased. config PLATFORM_EC_MKBP_INPUT_DEVICES bool "Input devices via MKBP" @@ -490,23 +493,6 @@ config PLATFORM_EC_MKBP_HOST_EVENT_WAKEUP_MASK HOST_EVENT_AC_CONNECTED)>; The host events are defined in dt-bindings/wake_mask_event_defines.h -config PLATFORM_EC_MPU - bool "Support Memory-Protection Unit (MPU)" - depends on CPU_CORTEX_M - select ARM_MPU - default y - help - This enables support a Memory-Protection Unit which can limit access - to certain areas of memory. This can be used to protect code or data - from being written to improve security or to find bugs. - - It causes any code in the iram.text section to be protected when - system jump is disabled (see system_disable_jump()). It also stops - execution of the image that is not currently being executed (read-only - or read-write). If internal storage is used, this is achieved by not - allowing code execution in that area. For external storage, it - disallows loading any code into RAM. - config PLATFORM_EC_PANIC bool "Panic output" default y @@ -540,7 +526,7 @@ config PLATFORM_EC_POWER_BUTTON commands in platform/ec. This is used to implement the Chromium OS shutdown sequence. - This requires a GPIO named GPIO_POWER_BUTTON_L in gpio_map.h. + This requires a GPIO named GPIO_POWER_BUTTON_L. config PLATFORM_EC_PWM_HC bool @@ -548,11 +534,10 @@ config PLATFORM_EC_PWM_HC Enable the PWM (Pulse Width Modulation) host command support. This implements EC_CMD_PWM_SET_DUTY and EC_CMD_PWM_GET_DUTY. -DT_COMPAT_CROS_EC_DISPLIGHT := cros-ec,displight - config PLATFORM_EC_PWM_DISPLIGHT bool "PWM display backlight" - default $(dt_compat_enabled,$(DT_COMPAT_CROS_EC_DISPLIGHT)) + default y + depends on DT_HAS_CROS_EC_DISPLIGHT_ENABLED select PLATFORM_EC_PWM_HC help Enables display backlight controlled by a PWM signal connected |