diff options
| author | Keith Short <keithshort@chromium.org> | 2020-06-12 09:24:35 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-18 05:54:27 +0000 |
| commit | 9b06d16be703a07c148fff571e1bb37c4a99fd70 (patch) | |
| tree | 65845cac6da90f8b45e137f133a226001739e121 | |
| parent | 3bb7d7b0e62a5845ba137446b4083c32a83240c9 (diff) | |
| download | chrome-ec-9b06d16be703a07c148fff571e1bb37c4a99fd70.tar.gz | |
Volteer: create new board target for TCPMv1
USB4 an Thunderbolt support is not complete in the TCPMv2 stack. Create
a new board project called "volteer_tcpmv1" that can be used to continue
developing USB4 and Thunderbolt support in the BIOS and kernel.
BUG=b:145756626
BRANCH=none
TEST=make buildall
TEST=make BOARD=volteer, confirm image uses TCPMv2 stack
TEST=make BOARD=volteer_tcpmv1, confirm image uses TCPMv1 stack
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I975f9c6af037dc344a0f4e4fb573a9400ca6bb49
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2243317
Reviewed-by: caveh jalali <caveh@chromium.org>
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
| -rw-r--r-- | baseboard/volteer/baseboard.h | 19 | ||||
| -rw-r--r-- | board/volteer/board.h | 8 | ||||
| l--------- | board/volteer_tcpmv1 | 1 |
3 files changed, 20 insertions, 8 deletions
diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index 54554feeb3..d9a01cf1ef 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -133,22 +133,25 @@ /* USB Type C and USB PD defines */ /* Enable the new USB-C PD stack */ -/* TODO: b/145756626 - re-enable once all blocking issues resolved */ -#if 0 +#define CONFIG_USB_PD_DEBUG_LEVEL 1 #define CONFIG_USB_PD_TCPMV2 #define CONFIG_USB_DRP_ACC_TRYSRC -#else +#define CONFIG_USB_PD_REV30 + /* - * PD 3.0 is always enabled by the TCPMv2 stack, so it's only explicitly - * enabled when using the TCPMv1 stack + * TODO(b/158572770): TCPMv2: Conserve flash space + * Add these console commands as flash space permits. */ -#define CONFIG_USB_PD_REV30 -#endif +#undef CONFIG_CMD_HCDEBUG +#undef CONFIG_CMD_ACCELS +#undef CONFIG_CMD_ACCEL_INFO +#undef CONFIG_CMD_ACCELSPOOF +#undef CONFIG_CMD_BATTFAKE +#undef CONFIG_CMD_KEYBOARD #define CONFIG_CMD_TCPC_DUMP #define CONFIG_USB_POWER_DELIVERY -#define CONFIG_USB_PD_TCPMV1 #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_DISCHARGE_PPC diff --git a/board/volteer/board.h b/board/volteer/board.h index f1903cad36..45f8092453 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -11,6 +11,14 @@ /* Baseboard features */ #include "baseboard.h" +#ifdef BOARD_VOLTEER_TCPMV1 +/* Disable TCPMv2 configuration options */ +#undef CONFIG_USB_PD_TCPMV2 + +/* Enable the required TCPMv1 options */ +#define CONFIG_USB_PD_TCPMV1 +#endif + /* Optional features */ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ diff --git a/board/volteer_tcpmv1 b/board/volteer_tcpmv1 new file mode 120000 index 0000000000..f2f3e1d253 --- /dev/null +++ b/board/volteer_tcpmv1 @@ -0,0 +1 @@ +volteer
\ No newline at end of file |