diff options
| author | Simon Glass <sjg@chromium.org> | 2020-12-21 16:15:08 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-23 22:18:30 +0000 |
| commit | 5cdc4a3eb17923b6cb02a2b375af36c8dad0d9e9 (patch) | |
| tree | ecf6242df388b2948e55225a3ddfa83499763a19 | |
| parent | a3113149a50a82c38316d4813b41e5068ad17362 (diff) | |
| download | chrome-ec-5cdc4a3eb17923b6cb02a2b375af36c8dad0d9e9.tar.gz | |
zephyr: Avoid build error with pd_usb_billboard_deferred
For now, omit this from the build, until the error can be resolved.
BUG=b:175434113
BRANCH=none
TEST=build zephyr for volteer
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I36e3b41365a9ea982fd9077f68622c15e6483a98
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2600225
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | common/usb_common.c | 2 | ||||
| -rw-r--r-- | common/usbc/usb_tc_drp_acc_trysrc_sm.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/common/usb_common.c b/common/usb_common.c index ec28e72bf9..5ff8777ff2 100644 --- a/common/usb_common.c +++ b/common/usb_common.c @@ -697,6 +697,7 @@ __overridable bool vboot_allow_usb_pd(void) return false; } +#ifndef CONFIG_ZEPHYR /* TODO(b/176110981) */ /* VDM utility functions */ static void pd_usb_billboard_deferred(void) { @@ -714,6 +715,7 @@ static void pd_usb_billboard_deferred(void) } } DECLARE_DEFERRED(pd_usb_billboard_deferred); +#endif /* CONFIG_ZEPHYR */ #ifdef CONFIG_USB_PD_DISCHARGE static void gpio_discharge_vbus(int port, int enable) diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index e36d64b03b..9460814b31 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -2218,11 +2218,13 @@ static void tc_attach_wait_snk_run(const int port) set_state_tc(port, TC_ATTACHED_SNK); } +#ifndef CONFIG_ZEPHYR /* TODO(b/176110981) */ if (IS_ENABLED(CONFIG_USB_PE_SM) && IS_ENABLED(CONFIG_USB_PD_ALT_MODE_DFP)) { hook_call_deferred(&pd_usb_billboard_deferred_data, PD_T_AME); } +#endif } } |