diff options
| author | Abe Levkoy <alevkoy@chromium.org> | 2020-02-14 12:47:50 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-11 01:18:33 +0000 |
| commit | f062e3e0e7243ee4c75f7fd0d54a4b4dadad2c21 (patch) | |
| tree | c0d098580cdf4e3e90b9e517504cc19b9a043303 /baseboard/volteer/baseboard.c | |
| parent | 3515ab7ed26fd6b07be2f8154fed3836c3192b96 (diff) | |
| download | chrome-ec-f062e3e0e7243ee4c75f7fd0d54a4b4dadad2c21.tar.gz | |
volteer: Disable Burnside Bridge with TCPMv2
Burnside Bridge support has not yet been ported to TCPMv2. Don't build
Burnside Bridge support with TCPMv2, but allow code that supports the
USB3 daughter board to compile.
BUG=b:145756626
TEST=make buildall
TEST=make BOARD=volteer with TCPMv2 enabled
BRANCH=none
Change-Id: I949cabb26779a48ce3ca3f5f3a97ccdd3f30f58d
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1992485
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'baseboard/volteer/baseboard.c')
| -rw-r--r-- | baseboard/volteer/baseboard.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/baseboard/volteer/baseboard.c b/baseboard/volteer/baseboard.c index 24e08b514b..c217a549d8 100644 --- a/baseboard/volteer/baseboard.c +++ b/baseboard/volteer/baseboard.c @@ -396,12 +396,15 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ +#ifdef CONFIG_USBC_RETIMER_INTEL_BB +/* TODO(b/150301041): Remove #ifdefs when bb_retimer.c works with TCPMv2. */ struct usb_mux usbc1_usb_retimer = { .usb_port = USBC_PORT_C1, .driver = &bb_usb_retimer, .i2c_port = I2C_PORT_USB_1_MIX, .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, }; +#endif struct usb_mux usb_muxes[] = { [USBC_PORT_C0] = { .usb_port = USBC_PORT_C0, @@ -412,7 +415,11 @@ struct usb_mux usb_muxes[] = { .usb_port = USBC_PORT_C1, .driver = &virtual_usb_mux_driver, .hpd_update = &virtual_hpd_update, +#ifdef CONFIG_USBC_RETIMER_INTEL_BB .next_mux = &usbc1_usb_retimer, +#else + .next_mux = NULL, +#endif }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); |