coreboot-mirror
/
chrome-ec
mirror of https://review.coreboot.org/chrome-ec.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Dossym Nurmukhanov 2020-12-11 13:51:51 -08:00 committed by Commit Bot
parent 61022575d3
commit abd894e1c9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/hammer/board.h
View File

@ -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 */

2
board/poppy/board.h
View File

@ -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

4
common/build.mk
View File

@ -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

10
include/config.h
View File

@ -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