diff options
| author | Fabio Baltieri <fabiobaltieri@google.com> | 2022-11-02 15:56:46 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-11-09 10:19:20 +0000 |
| commit | a4ca8b234ff5d77b6c935756cc76eaca1b7cb4b7 (patch) | |
| tree | 9aef7dd84a3dc7a8837603ef6b723ae328d267c4 | |
| parent | 81d08d61a3737c35e805ebd2057cf378489af4ed (diff) | |
| download | chrome-ec-a4ca8b234ff5d77b6c935756cc76eaca1b7cb4b7.tar.gz | |
zephyr: Kconfig: enable CONFIG_CROS_KB_RAW_NPCX automatically
Enable CONFIG_CROS_KB_RAW_NPCX automatically based devicetree compatible
nodes.
BRANCH=none
BUG=none
TEST=cq dry run
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I340b51d0337644b828c09df59a63819201b1cdbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4000386
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
| -rw-r--r-- | zephyr/drivers/cros_kb_raw/Kconfig | 2 | ||||
| -rw-r--r-- | zephyr/program/brya/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/program/corsola/prj_npcx993_base.conf | 1 | ||||
| -rw-r--r-- | zephyr/program/herobrine/program.conf | 1 | ||||
| -rw-r--r-- | zephyr/program/intelrvp/adlrvp/adlrvp_npcx/prj.conf | 3 | ||||
| -rw-r--r-- | zephyr/program/nissa/npcx_program.conf | 1 | ||||
| -rw-r--r-- | zephyr/program/rex/prj_rex.conf | 3 | ||||
| -rw-r--r-- | zephyr/program/trogdor/lazor/prj.conf | 1 |
8 files changed, 1 insertions, 12 deletions
diff --git a/zephyr/drivers/cros_kb_raw/Kconfig b/zephyr/drivers/cros_kb_raw/Kconfig index 439a1d4abf..1e10f38bbe 100644 --- a/zephyr/drivers/cros_kb_raw/Kconfig +++ b/zephyr/drivers/cros_kb_raw/Kconfig @@ -6,8 +6,8 @@ if PLATFORM_EC_KEYBOARD menuconfig CROS_KB_RAW_NPCX bool "Nuvoton NPCX raw-keyboard-scan driver for the Zephyr shim" - depends on SOC_FAMILY_NPCX default y + depends on DT_HAS_NUVOTON_NPCX_CROS_KB_RAW_ENABLED help This option enables a driver for providing raw access to the keyboard-scan peripheral in the chip. This is used instead of the diff --git a/zephyr/program/brya/prj.conf b/zephyr/program/brya/prj.conf index 6bd30affb4..5d80ff9b34 100644 --- a/zephyr/program/brya/prj.conf +++ b/zephyr/program/brya/prj.conf @@ -101,7 +101,6 @@ CONFIG_PLATFORM_EC_KEYBOARD_KEYPAD=y CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI3=y CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y CONFIG_PLATFORM_EC_CMD_BUTTON=n -CONFIG_CROS_KB_RAW_NPCX=y CONFIG_PLATFORM_EC_WORKAROUND_FLASH_DOWNLOAD_API=y diff --git a/zephyr/program/corsola/prj_npcx993_base.conf b/zephyr/program/corsola/prj_npcx993_base.conf index 0642bcd331..35189ea2f7 100644 --- a/zephyr/program/corsola/prj_npcx993_base.conf +++ b/zephyr/program/corsola/prj_npcx993_base.conf @@ -87,7 +87,6 @@ CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_BY_BOARD=y CONFIG_PLATFORM_EC_BACKLIGHT_LID=n # Keyboard -CONFIG_CROS_KB_RAW_NPCX=y CONFIG_CROS_KB_RAW_NPCX_KSO_HIGH_DRIVE=y CONFIG_SYSCON=y diff --git a/zephyr/program/herobrine/program.conf b/zephyr/program/herobrine/program.conf index ee137554cf..18ebb67471 100644 --- a/zephyr/program/herobrine/program.conf +++ b/zephyr/program/herobrine/program.conf @@ -62,7 +62,6 @@ CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3=y CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y CONFIG_PLATFORM_EC_CMD_BUTTON=y -CONFIG_CROS_KB_RAW_NPCX=y # ADC CONFIG_ADC=y diff --git a/zephyr/program/intelrvp/adlrvp/adlrvp_npcx/prj.conf b/zephyr/program/intelrvp/adlrvp/adlrvp_npcx/prj.conf index 52d3bac798..e6063b953c 100644 --- a/zephyr/program/intelrvp/adlrvp/adlrvp_npcx/prj.conf +++ b/zephyr/program/intelrvp/adlrvp/adlrvp_npcx/prj.conf @@ -12,9 +12,6 @@ CONFIG_PLATFORM_EC_DEDICATED_CHARGE_PORT=y # FAN CONFIG_TACH_NPCX=y -# Keyboard -CONFIG_CROS_KB_RAW_NPCX=y - # PWM CONFIG_PWM=y CONFIG_PWM_SHELL=n diff --git a/zephyr/program/nissa/npcx_program.conf b/zephyr/program/nissa/npcx_program.conf index 875c4bb2ef..4995f0e809 100644 --- a/zephyr/program/nissa/npcx_program.conf +++ b/zephyr/program/nissa/npcx_program.conf @@ -14,7 +14,6 @@ CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=256 CONFIG_PLATFORM_EC_ACCEL_LIS2DW12=y # Keyboard -CONFIG_CROS_KB_RAW_NPCX=y CONFIG_PLATFORM_EC_KBLIGHT_ENABLE_PIN=y # Ensure recovery key combination (esc+refresh+power) is reliable CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI3=y diff --git a/zephyr/program/rex/prj_rex.conf b/zephyr/program/rex/prj_rex.conf index 0f204b9669..b724a881b9 100644 --- a/zephyr/program/rex/prj_rex.conf +++ b/zephyr/program/rex/prj_rex.conf @@ -4,6 +4,3 @@ # Rex reference-board-specific Kconfig settings. CONFIG_BOARD_REX=y - -# Keyboard -CONFIG_CROS_KB_RAW_NPCX=y diff --git a/zephyr/program/trogdor/lazor/prj.conf b/zephyr/program/trogdor/lazor/prj.conf index 84a71ee5a8..60822404ce 100644 --- a/zephyr/program/trogdor/lazor/prj.conf +++ b/zephyr/program/trogdor/lazor/prj.conf @@ -61,7 +61,6 @@ CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y CONFIG_PLATFORM_EC_CMD_BUTTON=y -CONFIG_CROS_KB_RAW_NPCX=y # ADC CONFIG_ADC=y |