diff options
| author | Denis Brockus <dbrockus@google.com> | 2020-03-19 13:43:28 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-20 04:39:54 +0000 |
| commit | e662ec76170f9b6b0fb9d2ec5e7e42dedd9dcaee (patch) | |
| tree | 9ab3415cd2c6c1e0fd483e5ac471b59116953410 | |
| parent | 89afb1f3d46ec9060807542cea9e130a0e7302dd (diff) | |
| download | chrome-ec-e662ec76170f9b6b0fb9d2ec5e7e42dedd9dcaee.tar.gz | |
zork: cleanup TCPMvX selection in case of roll back needs
Removed defines that are now on by default as well.
Also turned FRSwap off because it is not currently working.
BUG=none
BRANCH=none
TEST=make buildall
Signed-off-by: Denis Brockus <dbrockus@google.com>
Change-Id: I4f4cb79ef69ce842be398fca1846da721c68c51b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2110543
Tested-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Auto-Submit: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | baseboard/zork/baseboard.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index 43d4b33a3e..be8a2908cd 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -121,15 +121,18 @@ #define CONFIG_USB_PID 0x5040 /* Enable the TCPMv2 PD stack */ -#define CONFIG_USB_PE_SM -#define CONFIG_USB_PRL_SM #define CONFIG_USB_PD_TCPMV2 -#define CONFIG_USB_PD_DECODE_SOP -#define CONFIG_USB_TYPEC_SM -#define CONFIG_USB_TYPEC_DRP_ACC_TRYSRC - /* Enable TCPMv2 Fast Role Swap */ -#define CONFIG_USB_TYPEC_PD_FAST_ROLE_SWAP +#ifndef CONFIG_USB_PD_TCPMV2 + #define CONFIG_USB_PD_TCPMV1 +#else + #define CONFIG_USB_PD_DECODE_SOP + #define CONFIG_USB_TYPEC_DRP_ACC_TRYSRC + + /* Enable TCPMv2 Fast Role Swap */ + /* Turn off until FRSwap is working */ + #undef CONFIG_USB_TYPEC_PD_FAST_ROLE_SWAP +#endif #define CONFIG_CMD_PD_CONTROL #define CONFIG_USB_CHARGER |