summaryrefslogtreecommitdiff
path: root/test/test_config.h
diff options
context:
space:
mode:
authorJett Rink <jettrink@chromium.org>2020-03-24 16:31:59 -0600
committerCommit Bot <commit-bot@chromium.org>2020-03-27 22:12:44 +0000
commitcb893a4257bbb2ebc40940b6a557daa2102ec6fe (patch)
treee485d46265ca231633a26bcc1cacd9daa064cb58 /test/test_config.h
parent90d47e5e3b7a957095b87330359592e19b174297 (diff)
downloadchrome-ec-cb893a4257bbb2ebc40940b6a557daa2102ec6fe.tar.gz
config: update TCPMv2 config options
Reorganize how the TCPMv2 options are used - Update documentation in config.h and bring TCPMv2 items close together - Make the layer defines consistent on how they include compilation units - Update tests to account for how files are included now - Remove unnecessary defines in board.h since they are default on BRANCH=none BUG=none TEST=builds Change-Id: I91fca51648912deef44db23492ecc7775b2e3062 Signed-off-by: Jett Rink <jettrink@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2120063 Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'test/test_config.h')
-rw-r--r--test/test_config.h35
1 files changed, 5 insertions, 30 deletions
diff --git a/test/test_config.h b/test/test_config.h
index 1461d52874..eafc524180 100644
--- a/test/test_config.h
+++ b/test/test_config.h
@@ -304,36 +304,11 @@ int ncp15wb_calculate_temp(uint16_t adc);
#define CONFIG_SW_CRC
#endif
-#if defined(TEST_USB_SM_FRAMEWORK_H3)
-#define CONFIG_USB_PD_PORT_MAX_COUNT 1
-#undef CONFIG_USB_PRL_SM
-#undef CONFIG_USB_PE_SM
-#undef CONFIG_USB_TYPEC_SM
-#define CONFIG_USB_PD_TCPMV2
-#endif
-
-#if defined(TEST_USB_SM_FRAMEWORK_H2)
-#define CONFIG_USB_PD_PORT_MAX_COUNT 1
-#undef CONFIG_USB_PRL_SM
-#undef CONFIG_USB_PE_SM
-#undef CONFIG_USB_TYPEC_SM
-#define CONFIG_USB_PD_TCPMV2
-#endif
-
-#if defined(TEST_USB_SM_FRAMEWORK_H1)
-#define CONFIG_USB_PD_PORT_MAX_COUNT 1
-#undef CONFIG_USB_PRL_SM
-#undef CONFIG_USB_PE_SM
-#undef CONFIG_USB_TYPEC_SM
-#define CONFIG_USB_PD_TCPMV2
-#endif
-
-#if defined(TEST_USB_SM_FRAMEWORK_H0)
-#define CONFIG_USB_PD_PORT_MAX_COUNT 1
-#undef CONFIG_USB_PRL_SM
-#undef CONFIG_USB_PE_SM
-#undef CONFIG_USB_TYPEC_SM
-#define CONFIG_USB_PD_TCPMV2
+#if defined(TEST_USB_SM_FRAMEWORK_H3) || \
+ defined(TEST_USB_SM_FRAMEWORK_H2) || \
+ defined(TEST_USB_SM_FRAMEWORK_H1) || \
+ defined(TEST_USB_SM_FRAMEWORK_H0)
+#define CONFIG_TEST_SM
#endif
#if defined(TEST_USB_PRL)