diff options
| author | Brandon Breitenstein <brandon.breitenstein@intel.com> | 2022-03-09 10:59:41 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-03-17 20:44:50 +0000 |
| commit | b47f8e1c229a74b126b6c8ccca7cd10ceb5f36ef (patch) | |
| tree | 2d93c214b5d8c0e951569b38315b8080e470bee9 | |
| parent | 4412c9404d6e28e168ed2a4856d6d678707c8967 (diff) | |
| download | chrome-ec-b47f8e1c229a74b126b6c8ccca7cd10ceb5f36ef.tar.gz | |
Zephyr: Correct adlrvp and intelrvp baseboard to select correct config
Since there are now multiple intelrvp boards no longer select the power
sequencing in the baseboard and move the selection to the specific rvp.
Also set the default for icelake to n to avoid always pulling it.
BUG=none
BRANCH=none
TEST=zmake testall and verify that there are no build issues with new prj.conf
Signed-off-by: Brandon Breitenstein <brandon.breitenstein@intel.com>
Change-Id: I266d74b75628156668ec9d40f6ffec7315c53224
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3516596
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | zephyr/Kconfig.powerseq | 2 | ||||
| -rw-r--r-- | zephyr/projects/intelrvp/adlrvp/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/intelrvp/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/volteer/volteer/prj.conf | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/zephyr/Kconfig.powerseq b/zephyr/Kconfig.powerseq index ab01f81b42..a99453f5a7 100644 --- a/zephyr/Kconfig.powerseq +++ b/zephyr/Kconfig.powerseq @@ -156,7 +156,7 @@ config PLATFORM_EC_POWERSEQ_METEORLAKE menuconfig PLATFORM_EC_POWERSEQ_ICELAKE bool "Use common Icelake code for power sequencing" depends on AP_X86_INTEL_TGL - default y + default n help Use the Icelake common code for power sequencing. Note that this applies to more platforms than just Icelake. For diff --git a/zephyr/projects/intelrvp/adlrvp/prj.conf b/zephyr/projects/intelrvp/adlrvp/prj.conf index 2ec05ce0fd..9c4ce17c3d 100644 --- a/zephyr/projects/intelrvp/adlrvp/prj.conf +++ b/zephyr/projects/intelrvp/adlrvp/prj.conf @@ -6,6 +6,7 @@ CONFIG_AP_X86_INTEL_TGL=y CONFIG_PLATFORM_EC_POWERSEQ_SLP_S3_L_OVERRIDE=n CONFIG_PLATFORM_EC_POWERSEQ_PP5000_CONTROL=n +CONFIG_PLATFORM_EC_POWERSEQ_ICELAKE=y # Battery CONFIG_PLATFORM_EC_BATTERY_TYPE_NO_AUTO_DETECT=y diff --git a/zephyr/projects/intelrvp/prj.conf b/zephyr/projects/intelrvp/prj.conf index 913d62d093..74d7d4832a 100644 --- a/zephyr/projects/intelrvp/prj.conf +++ b/zephyr/projects/intelrvp/prj.conf @@ -47,7 +47,6 @@ CONFIG_PLATFORM_EC_CMD_BUTTON=n CONFIG_PLATFORM_EC_POWERSEQ=y CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP=y CONFIG_PLATFORM_EC_POWERSEQ_INTEL=y -CONFIG_PLATFORM_EC_POWERSEQ_ICELAKE=y CONFIG_PLATFORM_EC_POWERSEQ_RSMRST_DELAY=y CONFIG_PLATFORM_EC_POWERSEQ_S0IX=y CONFIG_PLATFORM_EC_POWERSEQ_S4=y diff --git a/zephyr/projects/volteer/volteer/prj.conf b/zephyr/projects/volteer/volteer/prj.conf index ba914ce5ad..51f3cb7d5e 100644 --- a/zephyr/projects/volteer/volteer/prj.conf +++ b/zephyr/projects/volteer/volteer/prj.conf @@ -63,6 +63,7 @@ CONFIG_PLATFORM_EC_POWERSEQ=y CONFIG_PLATFORM_EC_POWERSEQ_RTC_RESET=y CONFIG_PLATFORM_EC_POWERSEQ_S0IX=y CONFIG_PLATFORM_EC_POWERSEQ_S4=y +CONFIG_PLATFORM_EC_POWERSEQ_ICELAKE=y CONFIG_PLATFORM_EC_POWER_SLEEP_FAILURE_DETECTION=y CONFIG_PLATFORM_EC_THROTTLE_AP=y |