From 471a3914c32d856610b237bdb9e12ad8790a5ae3 Mon Sep 17 00:00:00 2001 From: Jett Rink Date: Wed, 25 Mar 2020 13:26:43 -0600 Subject: cleanup: drop the _TYPEC part of USB device config The three USB device configurations describe more than just the Type-C layer, so remove the _TYPEC part within the define. This is also in preparation to change how the usbc build.mk includes files. This was performed with the following commands: $ git grep --name-only CONFIG_USB_TYPEC_DRP_ACC_TRYSRC | xargs perl -i -ple 's/CONFIG_USB_TYPEC_DRP_ACC_TRYSRC/CONFIG_USB_DRP_ACC_TRYSRC/g' $ git grep --name-only CONFIG_USB_TYPEC_CTVPD | xargs perl -i -ple 's/CONFIG_USB_TYPEC_CTVPD/CONFIG_USB_CTVPD/g' $ git grep --name-only CONFIG_USB_TYPEC_VPD | xargs perl -i -ple 's/CONFIG_USB_TYPEC_VPD/CONFIG_USB_VPD/g' BRANCH=none BUG=none TEST=builds Signed-off-by: Jett Rink Change-Id: I4deab784b7c3479cffd3dee7fb3ea3c8a9d6081c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2121193 Reviewed-by: Denis Brockus Commit-Queue: Denis Brockus --- test/test_config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/test_config.h') diff --git a/test/test_config.h b/test/test_config.h index eaf426daef..1461d52874 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -389,15 +389,15 @@ int ncp15wb_calculate_temp(uint16_t adc); #endif /* Common TypeC test defines */ #ifdef TEST_USB_TYPEC_VPD -#define CONFIG_USB_TYPEC_VPD +#define CONFIG_USB_VPD #endif #ifdef TEST_USB_TYPEC_CTVPD -#define CONFIG_USB_TYPEC_CTVPD +#define CONFIG_USB_CTVPD #endif #ifdef TEST_USB_TYPEC_DRP_ACC_TRYSRC -#define CONFIG_USB_TYPEC_DRP_ACC_TRYSRC +#define CONFIG_USB_DRP_ACC_TRYSRC #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_TRY_SRC #define CONFIG_USB_TYPEC_SM -- cgit v1.2.1