diff options
| author | Sam Hurst <shurst@google.com> | 2020-02-21 09:00:29 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-22 03:14:27 +0000 |
| commit | aebb58b99064567f25b1c407aeb5d193dc4042c3 (patch) | |
| tree | cfd594c639b80659c4831bfe65b525859e9bb1b4 /common/build.mk | |
| parent | a9666e310606cbd1a54d32fa0cb200f16cf1d451 (diff) | |
| download | chrome-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/build.mk')
| -rw-r--r-- | common/build.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/common/build.mk b/common/build.mk index 6f3c8baada..3021bb14c8 100644 --- a/common/build.mk +++ b/common/build.mk @@ -144,15 +144,16 @@ common-$(CONFIG_USB_CONSOLE_STREAM)+=usb_console_stream.o common-$(CONFIG_USB_I2C)+=usb_i2c.o common-$(CONFIG_USB_PORT_POWER_DUMB)+=usb_port_power_dumb.o common-$(CONFIG_USB_PORT_POWER_SMART)+=usb_port_power_smart.o -common-$(CONFIG_USB_POWER_DELIVERY)+=usb_common.o usb_pd_host_cmd.o \ - usb_pd_console_cmd.o -ifeq ($(CONFIG_USB_SM_FRAMEWORK),) +ifneq ($(CONFIG_USB_POWER_DELIVERY),) +common-$(CONFIG_USB_POWER_DELIVERY)+=usb_common.o +ifneq ($(CONFIG_USB_PD_TCPMV1),) common-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_protocol.o usb_pd_policy.o endif -common-$(CONFIG_USB_PD_ALT_MODE_DFP)+=usb_pd_alt_mode_dfp.o -ifneq ($(CONFIG_USB_POWER_DELIVERY),) common-$(CONFIG_USB_PD_DUAL_ROLE)+=usb_pd_dual_role.o +common-$(CONFIG_USB_PD_HOST_CMD)+=usb_pd_host_cmd.o +common-$(CONFIG_USB_PD_CONSOLE_CMD)+=usb_pd_console_cmd.o endif +common-$(CONFIG_USB_PD_ALT_MODE_DFP)+=usb_pd_alt_mode_dfp.o common-$(CONFIG_USB_PD_LOGGING)+=event_log.o pd_log.o common-$(CONFIG_USB_PD_TCPC)+=usb_pd_tcpc.o common-$(CONFIG_USB_UPDATE)+=usb_update.o update_fw.o |