From e9b16dbda0f7ec027c30e17905c4a737cdad2e02 Mon Sep 17 00:00:00 2001 From: Keith Short Date: Tue, 20 Aug 2019 11:06:09 -0600 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1789420 Reviewed-by: Daisuke Nojiri --- test/test_config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'test') 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 -- cgit v1.2.1