summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Collyer <scollyer@google.com>2020-07-12 12:16:03 -0700
committerCommit Bot <commit-bot@chromium.org>2021-02-23 20:44:32 +0000
commit1b618f480750dd437c676ae7233162df56ffcffb (patch)
treeb464f357e6779e367955e6df29b6fd04645cd8c8
parent43d31aa5a47f9cb6ef226b347426f8a0639301aa (diff)
downloadchrome-ec-1b618f480750dd437c676ae7233162df56ffcffb.tar.gz
TCPMv2: Fix build issue when usbc is in RW bu not RO image
This CL fixes build issues encountered when usbc is only required to be in RW, but not in the RO image. BUG=b:167462264 BRANCH=None TEST=verfied that can build on quiche when usbc support is only in RW and not in the RO image. Signed-off-by: Scott Collyer <scollyer@google.com> Change-Id: I0704f53a5e0d21a7aa0fcbe32a5ac3efc8eee060 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2293239 Reviewed-by: Abe Levkoy <alevkoy@chromium.org> Reviewed-by: Diana Z <dzigterman@chromium.org> Commit-Queue: Scott Collyer <scollyer@chromium.org> Tested-by: Scott Collyer <scollyer@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2715849 Tested-by: Abe Levkoy <alevkoy@chromium.org> Commit-Queue: Abe Levkoy <alevkoy@chromium.org>
-rw-r--r--common/usbc/build.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/usbc/build.mk b/common/usbc/build.mk
index 00f5d87867..0c38059a9e 100644
--- a/common/usbc/build.mk
+++ b/common/usbc/build.mk
@@ -8,8 +8,8 @@
_usbc_dir:=$(dir $(lastword $(MAKEFILE_LIST)))
ifneq ($(CONFIG_USB_PD_TCPMV2),)
-all-obj-y+=$(_usbc_dir)usb_sm.o
-all-obj-y+=$(_usbc_dir)usbc_task.o
+all-obj-$(CONFIG_USB_PD_TCPMV2)+=$(_usbc_dir)usb_sm.o
+all-obj-$(CONFIG_USB_PD_TCPMV2)+=$(_usbc_dir)usbc_task.o
# Type-C state machines
ifneq ($(CONFIG_USB_TYPEC_SM),)
@@ -20,7 +20,7 @@ endif # CONFIG_USB_TYPEC_SM
# Protocol state machine
ifneq ($(CONFIG_USB_PRL_SM),)
-all-obj-y+=$(_usbc_dir)usb_prl_sm.o
+all-obj-$(CONFIG_USB_PD_TCPMV2)+=$(_usbc_dir)usb_prl_sm.o
endif # CONFIG_USB_PRL_SM
# Policy Engine state machines