summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKeith Short <keithshort@chromium.org>2023-04-28 09:58:35 -0600
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-04-28 18:08:51 +0000
commit3b0643fc0d48b1c8c052cde4045c0b143e5696db (patch)
tree1b08466eef48bbb4091a80ae72641c4717097b93 /include
parentae68afbb5d58ce7af0be3e04f833900b105021cd (diff)
downloadchrome-ec-3b0643fc0d48b1c8c052cde4045c0b143e5696db.tar.gz
config: Don't allow legacy INA drivers with Zephyr
Zephyr provides duplicate symbol CONFIG_INA3221 upstream. Don't allow Zephyr boards to modify this symbol directly. BUG=b:279955995 BRANCH=none TEST=make check_undef TEST=make BOARD=eve Change-Id: I011ebd0896de78fb99d8a5264e753f36f841397e Signed-off-by: Keith Short <keithshort@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4490505 Reviewed-by: Tristan Honscheid <honscheid@google.com> Reviewed-by: Sam Hurst <shurst@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/config.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/config.h b/include/config.h
index f99253b49b..b354956bb5 100644
--- a/include/config.h
+++ b/include/config.h
@@ -2857,10 +2857,15 @@
* Only one of these may be defined (if any).
*/
#ifndef CONFIG_ZEPHYR
+/*
+ * These symbols also exist as Kconfigs in Zephyr. Zephyr based boards
+ * need to use the upstream driver, or these symbols need to be changed
+ * downstream to not conflict.
+ */
#undef CONFIG_INA219
+#undef CONFIG_INA3221
#endif /* CONFIG_ZEPHYR */
#undef CONFIG_INA231
-#undef CONFIG_INA3221
/*****************************************************************************/
/* Inductive charging */