diff options
author | Fabio Baltieri <fabiobaltieri@google.com> | 2022-07-22 15:01:45 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-29 11:43:01 +0000 |
commit | ed5fc8f4ec773392fe75e341f73ed0d176dd616a (patch) | |
tree | 0dc20e246fee5b1d607254cd2691fdce291ae90e | |
parent | 2ef2b298e78d9c483ad35dbaf0f2227df2c1931a (diff) | |
download | chrome-ec-ed5fc8f4ec773392fe75e341f73ed0d176dd616a.tar.gz |
zephyr: Kconfig: use devicetree Kconfig symbols
Replace all instances of $(dt_compat_enabled, ...) with the equivalent
auto-generated Kconfig symbols.
BRANCH=none
BUG=none
TEST=zmake testall
TEST=zmake build brya and diff the .config
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Cq-Depend: chromium:3776850
Change-Id: I3a86a934182d3277aab7e5a545a4ca2d5cfedfb0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3779894
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
-rw-r--r-- | zephyr/Kconfig | 5 | ||||
-rw-r--r-- | zephyr/Kconfig.keyboard | 5 | ||||
-rw-r--r-- | zephyr/Kconfig.system | 5 | ||||
-rw-r--r-- | zephyr/Kconfig.temperature | 5 | ||||
-rw-r--r-- | zephyr/emul/Kconfig.clock_control | 5 | ||||
-rw-r--r-- | zephyr/emul/Kconfig.i2c_mock | 5 | ||||
-rw-r--r-- | zephyr/emul/Kconfig.isl923x | 5 | ||||
-rw-r--r-- | zephyr/emul/Kconfig.lis2dw12 | 5 | ||||
-rw-r--r-- | zephyr/emul/Kconfig.ln9310 | 5 | ||||
-rw-r--r-- | zephyr/emul/Kconfig.sn5s330 | 5 |
10 files changed, 20 insertions, 30 deletions
diff --git a/zephyr/Kconfig b/zephyr/Kconfig index 42c6a8220c..601af45022 100644 --- a/zephyr/Kconfig +++ b/zephyr/Kconfig @@ -549,11 +549,10 @@ config PLATFORM_EC_PWM_HC Enable the PWM (Pulse Width Modulation) host command support. This implements EC_CMD_PWM_SET_DUTY and EC_CMD_PWM_GET_DUTY. -DT_COMPAT_CROS_EC_DISPLIGHT := cros-ec,displight - config PLATFORM_EC_PWM_DISPLIGHT bool "PWM display backlight" - default $(dt_compat_enabled,$(DT_COMPAT_CROS_EC_DISPLIGHT)) + default y + depends on DT_HAS_CROS_EC_DISPLIGHT_ENABLED select PLATFORM_EC_PWM_HC help Enables display backlight controlled by a PWM signal connected diff --git a/zephyr/Kconfig.keyboard b/zephyr/Kconfig.keyboard index 51cf7bf433..ef8bd3585d 100644 --- a/zephyr/Kconfig.keyboard +++ b/zephyr/Kconfig.keyboard @@ -180,11 +180,10 @@ config PLATFORM_EC_CONSOLE_CMD_KEYBOARD kblog - Print or toggle keyboard event log (current disabled) typematic - Get/set typematic delays -DT_COMPAT_CROS_EC_KBLIGHT_PWM := cros-ec,kblight-pwm - config PLATFORM_EC_PWM_KBLIGHT bool "PWM keyboard backlight" - default $(dt_compat_enabled,$(DT_COMPAT_CROS_EC_KBLIGHT_PWM)) + default y + depends on DT_HAS_CROS_EC_KBLIGHT_PWM_ENABLED select PLATFORM_EC_PWM_HC help Enables a PWM-controlled keyboard backlight controlled by a PWM signal diff --git a/zephyr/Kconfig.system b/zephyr/Kconfig.system index 66586b6e2d..65241ca78b 100644 --- a/zephyr/Kconfig.system +++ b/zephyr/Kconfig.system @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -DT_COMPAT_NUVOTON_NPCX_POWER_PSL := nuvoton,npcx-power-psl - if PLATFORM_EC config PLATFORM_EC_CONSOLE_CMD_SCRATCHPAD @@ -22,7 +20,8 @@ config PLATFORM_EC_CONSOLE_CMD_SYSINFO config PLATFORM_EC_HIBERNATE_PSL bool "System hibernating with PSL (Power Switch Logic) mechanism" - default $(dt_compat_enabled,$(DT_COMPAT_NUVOTON_NPCX_POWER_PSL)) + default y + depends on DT_HAS_NUVOTON_NPCX_POWER_PSL_ENABLED depends on SOC_FAMILY_NPCX help Use PSL (Power Switch Logic) for hibernating. It turns off VCC power diff --git a/zephyr/Kconfig.temperature b/zephyr/Kconfig.temperature index 1718a8dc53..33461c4341 100644 --- a/zephyr/Kconfig.temperature +++ b/zephyr/Kconfig.temperature @@ -77,11 +77,10 @@ config PLATFORM_EC_TEMP_SENSOR_FIRST_READ_DELAY_MS endif # PLATFORM_EC_TEMP_SENSOR_FIRST_READ_DELAY -DT_COMPAT_CROS_EC_FANS := cros-ec,fans - config PLATFORM_EC_FAN bool "Fan support" - default $(dt_compat_enabled,$(DT_COMPAT_CROS_EC_FANS)) + default y + depends on DT_HAS_CROS_EC_FANS_ENABLED help Enables support for fans. Allows periodic thermal task to automatically set the fan speed (control temperature). diff --git a/zephyr/emul/Kconfig.clock_control b/zephyr/emul/Kconfig.clock_control index a4dfbce557..5d385f4e0b 100644 --- a/zephyr/emul/Kconfig.clock_control +++ b/zephyr/emul/Kconfig.clock_control @@ -2,11 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -DT_COMPAT_CLOCK_CONTROL_EMUL := cros,clock-control-emul - config EMUL_CLOCK_CONTROL bool "Emulated clock control" - default $(dt_compat_enabled,$(DT_COMPAT_CLOCK_CONTROL_EMUL)) + default y + depends on DT_HAS_CROS_CLOCK_CONTROL_EMUL_ENABLED help Enable the emulated clock control module. This module introduces a functioning clock control implementation along with backdoor APIs to diff --git a/zephyr/emul/Kconfig.i2c_mock b/zephyr/emul/Kconfig.i2c_mock index 6c98a32739..a94147bb63 100644 --- a/zephyr/emul/Kconfig.i2c_mock +++ b/zephyr/emul/Kconfig.i2c_mock @@ -2,11 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -DT_COMPAT_I2C_MOCK := cros,i2c-mock - menuconfig I2C_MOCK bool "Mock implementation of an I2C device" - default $(dt_compat_enabled,$(DT_COMPAT_I2C_MOCK)) + default y + depends on DT_HAS_CROS_I2C_MOCK_ENABLED depends on I2C_EMUL help Enable the I2C mock. This driver is a pure mock and does nothing by diff --git a/zephyr/emul/Kconfig.isl923x b/zephyr/emul/Kconfig.isl923x index bf124ec0a9..762d0f5ca2 100644 --- a/zephyr/emul/Kconfig.isl923x +++ b/zephyr/emul/Kconfig.isl923x @@ -2,11 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -DT_COMPAT_ISL923X_EMUL := cros,isl923x-emul - menuconfig EMUL_ISL923X bool "ISL923X switchcap emulator" - default $(dt_compat_enabled,$(DT_COMPAT_ISL923X_EMUL)) + default y + depends on DT_HAS_CROS_ISL923X_EMUL_ENABLED depends on I2C_EMUL help Enable the ISL923X emulator. This driver uses the emulated I2C bus. It diff --git a/zephyr/emul/Kconfig.lis2dw12 b/zephyr/emul/Kconfig.lis2dw12 index 2263255418..ee223a4891 100644 --- a/zephyr/emul/Kconfig.lis2dw12 +++ b/zephyr/emul/Kconfig.lis2dw12 @@ -2,11 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -DT_COMPAT_LIS2DW12_EMUL := cros,lis2dw12-emul - menuconfig EMUL_LIS2DW12 bool "LIS2DW12 accelerometer emulator" - default $(dt_compat_enabled,$(DT_COMPAT_LIS2DW12_EMUL)) + default y + depends on DT_HAS_CROS_LIS2DW12_EMUL_ENABLED depends on I2C_EMUL select PLATFORM_EC_ACCEL_LIS2DW12 help diff --git a/zephyr/emul/Kconfig.ln9310 b/zephyr/emul/Kconfig.ln9310 index c9e3e6fbc9..193c83093c 100644 --- a/zephyr/emul/Kconfig.ln9310 +++ b/zephyr/emul/Kconfig.ln9310 @@ -2,11 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -DT_COMPAT_LN9310_EMUL := cros,ln9310-emul - menuconfig EMUL_LN9310 bool "LN9310 switchcap emulator" - default $(dt_compat_enabled,$(DT_COMPAT_LN9310_EMUL)) + default y + depends on DT_HAS_CROS_LN9310_EMUL_ENABLED depends on I2C_EMUL depends on ASSERT help diff --git a/zephyr/emul/Kconfig.sn5s330 b/zephyr/emul/Kconfig.sn5s330 index bb3e5eeea8..3ae2eb29e3 100644 --- a/zephyr/emul/Kconfig.sn5s330 +++ b/zephyr/emul/Kconfig.sn5s330 @@ -2,11 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -DT_COMPAT_SN5S330_EMUL := cros,sn5s330-emul - menuconfig EMUL_SN5S330 bool "sn5s330 emulator" - default $(dt_compat_enabled,$(DT_COMPAT_SN5S330_EMUL)) + default y + depends on DT_HAS_CROS_SN5S330_EMUL_ENABLED depends on I2C_EMUL depends on ASSERT help |