From 91fb078d25be0523d93070d713764dd38940ff05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Barna=C5=9B?= Date: Thu, 13 Oct 2022 19:47:15 +0200 Subject: zephyr: enable Kconfig based on the devicetree - motionsense MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit adds automatic selection of required Kconfig options based on the device tree nodes for module: motionsense BUG=b:251812799 BRANCH=main TEST=run twister and zcompare script Change-Id: Icbe3f6b503d803a8d75e17c5eb73993d6be8501c Signed-off-by: Michał Barnaś Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3982648 Reviewed-by: Wai-Hong Tam Code-Coverage: Zoss --- zephyr/Kconfig.motionsense | 5 +++++ zephyr/program/brya/prj.conf | 1 - zephyr/program/corsola/ite_program.conf | 1 - zephyr/program/corsola/npcx_program.conf | 1 - zephyr/program/herobrine/program.conf | 1 - zephyr/program/nissa/program.conf | 1 - zephyr/program/nissa/yaviks/project.conf | 1 - zephyr/program/rex/program.conf | 1 - zephyr/program/skyrim/program.conf | 1 - zephyr/program/trogdor/lazor/prj.conf | 1 - zephyr/test/drivers/prj.conf | 1 - zephyr/test/kingler/prj.conf | 1 - 12 files changed, 5 insertions(+), 11 deletions(-) diff --git a/zephyr/Kconfig.motionsense b/zephyr/Kconfig.motionsense index 86a7fb08bc..1dc4a9114e 100644 --- a/zephyr/Kconfig.motionsense +++ b/zephyr/Kconfig.motionsense @@ -4,6 +4,11 @@ menuconfig PLATFORM_EC_MOTIONSENSE bool "Motion Sense" + default y + depends on DT_HAS_CROS_EC_MOTIONSENSE_SENSOR_INFO_ENABLED || \ + $(dt_nodelabel_enabled,lid_accel) || \ + $(dt_nodelabel_enabled,base_accel) || \ + $(dt_nodelabel_enabled,base_gyro) select HAS_TASK_MOTIONSENSE help Enable motion sense task. The task collects data from available sensors diff --git a/zephyr/program/brya/prj.conf b/zephyr/program/brya/prj.conf index 7c85394abf..2929175360 100644 --- a/zephyr/program/brya/prj.conf +++ b/zephyr/program/brya/prj.conf @@ -53,7 +53,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO=y CONFIG_PLATFORM_EC_CONSOLE_CMD_I2C_SPEED=y # Sensors -CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_ACCEL_FIFO=y CONFIG_PLATFORM_EC_ALS=y CONFIG_PLATFORM_EC_DYNAMIC_MOTION_SENSOR_COUNT=y diff --git a/zephyr/program/corsola/ite_program.conf b/zephyr/program/corsola/ite_program.conf index c6ab6d64cf..e6851580db 100644 --- a/zephyr/program/corsola/ite_program.conf +++ b/zephyr/program/corsola/ite_program.conf @@ -34,7 +34,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSINFO=y CONFIG_PLATFORM_EC_HOST_COMMAND_STATUS=y # Sensors -CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_ACCEL_FIFO=y CONFIG_PLATFORM_EC_GMR_TABLET_MODE=y CONFIG_PLATFORM_EC_LID_ANGLE=y diff --git a/zephyr/program/corsola/npcx_program.conf b/zephyr/program/corsola/npcx_program.conf index 82b542fc23..f19bf5de0a 100644 --- a/zephyr/program/corsola/npcx_program.conf +++ b/zephyr/program/corsola/npcx_program.conf @@ -47,7 +47,6 @@ CONFIG_PLATFORM_EC_GMR_TABLET_MODE=y CONFIG_PLATFORM_EC_LID_ANGLE=y CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=y CONFIG_PLATFORM_EC_LID_SWITCH=y -CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS=y CONFIG_PLATFORM_EC_TABLET_MODE=y CONFIG_PLATFORM_EC_TABLET_MODE_SWITCH=y diff --git a/zephyr/program/herobrine/program.conf b/zephyr/program/herobrine/program.conf index 8e4785ee1c..b18dd9bed1 100644 --- a/zephyr/program/herobrine/program.conf +++ b/zephyr/program/herobrine/program.conf @@ -110,7 +110,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC_ALARM=y CONFIG_PLATFORM_EC_VBOOT_HASH=y # Sensors -CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_ACCEL_FIFO=y CONFIG_PLATFORM_EC_ACCEL_SPOOF_MODE=y CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS=y diff --git a/zephyr/program/nissa/program.conf b/zephyr/program/nissa/program.conf index d970073ad4..65a4914dc5 100644 --- a/zephyr/program/nissa/program.conf +++ b/zephyr/program/nissa/program.conf @@ -78,7 +78,6 @@ CONFIG_PWM_SHELL=y # Sensors support CONFIG_PLATFORM_EC_LID_ANGLE=y CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=y -CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS=y CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO=y CONFIG_PLATFORM_EC_ACCEL_FIFO=y diff --git a/zephyr/program/nissa/yaviks/project.conf b/zephyr/program/nissa/yaviks/project.conf index 401d27330a..4c83972b8c 100644 --- a/zephyr/program/nissa/yaviks/project.conf +++ b/zephyr/program/nissa/yaviks/project.conf @@ -11,7 +11,6 @@ CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3=y # Sensors: disabled; yaviks is clamshell-only CONFIG_PLATFORM_EC_LID_ANGLE=n CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=n -CONFIG_PLATFORM_EC_MOTIONSENSE=n CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS=n CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO=n CONFIG_PLATFORM_EC_ACCEL_FIFO=n diff --git a/zephyr/program/rex/program.conf b/zephyr/program/rex/program.conf index a3ce19ab69..55dfd930c5 100644 --- a/zephyr/program/rex/program.conf +++ b/zephyr/program/rex/program.conf @@ -125,7 +125,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO=y CONFIG_PLATFORM_EC_CONSOLE_CMD_I2C_SPEED=y # Sensors -CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_ACCEL_FIFO=y CONFIG_PLATFORM_EC_DYNAMIC_MOTION_SENSOR_COUNT=y CONFIG_PLATFORM_EC_GMR_TABLET_MODE=y diff --git a/zephyr/program/skyrim/program.conf b/zephyr/program/skyrim/program.conf index 4f9de351ea..69642809c7 100644 --- a/zephyr/program/skyrim/program.conf +++ b/zephyr/program/skyrim/program.conf @@ -101,7 +101,6 @@ CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y CONFIG_TASK_PD_STACK_SIZE=1280 # Motion sense -CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_ACCEL_FIFO=y CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS=y CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO=y diff --git a/zephyr/program/trogdor/lazor/prj.conf b/zephyr/program/trogdor/lazor/prj.conf index cf86c375d5..958c854bd9 100644 --- a/zephyr/program/trogdor/lazor/prj.conf +++ b/zephyr/program/trogdor/lazor/prj.conf @@ -110,7 +110,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC=y CONFIG_PLATFORM_EC_VBOOT_HASH=y # Sensors -CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_ACCEL_FIFO=y CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS=y CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO=y diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf index 5023cd0b09..00fc806d3b 100644 --- a/zephyr/test/drivers/prj.conf +++ b/zephyr/test/drivers/prj.conf @@ -84,7 +84,6 @@ CONFIG_PLATFORM_EC_TEMP_SENSOR_POWER=y CONFIG_PLATFORM_EC_SWITCH=y CONFIG_PLATFORM_EC_SWITCHCAP_LN9310=y CONFIG_PLATFORM_EC_ACCEL_BMA255=y -CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_ACCELGYRO_BMI160=y CONFIG_PLATFORM_EC_ACCELGYRO_BMI260=y CONFIG_PLATFORM_EC_ACCELGYRO_BMI_COMM_I2C=y diff --git a/zephyr/test/kingler/prj.conf b/zephyr/test/kingler/prj.conf index c8ef8e4304..17ffd4fb17 100644 --- a/zephyr/test/kingler/prj.conf +++ b/zephyr/test/kingler/prj.conf @@ -12,7 +12,6 @@ CONFIG_PLATFORM_EC_HOOKS=y CONFIG_CROS_EC=y CONFIG_PLATFORM_EC=y -CONFIG_PLATFORM_EC_MOTIONSENSE=y CONFIG_PLATFORM_EC_DYNAMIC_MOTION_SENSOR_COUNT=y CONFIG_PLATFORM_EC_GMR_TABLET_MODE=y CONFIG_PLATFORM_EC_TABLET_MODE=y -- cgit v1.2.1