summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorSam Hurst <shurst@google.com>2020-02-21 09:00:29 -0800
committerCommit Bot <commit-bot@chromium.org>2020-02-22 03:14:27 +0000
commitaebb58b99064567f25b1c407aeb5d193dc4042c3 (patch)
treecfd594c639b80659c4831bfe65b525859e9bb1b4 /board
parenta9666e310606cbd1a54d32fa0cb200f16cf1d451 (diff)
downloadchrome-ec-aebb58b99064567f25b1c407aeb5d193dc4042c3.tar.gz
TCPMV1/2: Make the PD Config Flags more consistent
The current use of the PD Config Flags are a bit confusing and has been changed to the following: The CONFIG_USB_POWER_DELIVERY flag is used to enable and disable the TCPMv1 and TCPMv2 stacks. And when CONFIG_USB_POWER_DELIVERY is enabled, one of the following must be enabled: CONFIG_USB_PD_TCPMV1 - legacy power delivery state machine CONFIG_USB_PD_TCPMV2 - current power delivery state machine BUG=b:149993808 BRANCH=none TEST=make -j buildall Change-Id: Ie3f8615a75b15b4f1c703f57f3db9e152a471238 Signed-off-by: Sam Hurst <shurst@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2068519 Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/atlas/board.h1
-rw-r--r--board/chell/board.h1
-rw-r--r--board/cheza/board.h1
-rw-r--r--board/chocodile_vpdmcu/board.h10
-rw-r--r--board/coffeecake/board.h1
-rw-r--r--board/coral/board.h1
-rw-r--r--board/dingdong/board.h1
-rw-r--r--board/elm/board.h1
-rw-r--r--board/eve/board.h1
-rw-r--r--board/fizz/board.h1
-rw-r--r--board/flapjack/board.h1
-rw-r--r--board/glados/board.h1
-rw-r--r--board/glkrvp/board.h1
-rw-r--r--board/glkrvp_ite/board.h1
-rw-r--r--board/hoho/board.h1
-rw-r--r--board/it83xx_evb/board.h1
-rw-r--r--board/mchpevb1/board.h1
-rw-r--r--board/nami/board.h1
-rw-r--r--board/nautilus/board.h1
-rw-r--r--board/nocturne/board.h1
-rw-r--r--board/oak/board.h1
-rw-r--r--board/pdeval-stm32f072/board.h1
-rw-r--r--board/plankton/board.h1
-rw-r--r--board/poppy/board.h1
-rw-r--r--board/puff/board.h3
-rw-r--r--board/rainier/board.h1
-rw-r--r--board/rammus/board.h1
-rw-r--r--board/reef/board.h1
-rw-r--r--board/reef_it8320/board.h1
-rw-r--r--board/reef_mchp/board.h1
-rw-r--r--board/samus_pd/board.h1
-rw-r--r--board/scarlet/board.h1
-rw-r--r--board/servo_v4/board.h2
-rw-r--r--board/strago/board.h1
-rw-r--r--board/trogdor/board.h1
-rw-r--r--board/twinkie/board.h1
-rw-r--r--board/waddledee/board.h2
-rw-r--r--board/zinger/board.h1
38 files changed, 48 insertions, 3 deletions
diff --git a/board/atlas/board.h b/board/atlas/board.h
index b7c64b96da..00600ec755 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -143,6 +143,7 @@
#define CONFIG_USB_PD_TRY_SRC_MIN_BATT_SOC 2
#define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USBC_SS_MUX
#define CONFIG_USBC_SS_MUX_DFP_ONLY /* FIXME: b/77151299 */
#define CONFIG_USBC_VCONN
diff --git a/board/chell/board.h b/board/chell/board.h
index 7e4a7aa4d7..f1a0355196 100644
--- a/board/chell/board.h
+++ b/board/chell/board.h
@@ -70,6 +70,7 @@
#define CONFIG_USB_CHARGER
#define CONFIG_USB_MUX_PS8740
#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_COMM_LOCKED
diff --git a/board/cheza/board.h b/board/cheza/board.h
index 76e64277b5..820b4bf417 100644
--- a/board/cheza/board.h
+++ b/board/cheza/board.h
@@ -98,6 +98,7 @@
/* USB */
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_CMD_PD_CONTROL
#define CONFIG_USB_PD_ALT_MODE
#define CONFIG_USB_PD_ALT_MODE_DFP
diff --git a/board/chocodile_vpdmcu/board.h b/board/chocodile_vpdmcu/board.h
index 0ddf3374c0..d79e8ac20f 100644
--- a/board/chocodile_vpdmcu/board.h
+++ b/board/chocodile_vpdmcu/board.h
@@ -38,6 +38,8 @@
#define CONFIG_UART_CONSOLE 1
/* Optional features */
+#undef CONFIG_USB_PD_CONSOLE_CMD
+#undef CONFIG_USB_PD_HOST_CMD
#define CONFIG_ADC
#undef CONFIG_ADC_WATCHDOG
#define CONFIG_ADC_SAMPLE_TIME STM32_ADC_SMPR_41_5_CY
@@ -61,8 +63,10 @@
#define CONFIG_USB_PD_TCPC
#define CONFIG_USB_PD_VBUS_DETECT_NONE
#define CONFIG_USB_PD_TCPM_STUB
-#define CONFIG_USB_SM_FRAMEWORK
+#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV2
#define CONFIG_USB_TYPEC_CTVPD
+#define CONFIG_USB_PD_DECODE_SOP
#define CONFIG_USB_PD_DUAL_ROLE
#define CONFIG_USB_PD_INTERNAL_COMP
#define CONFIG_VBOOT_HASH
@@ -82,6 +86,10 @@
/* GND impedance in milliohms */
#define VPD_GND_IMPEDANCE 33
+#define PD_OPERATING_POWER_MW 15000
+#define PD_MAX_POWER_MW 45000
+#define PD_MAX_CURRENT_MA 3000
+#define PD_MAX_VOLTAGE_MV 20000
/*
* TODO(crosbug.com/p/50519): Remove CONFIG_SYSTEM_UNLOCKED prior to building
* MP FW.
diff --git a/board/coffeecake/board.h b/board/coffeecake/board.h
index 26f8de88c6..8ab4e381f2 100644
--- a/board/coffeecake/board.h
+++ b/board/coffeecake/board.h
@@ -38,6 +38,7 @@
#define CONFIG_USB_BOS
#define CONFIG_USB_INHIBIT_CONNECT
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USB_PD_ALT_MODE
#define CONFIG_USB_PD_HW_DEV_ID_BOARD_MAJOR USB_PD_HW_DEV_ID_HOHO
#define CONFIG_USB_PD_HW_DEV_ID_BOARD_MINOR 2
diff --git a/board/coral/board.h b/board/coral/board.h
index df380f22b9..257e8e46c6 100644
--- a/board/coral/board.h
+++ b/board/coral/board.h
@@ -94,6 +94,7 @@
#define CONFIG_USB_PD_TCPM_TCPCI
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USB_PD_COMM_LOCKED
#define CONFIG_USBC_SS_MUX
diff --git a/board/dingdong/board.h b/board/dingdong/board.h
index 51fa51dcd2..27f4b0af50 100644
--- a/board/dingdong/board.h
+++ b/board/dingdong/board.h
@@ -27,6 +27,7 @@
#define CONFIG_USB_BOS
#define CONFIG_USB_INHIBIT_CONNECT
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USB_PD_ALT_MODE
#define CONFIG_USB_PD_CUSTOM_PDO
#define CONFIG_USB_PD_HW_DEV_ID_BOARD_MAJOR USB_PD_HW_DEV_ID_DINGDONG
diff --git a/board/elm/board.h b/board/elm/board.h
index e9269b0775..8859ff5594 100644
--- a/board/elm/board.h
+++ b/board/elm/board.h
@@ -86,6 +86,7 @@
#define CONFIG_USBC_VCONN
#define CONFIG_USBC_VCONN_SWAP
#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_DUAL_ROLE
diff --git a/board/eve/board.h b/board/eve/board.h
index 3bf3dedf50..1df410d6ef 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -173,6 +173,7 @@
#undef CONFIG_USB_PD_TRY_SRC_MIN_BATT_SOC
#define CONFIG_USB_PD_TRY_SRC_MIN_BATT_SOC 2
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USBC_SS_MUX
#define CONFIG_USBC_VCONN
#define CONFIG_USBC_VCONN_SWAP
diff --git a/board/fizz/board.h b/board/fizz/board.h
index 6c3dade457..81a1da111f 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -109,6 +109,7 @@
#define CONFIG_USB_PD_TCPM_PS8751
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USBC_SS_MUX
#define CONFIG_USBC_SS_MUX_DFP_ONLY
#define CONFIG_USBC_VCONN
diff --git a/board/flapjack/board.h b/board/flapjack/board.h
index 26d299f1b9..370bd1727f 100644
--- a/board/flapjack/board.h
+++ b/board/flapjack/board.h
@@ -135,6 +135,7 @@
/* USB PD config */
#define CONFIG_CHARGE_MANAGER
#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_TCPC
diff --git a/board/glados/board.h b/board/glados/board.h
index ed4939b692..9a5f407710 100644
--- a/board/glados/board.h
+++ b/board/glados/board.h
@@ -69,6 +69,7 @@
#define CONFIG_USB_MUX_PI3USB30532
#define CONFIG_USB_MUX_PS8740
#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_DP_HPD_GPIO
diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h
index fd8963d8be..138aa478bf 100644
--- a/board/glkrvp/board.h
+++ b/board/glkrvp/board.h
@@ -68,6 +68,7 @@
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_PD_VBUS_DETECT_TCPC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
/* USB MUX */
#define CONFIG_USBC_SS_MUX
diff --git a/board/glkrvp_ite/board.h b/board/glkrvp_ite/board.h
index f761625136..b131ac42c4 100644
--- a/board/glkrvp_ite/board.h
+++ b/board/glkrvp_ite/board.h
@@ -68,6 +68,7 @@
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_PD_VBUS_DETECT_TCPC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
/* USB MUX */
#define CONFIG_USBC_SS_MUX
diff --git a/board/hoho/board.h b/board/hoho/board.h
index 2698d0f346..8eead97ae5 100644
--- a/board/hoho/board.h
+++ b/board/hoho/board.h
@@ -33,6 +33,7 @@
#define CONFIG_USB_BOS
#define CONFIG_USB_INHIBIT_CONNECT
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USB_PD_ALT_MODE
#define CONFIG_USB_PD_CUSTOM_PDO
#define CONFIG_USB_PD_HW_DEV_ID_BOARD_MAJOR USB_PD_HW_DEV_ID_HOHO
diff --git a/board/it83xx_evb/board.h b/board/it83xx_evb/board.h
index 591cb469c4..54c66d9b7a 100644
--- a/board/it83xx_evb/board.h
+++ b/board/it83xx_evb/board.h
@@ -47,6 +47,7 @@
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_PD_VBUS_DETECT_GPIO
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USBC_VCONN
#define CONFIG_USBC_VCONN_SWAP
#endif
diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h
index d93b31cb82..e46a1dced4 100644
--- a/board/mchpevb1/board.h
+++ b/board/mchpevb1/board.h
@@ -231,6 +231,7 @@
#define CONFIG_USB_MUX_PI3USB30532
#define CONFIG_USB_MUX_PS8740
#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_DP_HPD_GPIO
diff --git a/board/nami/board.h b/board/nami/board.h
index 2a7cfa9a70..35ae889789 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -182,6 +182,7 @@
#define CONFIG_USB_PD_TCPM_PS8751
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USBC_SS_MUX
#define CONFIG_USBC_VCONN
#define CONFIG_USBC_VCONN_SWAP
diff --git a/board/nautilus/board.h b/board/nautilus/board.h
index 58ddc2d8ac..1ea9c12f19 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -153,6 +153,7 @@
#define CONFIG_USB_PD_TCPM_PS8751
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USBC_SS_MUX
#define CONFIG_USBC_SS_MUX_DFP_ONLY
#define CONFIG_USBC_VCONN
diff --git a/board/nocturne/board.h b/board/nocturne/board.h
index c71aab3f6e..82d511ed01 100644
--- a/board/nocturne/board.h
+++ b/board/nocturne/board.h
@@ -141,6 +141,7 @@
#define CONFIG_USB_PD_VBUS_DETECT_TCPC
#define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USBC_PPC_SN5S330
#define CONFIG_USBC_SS_MUX
#define CONFIG_USBC_SS_MUX_DFP_ONLY
diff --git a/board/oak/board.h b/board/oak/board.h
index 8390f44fab..d959763853 100644
--- a/board/oak/board.h
+++ b/board/oak/board.h
@@ -93,6 +93,7 @@
#define CONFIG_USBC_VCONN
#define CONFIG_USBC_VCONN_SWAP
#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_DUAL_ROLE
diff --git a/board/pdeval-stm32f072/board.h b/board/pdeval-stm32f072/board.h
index 02d6a541ed..6da1c7c1f0 100644
--- a/board/pdeval-stm32f072/board.h
+++ b/board/pdeval-stm32f072/board.h
@@ -22,6 +22,7 @@
#define CONFIG_STM_HWTIMER32
/* USB Power Delivery configuration */
#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_CUSTOM_PDO
diff --git a/board/plankton/board.h b/board/plankton/board.h
index a23e861293..5e2f5f28a0 100644
--- a/board/plankton/board.h
+++ b/board/plankton/board.h
@@ -18,6 +18,7 @@
/* Optional features */
#define CONFIG_STM_HWTIMER32
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USB_PD_ALT_MODE
#define CONFIG_USB_PD_COMM_DISABLED
#define CONFIG_USB_PD_CUSTOM_PDO
diff --git a/board/poppy/board.h b/board/poppy/board.h
index 8c9d687665..e1f839b65b 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -164,6 +164,7 @@
#define CONFIG_USB_PD_TCPM_PS8751
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USBC_SS_MUX
#define CONFIG_USBC_VCONN
#define CONFIG_USBC_VCONN_SWAP
diff --git a/board/puff/board.h b/board/puff/board.h
index bfbdba8f8a..728a8c1d2c 100644
--- a/board/puff/board.h
+++ b/board/puff/board.h
@@ -165,7 +165,8 @@
#undef CONFIG_CHARGE_MANAGER_SAFE_MODE
/* USB type C */
-#define CONFIG_USB_SM_FRAMEWORK /* Use TCPMv2 */
+#define CONFIG_USB_PD_TCPMV2 /* Use TCPMv2 */
+#define CONFIG_USB_PD_DECODE_SOP
#undef CONFIG_USB_CHARGER
#define CONFIG_USB_POWER_DELIVERY
#define CONFIG_USB_PID 0x5040
diff --git a/board/rainier/board.h b/board/rainier/board.h
index da673c22ec..7ff319e0ea 100644
--- a/board/rainier/board.h
+++ b/board/rainier/board.h
@@ -90,6 +90,7 @@
/* USB PD config */
#define CONFIG_CHARGE_MANAGER
#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_GPIO
diff --git a/board/rammus/board.h b/board/rammus/board.h
index ed2489a84f..738db9c73c 100644
--- a/board/rammus/board.h
+++ b/board/rammus/board.h
@@ -159,6 +159,7 @@
#define CONFIG_USB_PD_TCPM_PS8751
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USBC_SS_MUX
#define CONFIG_USBC_SS_MUX_DFP_ONLY
#define CONFIG_USBC_VCONN
diff --git a/board/reef/board.h b/board/reef/board.h
index 4d6a65ffcc..7e782646ed 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -92,6 +92,7 @@
#define CONFIG_USB_PD_TCPM_TCPCI
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USB_PD_COMM_LOCKED
#define CONFIG_USBC_SS_MUX
diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h
index 46a6c76927..3df468bd60 100644
--- a/board/reef_it8320/board.h
+++ b/board/reef_it8320/board.h
@@ -78,6 +78,7 @@
#define CONFIG_USB_PD_TCPM_TCPCI
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USB_PD_COMM_LOCKED
#define CONFIG_USBC_SS_MUX
diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h
index acaf8d19be..32f826453d 100644
--- a/board/reef_mchp/board.h
+++ b/board/reef_mchp/board.h
@@ -92,6 +92,7 @@
#define CONFIG_USB_PD_TCPM_TCPCI
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USB_PD_COMM_LOCKED
#define CONFIG_USBC_SS_MUX
diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h
index c6374a3e36..3466d69a34 100644
--- a/board/samus_pd/board.h
+++ b/board/samus_pd/board.h
@@ -55,6 +55,7 @@
#undef CONFIG_TASK_PROFILING
#define CONFIG_USB_CHARGER
#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_CHECK_MAX_REQUEST_ALLOWED
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index adcca92cdb..7e48ffde52 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -108,6 +108,7 @@
/* USB PD config */
#define CONFIG_CHARGE_MANAGER
#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_GPIO
diff --git a/board/servo_v4/board.h b/board/servo_v4/board.h
index c2b08fa885..298ccd28ce 100644
--- a/board/servo_v4/board.h
+++ b/board/servo_v4/board.h
@@ -78,6 +78,7 @@
#undef CONFIG_HIBERNATE
/* Remove console commands / features for flash / RAM savings */
+#undef CONFIG_USB_PD_HOST_CMD
#undef CONFIG_CONSOLE_CMDHELP
#undef CONFIG_CONSOLE_HISTORY
#undef CONFIG_CMD_CRASH
@@ -110,6 +111,7 @@
#define CONFIG_CHARGE_MANAGER
#undef CONFIG_CHARGE_MANAGER_SAFE_MODE
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_CMD_PD
#define CONFIG_USB_PD_CUSTOM_PDO
#define CONFIG_USB_PD_DUAL_ROLE
diff --git a/board/strago/board.h b/board/strago/board.h
index 5a68c49c52..2f0ca54814 100644
--- a/board/strago/board.h
+++ b/board/strago/board.h
@@ -37,6 +37,7 @@
#define CONFIG_USB_CHARGER
#define CONFIG_USB_MUX_PI3USB30532
#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_DP_HPD_GPIO
diff --git a/board/trogdor/board.h b/board/trogdor/board.h
index 6a63498ddb..18cf433ace 100644
--- a/board/trogdor/board.h
+++ b/board/trogdor/board.h
@@ -95,6 +95,7 @@
/* USB */
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_CMD_PD_CONTROL
#define CONFIG_USB_PD_ALT_MODE
#define CONFIG_USB_PD_ALT_MODE_DFP
diff --git a/board/twinkie/board.h b/board/twinkie/board.h
index 1467871f34..24b5b996bf 100644
--- a/board/twinkie/board.h
+++ b/board/twinkie/board.h
@@ -21,6 +21,7 @@
#define CONFIG_WEBUSB_URL "storage.googleapis.com/webtwinkie.org/tool.html"
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USB_PD_CUSTOM_PDO
#define CONFIG_USB_PD_DUAL_ROLE
#define CONFIG_USB_PD_INTERNAL_COMP
diff --git a/board/waddledee/board.h b/board/waddledee/board.h
index 7e2fa7c0bd..a2fe3ead84 100644
--- a/board/waddledee/board.h
+++ b/board/waddledee/board.h
@@ -46,7 +46,7 @@
#undef CONFIG_USB_PD_DECODE_SOP
#undef CONFIG_USB_PID
#undef CONFIG_USB_POWER_DELIVERY
-#undef CONFIG_USB_SM_FRAMEWORK
+#undef CONFIG_USB_PD_TCPMV2
#undef CONFIG_USB_TYPEC_DRP_ACC_TRYSRC
/* System unlocked in early development */
diff --git a/board/zinger/board.h b/board/zinger/board.h
index f79faca03f..30abce115a 100644
--- a/board/zinger/board.h
+++ b/board/zinger/board.h
@@ -53,6 +53,7 @@
#define CONFIG_SHA256
#undef CONFIG_TASK_PROFILING
#define CONFIG_USB_POWER_DELIVERY
+#define CONFIG_USB_PD_TCPMV1
#define CONFIG_USB_PD_ALT_MODE
#define CONFIG_USB_PD_CUSTOM_PDO
#undef CONFIG_USB_PD_DUAL_ROLE