diff options
| author | Keith Short <keithshort@chromium.org> | 2019-08-20 11:06:09 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-09-18 03:31:44 +0000 |
| commit | e9b16dbda0f7ec027c30e17905c4a737cdad2e02 (patch) | |
| tree | d62bfe3fad5b377cff9ab30e62d34b8575b28ce5 /board/mchpevb1 | |
| parent | 1af858387ff7ccdd656db77340fc81b3dc7e4453 (diff) | |
| download | chrome-ec-e9b16dbda0f7ec027c30e17905c4a737cdad2e02.tar.gz | |
config: Merge CONFIG_CHARGER_V2 into CONFIG_CHARGER
For all boards that defined CONFIG_CHARGER, CONFIG_CHARGER_V2 is also
defined. Remove references to CONFIG_CHARGER_V2 from board header files.
Replace CONFIG_CHARGER_V2 in common C modules with CONFIG_CHARGER when
appropriate.
BUG=b:139699769
BRANCH=none
TEST=make buildall -j
Change-Id: I6b54baf4ad2406bbed629b6b272dad9ea6a81280
Signed-off-by: Keith Short <keithshort@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1789420
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board/mchpevb1')
| -rw-r--r-- | board/mchpevb1/board.c | 3 | ||||
| -rw-r--r-- | board/mchpevb1/board.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c index 169a059a15..33cb8a48ae 100644 --- a/board/mchpevb1/board.c +++ b/board/mchpevb1/board.c @@ -440,8 +440,7 @@ const struct temp_sensor_t temp_sensors[] = { BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); #else /* mec1701_evb test I2C and EC ADC */ /* - * battery charge_get_battery_temp requires CONFIG_CHARGER_V2 and - * charger task running. + * battery charge_get_battery_temp requires charger task running. * OR can we call into driver/battery/smart.c * int sb_read(int cmd, int *param) * sb_read(SB_TEMPERATURE, &batt_new.temperature) diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h index e229f29ec4..3c43e20862 100644 --- a/board/mchpevb1/board.h +++ b/board/mchpevb1/board.h @@ -150,7 +150,6 @@ /* #define CONFIG_CHARGER */ -/* #define CONFIG_CHARGER_V2 */ /* #define CONFIG_CHARGER_DISCHARGE_ON_AC */ /* #define CONFIG_CHARGER_ISL9237 */ |