diff options
| author | Simon Glass <sjg@chromium.org> | 2020-12-30 19:47:49 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-01-07 23:43:52 +0000 |
| commit | e1224e693a33269866c1d8e1af44b325a7f69a72 (patch) | |
| tree | f00b36509520a3867ebbcb72923c798bec62aeaf /common | |
| parent | 179ddd9fa8bc8a301fbdf39f325f3485a5ae4a80 (diff) | |
| download | chrome-ec-e1224e693a33269866c1d8e1af44b325a7f69a72.tar.gz | |
zephyr: Update hooks shim to match ECOS
At present the hooks declaration in Zephyr doesn't use const but does
use static. This makes it incompatible with ECOS, even if it might be
more strictly correct.
Update the hook to fix this so that we can build the missing USB code.
BUG=b:175434113
BRANCH=none
TEST=make BOARD=volteer
build zephyr on volteer
Change-Id: Ib8decd11aa2adf85bb760965b0794c54854c41c7
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2611895
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/usb_common.c | 2 | ||||
| -rw-r--r-- | common/usbc/usb_tc_drp_acc_trysrc_sm.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/common/usb_common.c b/common/usb_common.c index 05f464cc00..37cd0886bd 100644 --- a/common/usb_common.c +++ b/common/usb_common.c @@ -701,7 +701,6 @@ __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) { @@ -719,7 +718,6 @@ 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 1df7710301..abb4d8d518 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -2223,13 +2223,11 @@ 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 } } |