From aebb58b99064567f25b1c407aeb5d193dc4042c3 Mon Sep 17 00:00:00 2001 From: Sam Hurst Date: Fri, 21 Feb 2020 09:00:29 -0800 Subject: TCPMV1/2: Make the PD Config Flags more consistent The current use of the PD Config Flags are a bit confusing and has been changed to the following: The CONFIG_USB_POWER_DELIVERY flag is used to enable and disable the TCPMv1 and TCPMv2 stacks. And when CONFIG_USB_POWER_DELIVERY is enabled, one of the following must be enabled: CONFIG_USB_PD_TCPMV1 - legacy power delivery state machine CONFIG_USB_PD_TCPMV2 - current power delivery state machine BUG=b:149993808 BRANCH=none TEST=make -j buildall Change-Id: Ie3f8615a75b15b4f1c703f57f3db9e152a471238 Signed-off-by: Sam Hurst Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2068519 Reviewed-by: Diana Z --- board/servo_v4/board.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'board/servo_v4') diff --git a/board/servo_v4/board.h b/board/servo_v4/board.h index c2b08fa885..298ccd28ce 100644 --- a/board/servo_v4/board.h +++ b/board/servo_v4/board.h @@ -78,6 +78,7 @@ #undef CONFIG_HIBERNATE /* Remove console commands / features for flash / RAM savings */ +#undef CONFIG_USB_PD_HOST_CMD #undef CONFIG_CONSOLE_CMDHELP #undef CONFIG_CONSOLE_HISTORY #undef CONFIG_CMD_CRASH @@ -110,6 +111,7 @@ #define CONFIG_CHARGE_MANAGER #undef CONFIG_CHARGE_MANAGER_SAFE_MODE #define CONFIG_USB_POWER_DELIVERY +#define CONFIG_USB_PD_TCPMV1 #define CONFIG_CMD_PD #define CONFIG_USB_PD_CUSTOM_PDO #define CONFIG_USB_PD_DUAL_ROLE -- cgit v1.2.1