diff options
| author | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:41:11 +0000 |
|---|---|---|
| committer | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:41:11 +0000 |
| commit | 6c1587ca70f558b4f96b3f0b18ad8b027d3ba99d (patch) | |
| tree | 9a15b4a98d7987870a1805a33883d0cf9123fc05 /zephyr/Kconfig.powerseq | |
| parent | 63a8a1366e390b757c37e167927102be0fc4fb63 (diff) | |
| parent | a46d3f3feaac0d69012f61b66f652bff991d05a7 (diff) | |
| download | chrome-ec-6c1587ca70f558b4f96b3f0b18ad8b027d3ba99d.tar.gz | |
Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-release
Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release
Relevant changes:
git log --oneline 63a8a1366e..a46d3f3fea -- board/nocturne_fp
board/dartmonkey common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
981fb88cf8 docs/fingerprint: Resolve contradictory FPMCU factory flashing instructions
60032a8828 docs/fingerprint: Clean up formatting in fingerprint-factory-quick-guide.md
f49eb6f894 docs/fingerprint: Run mdformat
64aa5fc7bb docs/fingerprint: Add links to info on fuzz testing
8bd99cc434 fpsensor: Use correct return type
2b2d7a991d fpsensor: Use correct return type
BRANCH=None
BUG=b:234772776 b:234181908
TEST=`make -j buildall`
Cq-Include-Trybots: chromeos/cq:cq-orchestrator
Signed-off-by: Firas Sammoura <fsammoura@google.com>
Change-Id: I1714a77d292aad81bdc71982c88b2b067cfdada7
Diffstat (limited to 'zephyr/Kconfig.powerseq')
| -rw-r--r-- | zephyr/Kconfig.powerseq | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/zephyr/Kconfig.powerseq b/zephyr/Kconfig.powerseq index cee5be53a4..f0db496082 100644 --- a/zephyr/Kconfig.powerseq +++ b/zephyr/Kconfig.powerseq @@ -5,6 +5,7 @@ menuconfig PLATFORM_EC_POWERSEQ bool "Power sequencing" depends on AP + depends on !AP_PWRSEQ select HAS_TASK_CHIPSET help Enable shimming the platform/ec AP power sequencing code. This @@ -15,6 +16,14 @@ menuconfig PLATFORM_EC_POWERSEQ if PLATFORM_EC_POWERSEQ +config PLATFORM_EC_POWERSEQ_S0IX + bool "Enable S0ix sleep states" + select PLATFORM_EC_POWERSEQ_HOST_SLEEP + help + Enable the CONFIG_POWER_S0IX platform/ec configuration + option, Intel's low-power idle sleep state, also known as + "modern sleep". + config PLATFORM_EC_POWERSEQ_HOST_SLEEP bool "Track host sleep states" help @@ -120,14 +129,6 @@ config PLATFORM_EC_POWERSEQ_RTC_RESET gpio_map.h, which can be used to reset the AP's RTC when set high. -config PLATFORM_EC_POWERSEQ_S0IX - bool "Enable S0ix sleep states" - select PLATFORM_EC_POWERSEQ_HOST_SLEEP - help - Enable the CONFIG_POWER_S0IX platform/ec configuration - option, Intel's low-power idle sleep state, also known as - "modern sleep". - config PLATFORM_EC_POWERSEQ_S4 bool "Advertise S4 residency" depends on PLATFORM_EC_ESPI_VW_SLP_S5 |