summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Feng <li1.feng@intel.com>2022-05-07 22:23:46 -0700
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-05-13 23:49:22 +0000
commit4a203e6ad5d6f1aaf0204684ae57f4995c99d90b (patch)
tree4525bbc3f32872e828188f00a5880677a9e1033d
parent13e2abfe2ab4fd321ca3d7606abcc135b62d5033 (diff)
downloadchrome-ec-4a203e6ad5d6f1aaf0204684ae57f4995c99d90b.tar.gz
zephyr: config RVP power sequencing in board level
Provide config options to build legacy EC power sequencing, include file legacy_ec_pwrseq.conf; or zephyr inbuilt power sequencing, include file zephyr_ap_pwrseq.conf. BUG=none BRANCH=none TEST=zmake adlrvp_npcx; zmake mtlrvpp_npcx. Signed-off-by: Li Feng <li1.feng@intel.com> Change-Id: I31ad5c66ff7ec8690cf2614ee8df60e51dde9148 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3633668 Reviewed-by: Keith Short <keithshort@chromium.org> Reviewed-by: Brandon Breitenstein <brandon.breitenstein@intel.com>
-rw-r--r--zephyr/projects/intelrvp/BUILD.py10
-rw-r--r--zephyr/projects/intelrvp/legacy_ec_pwrseq.conf13
-rw-r--r--zephyr/projects/intelrvp/prj.conf10
3 files changed, 21 insertions, 12 deletions
diff --git a/zephyr/projects/intelrvp/BUILD.py b/zephyr/projects/intelrvp/BUILD.py
index 7f9844c1bf..52a6a8fce1 100644
--- a/zephyr/projects/intelrvp/BUILD.py
+++ b/zephyr/projects/intelrvp/BUILD.py
@@ -52,7 +52,10 @@ register_intelrvp_project(
here / "adlrvp/adlrvp_npcx/temp_sensor.dts",
here / "adlrvp/adlrvp_npcx/usbc.dts",
],
- extra_kconfig_files=[here / "adlrvp/adlrvp_npcx/prj.conf"],
+ extra_kconfig_files=[
+ here / "legacy_ec_pwrseq.conf",
+ here / "adlrvp/adlrvp_npcx/prj.conf",
+ ],
)
register_intelrvp_project(
@@ -67,5 +70,8 @@ register_intelrvp_project(
here / "mtlrvp/mtlrvpp_npcx/mtlrvp_npcx.dts",
here / "adlrvp/adlrvp_npcx/temp_sensor.dts",
],
- extra_kconfig_files=[here / "mtlrvp/mtlrvpp_npcx/prj.conf"],
+ extra_kconfig_files=[
+ here / "legacy_ec_pwrseq.conf",
+ here / "mtlrvp/mtlrvpp_npcx/prj.conf",
+ ],
)
diff --git a/zephyr/projects/intelrvp/legacy_ec_pwrseq.conf b/zephyr/projects/intelrvp/legacy_ec_pwrseq.conf
new file mode 100644
index 0000000000..cdcfbc2b13
--- /dev/null
+++ b/zephyr/projects/intelrvp/legacy_ec_pwrseq.conf
@@ -0,0 +1,13 @@
+# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Legacy EC Power Sequencing Common Config
+CONFIG_PLATFORM_EC_POWERSEQ=y
+CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP=y
+CONFIG_PLATFORM_EC_POWERSEQ_INTEL=y
+CONFIG_PLATFORM_EC_POWERSEQ_RSMRST_DELAY=y
+CONFIG_PLATFORM_EC_POWERSEQ_S0IX=y
+CONFIG_PLATFORM_EC_POWERSEQ_S4=y
+CONFIG_PLATFORM_EC_BOARD_RESET_AFTER_POWER_ON=y
+CONFIG_PLATFORM_EC_THROTTLE_AP=y
diff --git a/zephyr/projects/intelrvp/prj.conf b/zephyr/projects/intelrvp/prj.conf
index 99ebb60daa..51b9245200 100644
--- a/zephyr/projects/intelrvp/prj.conf
+++ b/zephyr/projects/intelrvp/prj.conf
@@ -46,16 +46,6 @@ CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI2=y
CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y
CONFIG_PLATFORM_EC_CMD_BUTTON=n
-# Power Sequencing
-CONFIG_PLATFORM_EC_POWERSEQ=y
-CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP=y
-CONFIG_PLATFORM_EC_POWERSEQ_INTEL=y
-CONFIG_PLATFORM_EC_POWERSEQ_RSMRST_DELAY=y
-CONFIG_PLATFORM_EC_POWERSEQ_S0IX=y
-CONFIG_PLATFORM_EC_POWERSEQ_S4=y
-CONFIG_PLATFORM_EC_BOARD_RESET_AFTER_POWER_ON=y
-CONFIG_PLATFORM_EC_THROTTLE_AP=y
-
# Sensors
CONFIG_SENSOR=y
CONFIG_SENSOR_SHELL=n