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 /baseboard | |
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 'baseboard')
-rw-r--r-- | baseboard/dragonegg/baseboard.h | 1 | ||||
-rw-r--r-- | baseboard/grunt/baseboard.h | 1 | ||||
-rw-r--r-- | baseboard/hatch/baseboard.h | 1 | ||||
-rw-r--r-- | baseboard/intelrvp/baseboard.h | 1 | ||||
-rw-r--r-- | baseboard/kukui/baseboard.h | 1 | ||||
-rw-r--r-- | baseboard/octopus/baseboard.h | 1 | ||||
-rw-r--r-- | baseboard/zork/baseboard.h | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/baseboard/dragonegg/baseboard.h b/baseboard/dragonegg/baseboard.h index 38e459b2fd..99cd891374 100644 --- a/baseboard/dragonegg/baseboard.h +++ b/baseboard/dragonegg/baseboard.h @@ -59,7 +59,6 @@ #define CONFIG_CHARGER_NARROW_VDC #define CONFIG_CHARGER_SENSE_RESISTOR 10 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 -#define CONFIG_CHARGER_V2 /* Common battery defines */ #define CONFIG_BATTERY_CUT_OFF diff --git a/baseboard/grunt/baseboard.h b/baseboard/grunt/baseboard.h index e2fd994649..65fbf57383 100644 --- a/baseboard/grunt/baseboard.h +++ b/baseboard/grunt/baseboard.h @@ -61,7 +61,6 @@ #define CONFIG_BC12_DETECT_MAX14637 #define CONFIG_CHARGER -#define CONFIG_CHARGER_V2 #define CONFIG_CHARGE_MANAGER #define CONFIG_CHARGER_DISCHARGE_ON_AC diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h index 5fd22261b0..bfffdf45d6 100644 --- a/baseboard/hatch/baseboard.h +++ b/baseboard/hatch/baseboard.h @@ -94,7 +94,6 @@ #define CONFIG_CHARGER_NARROW_VDC #define CONFIG_CHARGER_SENSE_RESISTOR 10 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 -#define CONFIG_CHARGER_V2 /* * Don't allow the system to boot to S0 when the battery is low and unable to * communicate on locked systems (which haven't PD negotiated) diff --git a/baseboard/intelrvp/baseboard.h b/baseboard/intelrvp/baseboard.h index 2180e36a37..648f45412f 100644 --- a/baseboard/intelrvp/baseboard.h +++ b/baseboard/intelrvp/baseboard.h @@ -49,7 +49,6 @@ #define CONFIG_CHARGER_INPUT_CURRENT 512 #define CONFIG_CHARGER_SENSE_RESISTOR 5 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 -#define CONFIG_CHARGER_V2 #undef CONFIG_EXTPOWER_DEBOUNCE_MS #define CONFIG_EXTPOWER_DEBOUNCE_MS 200 #define CONFIG_EXTPOWER_GPIO diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h index d02ca8fc64..345eff86db 100644 --- a/baseboard/kukui/baseboard.h +++ b/baseboard/kukui/baseboard.h @@ -126,7 +126,6 @@ #define CONFIG_CHARGER #define CONFIG_CHARGER_INPUT_CURRENT 512 -#define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 2 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 2 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000 diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index a8e613b0e2..1bce941569 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -135,7 +135,6 @@ #define CONFIG_CHARGE_MANAGER #define CONFIG_CHARGE_RAMP_HW #define CONFIG_CHARGER -#define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_INPUT_CURRENT 512 /* Allow low-current USB charging */ #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 #define CONFIG_CHARGER_SENSE_RESISTOR 10 diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index c7f706c2af..a8cab6ed25 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -69,7 +69,6 @@ #define CONFIG_BC12_DETECT_PI3USB9201 #define CONFIG_CHARGER -#define CONFIG_CHARGER_V2 #define CONFIG_CHARGE_MANAGER #define CONFIG_CHARGER_DISCHARGE_ON_AC #define CONFIG_CHARGER_INPUT_CURRENT 512 |