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 /common/build.mk | |
| 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 'common/build.mk')
| -rw-r--r-- | common/build.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/common/build.mk b/common/build.mk index 693d3f236c..72288730f3 100644 --- a/common/build.mk +++ b/common/build.mk @@ -47,9 +47,8 @@ common-$(CONFIG_CHARGE_MANAGER)+=charge_manager.o common-$(CONFIG_CHARGE_RAMP_HW)+=charge_ramp.o common-$(CONFIG_CHARGE_RAMP_SW)+=charge_ramp.o charge_ramp_sw.o common-$(CONFIG_CMD_CHARGEN) += chargen.o -common-$(CONFIG_CHARGER)+=charger.o +common-$(CONFIG_CHARGER)+=charger.o charge_state_v2.o common-$(CONFIG_CHARGER_PROFILE_OVERRIDE_COMMON)+=charger_profile_override.o -common-$(CONFIG_CHARGER_V2)+=charge_state_v2.o common-$(CONFIG_CMD_I2CWEDGE)+=i2c_wedge.o common-$(CONFIG_COMMON_GPIO)+=gpio.o gpio_commands.o common-$(CONFIG_IO_EXPANDER)+=ioexpander.o |