summaryrefslogtreecommitdiff
path: root/common/usb_common.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-12-30 19:47:49 -0700
committerCommit Bot <commit-bot@chromium.org>2021-01-21 23:59:44 +0000
commit2547bf1c0c076e88db58baf5a2ae083d9bfd2eb9 (patch)
tree954a7de7701d2fe8cca9f322ca556ec2a100c21f /common/usb_common.c
parent51dfc5be5bcbe5fc1445f90ce6c4bd3b51040f0e (diff)
downloadchrome-ec-2547bf1c0c076e88db58baf5a2ae083d9bfd2eb9.tar.gz
reland: 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. Typically Zephyr would put const data in the rodata section but that is write-protected with native_posix. So force it into .data instead. BUG=b:175434113 BRANCH=none TEST=make BOARD=volteer build zephyr on volteer 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> Change-Id: I470c9a6b2f905be9f512b0d555f33f0998412975 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2617377
Diffstat (limited to 'common/usb_common.c')
-rw-r--r--common/usb_common.c2
1 files changed, 0 insertions, 2 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)