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>

39 files changed, 4 insertions, 48 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
diff --git a/board/atlas/board.h b/board/atlas/board.h
index c84dd18012..ae81f713b4 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -76,7 +76,6 @@
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/chell/board.h b/board/chell/board.h
index aaf89ee8f3..5686d0aa28 100644
--- a/board/chell/board.h
+++ b/board/chell/board.h
@@ -25,7 +25,6 @@
 #define CONFIG_CHARGE_RAMP_HW
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_ISL9237
diff --git a/board/cheza/board.h b/board/cheza/board.h
index b7c4131529..e7e524c06a 100644
--- a/board/cheza/board.h
+++ b/board/cheza/board.h
@@ -77,7 +77,6 @@
 
 /* Charger */
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGE_RAMP_HW
diff --git a/board/coral/board.h b/board/coral/board.h
index 29afbd44ce..4bb007ea5e 100644
--- a/board/coral/board.h
+++ b/board/coral/board.h
@@ -55,7 +55,6 @@
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGE_STATE_DEBUG
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/elm/board.h b/board/elm/board.h
index 9312782599..555447f06b 100644
--- a/board/elm/board.h
+++ b/board/elm/board.h
@@ -41,7 +41,6 @@
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHIPSET_MT817X
 #define CONFIG_CMD_TYPEC
 #define CONFIG_EXTPOWER_GPIO
diff --git a/board/eve/board.h b/board/eve/board.h
index ac4e80ce04..b21abb7331 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -87,7 +87,6 @@
 #define CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/flapjack/board.h b/board/flapjack/board.h
index 353f3a62b3..9d75d49012 100644
--- a/board/flapjack/board.h
+++ b/board/flapjack/board.h
@@ -69,7 +69,6 @@
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_MT6370
 #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/board/glados/board.h b/board/glados/board.h
index 719a871abd..040e01cc26 100644
--- a/board/glados/board.h
+++ b/board/glados/board.h
@@ -27,7 +27,6 @@
 #define CONFIG_CHARGE_RAMP_HW
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_ISL9237
diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h
index 072826870b..7ef92652f6 100644
--- a/board/glkrvp/board.h
+++ b/board/glkrvp/board.h
@@ -42,7 +42,6 @@
 #define CONFIG_CHARGER_PROFILE_VOLTAGE_RANGES 3
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10
-#define CONFIG_CHARGER_V2
 #undef  CONFIG_EXTPOWER_DEBOUNCE_MS
 #define CONFIG_EXTPOWER_DEBOUNCE_MS 1000
 #define CONFIG_EXTPOWER_GPIO
diff --git a/board/glkrvp_ite/board.h b/board/glkrvp_ite/board.h
index 8b6f7149ad..d76e582262 100644
--- a/board/glkrvp_ite/board.h
+++ b/board/glkrvp_ite/board.h
@@ -42,7 +42,6 @@
 #define CONFIG_CHARGER_PROFILE_VOLTAGE_RANGES 3
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #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/board/hammer/board.h b/board/hammer/board.h
index 77824c1057..88627bd15a 100644
--- a/board/hammer/board.h
+++ b/board/hammer/board.h
@@ -256,7 +256,6 @@
 #ifdef BOARD_WAND
 /* Battery and charger options. */
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_INPUT_CURRENT 128
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
diff --git a/board/jerry/board.h b/board/jerry/board.h
index a7d05165ff..89a141728c 100644
--- a/board/jerry/board.h
+++ b/board/jerry/board.h
@@ -20,7 +20,6 @@
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24715
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHIPSET_RK3288
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_FORCE_CONSOLE_RESUME
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 */
diff --git a/board/nami/board.h b/board/nami/board.h
index cfcc6b3d2e..1ca6a54031 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -96,7 +96,6 @@
 #define CONFIG_CHARGE_RAMP_HW /* This, or just RAMP? */
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/nautilus/board.h b/board/nautilus/board.h
index 59f2b395ac..727c1b1fbb 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -77,7 +77,6 @@
 #define CONFIG_CHARGE_RAMP_HW /* This, or just RAMP? */
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/nocturne/board.h b/board/nocturne/board.h
index f969a5f03d..24768bf7c4 100644
--- a/board/nocturne/board.h
+++ b/board/nocturne/board.h
@@ -73,7 +73,6 @@
 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
-#define CONFIG_CHARGER_V2
 #define CONFIG_EXTPOWER_GPIO
 
 /* LEDs */
diff --git a/board/oak/board.h b/board/oak/board.h
index 14f8e5788f..b2e07c8107 100644
--- a/board/oak/board.h
+++ b/board/oak/board.h
@@ -51,7 +51,6 @@
 #endif /* BOARD_REV */
 
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHIPSET_MT817X
 #define CONFIG_CMD_TYPEC
 #define CONFIG_EXTPOWER_GPIO
diff --git a/board/poppy/board.h b/board/poppy/board.h
index 104c77962a..a98b84d48e 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -87,7 +87,6 @@
 #define CONFIG_CHARGE_RAMP_HW /* This, or just RAMP? */
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/rammus/board.h b/board/rammus/board.h
index 1a8944e1ef..330df91140 100644
--- a/board/rammus/board.h
+++ b/board/rammus/board.h
@@ -73,7 +73,6 @@
 #define CONFIG_CHARGE_RAMP_HW /* This, or just RAMP? */
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/reef/board.h b/board/reef/board.h
index 72f2818a23..a4d6e22593 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -48,7 +48,6 @@
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h
index a34392173c..16038bddfa 100644
--- a/board/reef_it8320/board.h
+++ b/board/reef_it8320/board.h
@@ -38,7 +38,6 @@
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h
index 348375e8da..a427abad0d 100644
--- a/board/reef_mchp/board.h
+++ b/board/reef_mchp/board.h
@@ -48,7 +48,6 @@
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/samus/board.h b/board/samus/board.h
index 03a94bd893..f4bc5f6663 100644
--- a/board/samus/board.h
+++ b/board/samus/board.h
@@ -47,7 +47,6 @@
 #define CONFIG_BATTERY_SMART
 #define CONFIG_BATTERY_REVIVE_DISCONNECT
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BQ24773
 #define CONFIG_CHARGER_ILIM_PIN_DISABLED
 #define CONFIG_CHARGER_SENSE_RESISTOR 5
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index 901514f29f..2569f41e14 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -69,7 +69,6 @@
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_RT9467
 #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/board/strago/board.h b/board/strago/board.h
index 68e39d4a3d..db6adcea63 100644
--- a/board/strago/board.h
+++ b/board/strago/board.h
@@ -69,7 +69,6 @@
 #define CONFIG_BATTERY_CUT_OFF
 #define CONFIG_BATTERY_SMART
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BQ24770
 #define CONFIG_CHARGER_ILIM_PIN_DISABLED
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
diff --git a/common/battery.c b/common/battery.c
index 7f00e186ec..3f858f6f27 100644
--- a/common/battery.c
+++ b/common/battery.c
@@ -206,7 +206,7 @@ static void print_battery_info(void)
 		ccprintf("%d mAh (%d mAh with %d %% compensation)\n",
 			 value, value*batt_full_factor/100, batt_full_factor);
 
-#ifdef CONFIG_CHARGER_V2
+#ifdef CONFIG_CHARGER
 	print_item_name("Display:");
 	value = charge_get_display_charge();
 	ccprintf("%d.%d %%\n", value / 10, value % 10);
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
diff --git a/common/charger.c b/common/charger.c
index 2f3079d1b6..87d2f8e0ce 100644
--- a/common/charger.c
+++ b/common/charger.c
@@ -188,17 +188,13 @@ static int command_charger(int argc, char **argv)
 		d = strtoi(argv[2], &e, 0);
 		if (*e)
 			return EC_ERROR_PARAM2;
-#ifdef CONFIG_CHARGER_V2
 		chgstate_set_manual_current(d);
-#endif /* CONFIG_CHARGER_V2 */
 		return charger_set_current(d);
 	} else if (strcasecmp(argv[1], "voltage") == 0) {
 		d = strtoi(argv[2], &e, 0);
 		if (*e)
 			return EC_ERROR_PARAM2;
-#ifdef CONFIG_CHARGER_V2
 		chgstate_set_manual_voltage(d);
-#endif /* CONFIG_CHARGER_V2 */
 		return charger_set_voltage(d);
 	} else if (strcasecmp(argv[1], "dptf") == 0) {
 		d = strtoi(argv[2], &e, 0);
diff --git a/include/charge_state.h b/include/charge_state.h
index 4a152032fc..2f6ffa3771 100644
--- a/include/charge_state.h
+++ b/include/charge_state.h
@@ -146,8 +146,6 @@ const struct batt_params *charger_current_battery_params(void);
 
 
 /* Config Charger */
-#ifdef CONFIG_CHARGER_V2
 #include "charge_state_v2.h"
-#endif	/* CONFIG_CHARGER_V2 */
 
 #endif	/* __CROS_EC_CHARGE_STATE_H */
diff --git a/include/config.h b/include/config.h
index da735d3add..5b3d99d37b 100644
--- a/include/config.h
+++ b/include/config.h
@@ -747,9 +747,8 @@
 /*****************************************************************************/
 /* Charger config */
 
-/* Compile common charge state code. You must pick an implementation. */
+/* Compile common charge state code. */
 #undef CONFIG_CHARGER
-#undef CONFIG_CHARGER_V2
 
 /* Compile charger-specific code for these chargers (pick at most one) */
 #undef CONFIG_CHARGER_BD9995X
@@ -993,8 +992,6 @@
 /*
  * Charger should call battery_override_params() to limit/correct the voltage
  * and current requested by the battery pack before acting on the request.
- *
- * This is valid with CONFIG_CHARGER_V2 only.
  */
 #undef CONFIG_CHARGER_PROFILE_OVERRIDE
 
diff --git a/test/test_config.h b/test/test_config.h
index de3753a71c..b83d834056 100644
--- a/test/test_config.h
+++ b/test/test_config.h
@@ -174,7 +174,6 @@ enum sensor_id {
 #define CONFIG_BATTERY_MOCK
 #define CONFIG_BATTERY_SMART
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_PROFILE_OVERRIDE
 #define CONFIG_CHARGER_INPUT_CURRENT 4032
 #define CONFIG_CHARGER_DISCHARGE_ON_AC