diff options
| author | Logan_Liao <Logan_Liao@compal.corp-partner.google.com> | 2023-04-28 17:25:56 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-10 02:26:08 +0000 |
| commit | ecab2bd4a7bd388483a6eee18fbcf6dfcfd5f261 (patch) | |
| tree | 354b084f5b0741d8449701b2090a1afea4d86987 | |
| parent | e95816c0b9a85f24fa2c8c55adc69a494854fa59 (diff) | |
| download | chrome-ec-ecab2bd4a7bd388483a6eee18fbcf6dfcfd5f261.tar.gz | |
config: Add more condition for VBUS measure from charger.
Because of build gradation, build Board layer first, build config.h
later, cause that although define monitor TCPC VBUS, code still define
CONFIG_PD_VBUS_MEASURE_CHARGER when using ISL9241 which support VBUS
measure.
BUG=b:278988137
TEST=test VBUS meanure from TCPC success.
Zephyr compare builds successful:
HEAD: 28be906e09bc69e1b6ea93b5b6aac7e51f91d0d1
HEAD~: 6378b2bd5a61cde2433e92a2ee17f0f7564596da
Change-Id: I471e616d6b7ebcf49e3c69b1f037ca4ee5b37c4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4486660
Reviewed-by: Josh Tsai <josh_tsai@compal.corp-partner.google.com>
Reviewed-by: Logan Liao <logan_liao@compal.corp-partner.google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Tested-by: Logan Liao <logan_liao@compal.corp-partner.google.com>
Commit-Queue: Logan Liao <logan_liao@compal.corp-partner.google.com>
| -rw-r--r-- | include/config.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/config.h b/include/config.h index 1d31fae062..152f0bc126 100644 --- a/include/config.h +++ b/include/config.h @@ -6312,6 +6312,7 @@ #define CONFIG_USBC_OCP #endif +#ifndef CONFIG_ZEPHYR /*****************************************************************************/ /* * Define CONFIG_USB_PD_VBUS_MEASURE_CHARGER if the charger on the board @@ -6322,13 +6323,17 @@ defined(CONFIG_CHARGER_MT6370) || defined(CONFIG_CHARGER_BQ25710) || \ defined(CONFIG_CHARGER_BQ25720) || defined(CONFIG_CHARGER_ISL9241) || \ defined(CONFIG_CHARGER_RAA489110) +#if !defined(CONFIG_USB_PD_VBUS_MEASURE_TCPC) && \ + !defined(CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT) && \ + !defined(CONFIG_USB_PD_VBUS_MEASURE_BY_BOARD) #define CONFIG_USB_PD_VBUS_MEASURE_CHARGER +#endif /* VBUS_MEASURE options */ #ifdef CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT #error CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT defined, but charger can measure -#endif -#endif - +#endif /* VBUS_NOT_PRESENT */ +#endif /* Charger chips */ +#endif /* CONFIG_ZEPHYR */ /*****************************************************************************/ /* * Define CONFIG_USB_PD_VBUS_MEASURE_TCPC if the tcpc on the board supports |