summaryrefslogtreecommitdiff
path: root/zephyr
diff options
context:
space:
mode:
authorJack Rosenthal <jrosenth@chromium.org>2021-02-16 14:49:07 -0700
committerCommit Bot <commit-bot@chromium.org>2021-02-17 21:08:27 +0000
commit4d5ff27740a8297341b443ad53a24cdbdcd4167e (patch)
tree779363ce31a78300ac8bf8edf55ef739fb248445 /zephyr
parentbec265cdd46c81f6ef8eb3a563dfbdee98be56d6 (diff)
downloadchrome-ec-4d5ff27740a8297341b443ad53a24cdbdcd4167e.tar.gz
zephyr: move select on HAS_TASK_POWERBTN to PLATFORM_EC_POWERSEQ_INTEL
common/power_button.c (enabled by PLATFORM_EC_POWER_BUTTON) does not use or require the POWERBTN task. The POWERBTN task is required by common/power_button_x86.c instead, which is enabled by PLATFORM_EC_POWERSEQ_INTEL. Thus, there should not be a reverse dependency on the POWERBTN task for PLATFORM_EC_POWER_BUTTON, and this select was moved to the correct location. BUG=b:180410072 BRANCH=none TEST=compile for delbin with follow-up CL (enables the power button) Signed-off-by: Jack Rosenthal <jrosenth@chromium.org> Change-Id: Icf7c89ad006c2c32cdc1f0f77ecff0c42fa6dab2 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2699530 Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'zephyr')
-rw-r--r--zephyr/Kconfig1
-rw-r--r--zephyr/Kconfig.powerseq1
2 files changed, 1 insertions, 1 deletions
diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index 20a671e394..43a1919f80 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -573,7 +573,6 @@ config PLATFORM_EC_PORT80
config PLATFORM_EC_POWER_BUTTON
bool "Power-button support"
- select HAS_TASK_POWERBTN
depends on PLATFORM_EC_HOSTCMD
help
Enable shimming the power button implementation and related
diff --git a/zephyr/Kconfig.powerseq b/zephyr/Kconfig.powerseq
index 25a3793e9e..320c08ee78 100644
--- a/zephyr/Kconfig.powerseq
+++ b/zephyr/Kconfig.powerseq
@@ -45,6 +45,7 @@ config PLATFORM_EC_HOSTCMD_AP_RESET
menuconfig PLATFORM_EC_POWERSEQ_INTEL
bool "Enable shimming common Intel power sequencing code"
depends on AP_X86_INTEL
+ select HAS_TASK_POWERBTN
default y
help
Enable shimming platform/ec AP power sequencing code for