summaryrefslogtreecommitdiff
path: root/common/usbc/build.mk
diff options
context:
space:
mode:
authorSam Hurst <shurst@google.com>2020-02-21 09:00:29 -0800
committerCommit Bot <commit-bot@chromium.org>2020-02-22 03:14:27 +0000
commitaebb58b99064567f25b1c407aeb5d193dc4042c3 (patch)
treecfd594c639b80659c4831bfe65b525859e9bb1b4 /common/usbc/build.mk
parenta9666e310606cbd1a54d32fa0cb200f16cf1d451 (diff)
downloadchrome-ec-aebb58b99064567f25b1c407aeb5d193dc4042c3.tar.gz
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 <shurst@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2068519 Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'common/usbc/build.mk')
-rw-r--r--common/usbc/build.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/usbc/build.mk b/common/usbc/build.mk
index 69e540ed67..781c6a9d10 100644
--- a/common/usbc/build.mk
+++ b/common/usbc/build.mk
@@ -7,8 +7,8 @@
# Note that this variable includes the trailing "/"
_usbc_dir:=$(dir $(lastword $(MAKEFILE_LIST)))
-ifneq ($(CONFIG_USB_SM_FRAMEWORK),)
-all-obj-$(CONFIG_USB_SM_FRAMEWORK)+=$(_usbc_dir)usb_sm.o
+ifneq ($(CONFIG_USB_PD_TCPMV2),)
+all-obj-$(CONFIG_USB_PD_TCPMV2)+=$(_usbc_dir)usb_sm.o
all-obj-$(CONFIG_USB_TYPEC_SM)+=$(_usbc_dir)usbc_task.o
all-obj-$(CONFIG_USB_PRL_SM)+=$(_usbc_dir)usb_prl_sm.o
ifneq ($(CONFIG_USB_PE_SM),)