diff options
author | Fabio Baltieri <fabiobaltieri@google.com> | 2022-11-14 15:26:05 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-11-16 10:42:28 +0000 |
commit | 2bbef559d259197864a6610b04d2745274f47315 (patch) | |
tree | 2d775aef8e26bf5b30d50a06a7d0dae320e006b9 | |
parent | 791d419489b8174271f593ce68608a3ecd8e6441 (diff) | |
download | chrome-ec-2bbef559d259197864a6610b04d2745274f47315.tar.gz |
zephyr: keyboard: select PLATFORM_EC_KEYBOARD_DISCRETE automatically
Select PLATFORM_EC_KEYBOARD_DISCRETE automatically and make it depend on
having the corresponding nodelabel. This allows removal of an explicit
config entry and prevents the driver from trying to build with an
invalid configuration.
BRANCH=none
BUG=none
TEST=cq dry run
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: Ib2bbdf18952b0536761c72070f5113723e99bb7a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4021953
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Yuval Peress <peress@google.com>
-rw-r--r-- | zephyr/Kconfig.keyboard | 2 | ||||
-rw-r--r-- | zephyr/program/intelrvp/mtlrvp/prj.conf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/zephyr/Kconfig.keyboard b/zephyr/Kconfig.keyboard index 505f292e8b..444c20950c 100644 --- a/zephyr/Kconfig.keyboard +++ b/zephyr/Kconfig.keyboard @@ -50,6 +50,8 @@ endchoice # PLATFORM_EC_KEYBOARD_PROTOCOL_MODE config PLATFORM_EC_KEYBOARD_DISCRETE bool "Support discrete Keyboard" + default y + depends on $(dt_nodelabel_enabled,kb_discrete) help Enable support for a discrete Keyboard if the platform needs one or the raw Keyboard support is not built-in in the EC. diff --git a/zephyr/program/intelrvp/mtlrvp/prj.conf b/zephyr/program/intelrvp/mtlrvp/prj.conf index de1b8e71a5..3b0b0fa32e 100644 --- a/zephyr/program/intelrvp/mtlrvp/prj.conf +++ b/zephyr/program/intelrvp/mtlrvp/prj.conf @@ -33,7 +33,6 @@ CONFIG_PLATFORM_EC_IOEX_CCGXXF=y CONFIG_PLATFORM_EC_IOEX_IT8801=y #Keyboard from I/O expander -CONFIG_PLATFORM_EC_KEYBOARD_DISCRETE=y CONFIG_CROS_KB_RAW_NPCX=n # Temperature sensors |