diff options
| -rw-r--r-- | include/config.h | 7 | ||||
| -rw-r--r-- | util/config_allowed.txt | 1 |
2 files changed, 6 insertions, 2 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 */ diff --git a/util/config_allowed.txt b/util/config_allowed.txt index b2a32b11aa..a469d0c156 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -494,7 +494,6 @@ CONFIG_I2C_XFER_BOARD_CALLBACK CONFIG_I2C_XFER_LARGE_TRANSFER CONFIG_IMAGE_PADDING CONFIG_INA231 -CONFIG_INA3221 CONFIG_INDUCTIVE_CHARGING CONFIG_INTEL_RVP_MECC_VERSION_1_0 CONFIG_INTEL_RVP_MECC_VERSION_1_1 |