summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorKeith Short <keithshort@chromium.org>2022-07-21 13:32:06 -0600
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-08-01 16:21:47 +0000
commitb719d38f1a02fbe3f003b5f2b840166496b3326c (patch)
treead2fbe58f9118eba4c17948fea57386c8c35b6a5 /Makefile.rules
parent094eddd5e0b92d63c79d6e357f2d1e61c5009553 (diff)
downloadchrome-ec-b719d38f1a02fbe3f003b5f2b840166496b3326c.tar.gz
zephyr: Delete CONFIG_PLATFORM_EC_ADC
CONFIG_PLATFORM_EC_ADC is redundant with the Zephyr Kconfig option, CONFIG_ADC. Use the Zephyr option directly. Note - projects based on the "minimal" config do not compare. The minimal config disabled CONFIG_ADC, but the CONFIG_PLATFORM_EC_ADC_CMD was still enabled. With this CL, CONFIG_PLATFORM_EC_ADC_CMD now depends on CONFIG_ADC. BUG=none BRANCH=none TEST=zmake testall --static; compare binaries Signed-off-by: Keith Short <keithshort@chromium.org> Change-Id: I129a3f490abd5c8234bc06ed6f86f2d7ff8a13b0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3791659 Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 0a09f78b45..0cf0580c88 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -248,6 +248,7 @@ ifeq ($(ALLOW_CONFIG),)
# Zephyr upstream happens to add the same option, since we are requiring new
# ECOS options to have a corresponding Kconfig anyway.
conflicting_options := \
+ ADC \
AUDIO_CODEC \
DAC \
DMA \