From 1b87ee65ac8f3cd895da6ef2e219670d2f9779ec Mon Sep 17 00:00:00 2001 From: Jett Rink Date: Wed, 31 Jan 2018 08:16:53 -0700 Subject: [PATCH] cleanup: Removing unnecessary CONFIG_USB_PD_DISCHARGE define CONFIG_USB_PD_DISCHARGE is now defined automatically if you specify one of the specified options such as CONFIG_USB_PD_DISCHARGE_TCPC BRANCH=none BUG=none TEST=grunt still discharges using PPC Change-Id: I94086cfc58bebce9c62ad6aa52b7740b25276d89 Signed-off-by: Jett Rink Reviewed-on: https://chromium-review.googlesource.com/894676 Reviewed-by: Aseda Aboagye --- board/coral/board.h | 1 - board/eve/board.h | 1 - board/fizz/board.h | 1 - board/grunt/board.h | 1 - board/kahlee/board.h | 1 - board/kevin/board.h | 1 - board/nami/board.h | 1 - board/nautilus/board.h | 1 - board/poppy/board.h | 1 - board/rainier/board.h | 1 - board/reef/board.h | 1 - board/reef_it8320/board.h | 1 - board/scarlet/board.h | 1 - 13 files changed, 13 deletions(-) diff --git a/board/coral/board.h b/board/coral/board.h index 121ff1a0a0..90dae6032e 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -84,7 +84,6 @@ #define CONFIG_USB_PD_CUSTOM_VDM #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_LOGGING #define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0 diff --git a/board/eve/board.h b/board/eve/board.h index 2e34294d47..327d7aa273 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -156,7 +156,6 @@ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_CUSTOM_VDM -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE diff --git a/board/fizz/board.h b/board/fizz/board.h index e3c49e5f5f..b9c7b93da6 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -92,7 +92,6 @@ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_CUSTOM_VDM -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE diff --git a/board/grunt/board.h b/board/grunt/board.h index 1e27cce866..c8922770c8 100644 --- a/board/grunt/board.h +++ b/board/grunt/board.h @@ -78,7 +78,6 @@ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_COMM_LOCKED -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_PPC #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE diff --git a/board/kahlee/board.h b/board/kahlee/board.h index 733c8d75e3..316c8bcca1 100644 --- a/board/kahlee/board.h +++ b/board/kahlee/board.h @@ -63,7 +63,6 @@ #define CONFIG_USB_PD_CUSTOM_VDM #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_LOGGING #define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0 diff --git a/board/kevin/board.h b/board/kevin/board.h index abebc67d4b..f479fe7efb 100644 --- a/board/kevin/board.h +++ b/board/kevin/board.h @@ -123,7 +123,6 @@ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_CUSTOM_VDM -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_GPIO #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_LOGGING diff --git a/board/nami/board.h b/board/nami/board.h index c548ecae46..6fb0c7d5c1 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -137,7 +137,6 @@ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_CUSTOM_VDM -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE diff --git a/board/nautilus/board.h b/board/nautilus/board.h index c3a077ae57..f319f4c420 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -139,7 +139,6 @@ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_CUSTOM_VDM -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE diff --git a/board/poppy/board.h b/board/poppy/board.h index 5e005f6d42..57723cbbf1 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -146,7 +146,6 @@ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_CUSTOM_VDM -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE diff --git a/board/rainier/board.h b/board/rainier/board.h index 6b06f4efbd..8ef3ca745d 100644 --- a/board/rainier/board.h +++ b/board/rainier/board.h @@ -88,7 +88,6 @@ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_CUSTOM_VDM -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_GPIO #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_PORT_COUNT 1 diff --git a/board/reef/board.h b/board/reef/board.h index 9d6b3f31d7..4931c70306 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -82,7 +82,6 @@ #define CONFIG_USB_PD_CUSTOM_VDM #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_LOGGING #define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0 diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h index 099cfe273d..07660e57a9 100644 --- a/board/reef_it8320/board.h +++ b/board/reef_it8320/board.h @@ -71,7 +71,6 @@ #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_CUSTOM_VDM #define CONFIG_USB_PD_DUAL_ROLE -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_GPIO #define CONFIG_USB_PD_LOGGING #define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0 diff --git a/board/scarlet/board.h b/board/scarlet/board.h index 2788d4bd79..9958eadd4d 100644 --- a/board/scarlet/board.h +++ b/board/scarlet/board.h @@ -103,7 +103,6 @@ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_CUSTOM_VDM -#define CONFIG_USB_PD_DISCHARGE #define CONFIG_USB_PD_DISCHARGE_GPIO #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_LOGGING