diff options
| author | Dossym Nurmukhanov <dossym@google.com> | 2020-12-11 13:51:51 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-12 12:55:46 +0000 |
| commit | abd894e1c9e01462ce5cf4cc4691a75f4e1378de (patch) | |
| tree | 693fc8ee261d76c02863fc6d100e858b5dc29bd1 | |
| parent | 61022575d3c8b75d07e4f3be3f1616e45767f673 (diff) | |
| download | chrome-ec-abd894e1c9e01462ce5cf4cc4691a75f4e1378de.tar.gz | |
COIL: Rename EC-EC comm config to be inclusive
Use server/client nomenclature instead
BUG=none
TEST=build and run on volteer
BRANCH=none
Signed-off-by: dossym@chromium.org
Change-Id: I2cf4a82291134378ed21bbc068361f1be25e8176
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2587574
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
| -rw-r--r-- | board/hammer/board.h | 2 | ||||
| -rw-r--r-- | board/poppy/board.h | 2 | ||||
| -rw-r--r-- | common/build.mk | 4 | ||||
| -rw-r--r-- | include/config.h | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/board/hammer/board.h b/board/hammer/board.h index 60ec82eae7..f26aa447ae 100644 --- a/board/hammer/board.h +++ b/board/hammer/board.h @@ -278,7 +278,7 @@ #define CONFIG_STREAM_USART2 #define CONFIG_STREAM_USART -#define CONFIG_EC_EC_COMM_SLAVE +#define CONFIG_EC_EC_COMM_SERVER #define CONFIG_EC_EC_COMM_BATTERY #define CONFIG_CRC8 #endif /* BOARD_WAND */ diff --git a/board/poppy/board.h b/board/poppy/board.h index 72b3a618a4..8e5f35b21b 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -78,7 +78,7 @@ #ifdef BOARD_LUX #define CONFIG_UART_PAD_SWITCH -#define CONFIG_EC_EC_COMM_MASTER +#define CONFIG_EC_EC_COMM_CLIENT #define CONFIG_EC_EC_COMM_BATTERY #define CONFIG_CRC8 #endif diff --git a/common/build.mk b/common/build.mk index 34fadaef55..cb6ac4832a 100644 --- a/common/build.mk +++ b/common/build.mk @@ -69,8 +69,8 @@ common-$(CONFIG_DEDICATED_RECOVERY_BUTTON)+=button.o common-$(CONFIG_DEVICE_EVENT)+=device_event.o common-$(CONFIG_DEVICE_STATE)+=device_state.o common-$(CONFIG_DPTF)+=dptf.o -common-$(CONFIG_EC_EC_COMM_MASTER)+=ec_ec_comm_client.o -common-$(CONFIG_EC_EC_COMM_SLAVE)+=ec_ec_comm_server.o +common-$(CONFIG_EC_EC_COMM_CLIENT)+=ec_ec_comm_client.o +common-$(CONFIG_EC_EC_COMM_SERVER)+=ec_ec_comm_server.o common-$(CONFIG_HOSTCMD_ESPI)+=espi.o common-$(CONFIG_EXTPOWER_GPIO)+=extpower_gpio.o common-$(CONFIG_EXTPOWER)+=extpower_common.o diff --git a/include/config.h b/include/config.h index 8606ac52b0..03c5c6623b 100644 --- a/include/config.h +++ b/include/config.h @@ -1522,10 +1522,10 @@ /* Support for EC-EC communication */ /* - * Board is master or slave in EC-EC communication. + * Board is client or server in EC-EC communication. */ -#undef CONFIG_EC_EC_COMM_MASTER -#undef CONFIG_EC_EC_COMM_SLAVE +#undef CONFIG_EC_EC_COMM_CLIENT +#undef CONFIG_EC_EC_COMM_SERVER /* * Board support battery-related functions in EC-EC communication. @@ -5335,13 +5335,13 @@ * Define derived configuration options for EC-EC communication */ #ifdef CONFIG_EC_EC_COMM_BATTERY -#ifdef CONFIG_EC_EC_COMM_MASTER +#ifdef CONFIG_EC_EC_COMM_CLIENT #define CONFIG_EC_EC_COMM_BATTERY_MASTER #define CONFIG_BATTERY_V2 #define CONFIG_BATTERY_COUNT 2 #endif -#ifdef CONFIG_EC_EC_COMM_SLAVE +#ifdef CONFIG_EC_EC_COMM_SERVER #define CONFIG_EC_EC_COMM_BATTERY_SLAVE #define CONFIG_BATTERY_V2 #define CONFIG_BATTERY_COUNT 1 |