diff options
| author | Keith Short <keithshort@chromium.org> | 2021-08-06 14:16:53 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-19 23:28:35 +0000 |
| commit | 0e1462055e60aa0c08d7d5fe001d069825cc6f32 (patch) | |
| tree | ee5d7716b74d0b6792c7b6b94568b248792efebc | |
| parent | bcb2512bc7c4e22433809dd8b9f5d1d1a909a5f6 (diff) | |
| download | chrome-ec-0e1462055e60aa0c08d7d5fe001d069825cc6f32.tar.gz | |
config: rename CONFIG_HOSTCMD_HECI to CONFIG_HOST_INTERFACE_HECI
Rename CONFIG_HOSTCMD_HECI to CONFIG_HOST_INTERFACE_HECI. This makes the
host interface selection configs distinct from configs used to
enable/disable specific host commands.
BUG=b:195416058
BRANCH=main
TEST=compare_build.sh
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I2a9e490c2fd6f54f7ab9be809ed2711aa3244409
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3095840
Tested-by: Michał Barnaś <mb@semihalf.com>
Reviewed-by: Aaron Massey <aaronmassey@google.com>
| -rw-r--r-- | board/arcada_ish/board.h | 2 | ||||
| -rw-r--r-- | board/drallion_ish/board.h | 2 | ||||
| -rw-r--r-- | board/tglrvp_ish/board.h | 2 | ||||
| -rw-r--r-- | board/volteer_ish/board.h | 2 | ||||
| -rw-r--r-- | chip/ish/build.mk | 4 | ||||
| -rw-r--r-- | docs/configuration/config_ap_to_ec_comm.md | 2 | ||||
| -rw-r--r-- | include/config.h | 2 | ||||
| -rw-r--r-- | util/config_allowed.txt | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/board/arcada_ish/board.h b/board/arcada_ish/board.h index ce735bd268..0064086619 100644 --- a/board/arcada_ish/board.h +++ b/board/arcada_ish/board.h @@ -62,7 +62,7 @@ #define CONFIG_DMA_PAGING /* Host command over HECI */ -#define CONFIG_HOSTCMD_HECI +#define CONFIG_HOST_INTERFACE_HECI /* I2C ports */ #define I2C_PORT_SENSOR ISH_I2C0 diff --git a/board/drallion_ish/board.h b/board/drallion_ish/board.h index dab93426a6..53da677775 100644 --- a/board/drallion_ish/board.h +++ b/board/drallion_ish/board.h @@ -60,7 +60,7 @@ #define CONFIG_DMA_PAGING /* Host command over HECI */ -#define CONFIG_HOSTCMD_HECI +#define CONFIG_HOST_INTERFACE_HECI /* I2C ports */ #define I2C_PORT_SENSOR ISH_I2C0 diff --git a/board/tglrvp_ish/board.h b/board/tglrvp_ish/board.h index 03044a5bb8..12f4b5992a 100644 --- a/board/tglrvp_ish/board.h +++ b/board/tglrvp_ish/board.h @@ -35,7 +35,7 @@ #define CONFIG_ACCEL_FORCE_MODE_MASK BIT(BASE_ACCEL) /* Host command over HECI */ -#define CONFIG_HOSTCMD_HECI +#define CONFIG_HOST_INTERFACE_HECI /* I2C ports */ #define I2C_PORT_SENSOR ISH_I2C1 diff --git a/board/volteer_ish/board.h b/board/volteer_ish/board.h index 097ee25750..527432285c 100644 --- a/board/volteer_ish/board.h +++ b/board/volteer_ish/board.h @@ -35,7 +35,7 @@ #define CONFIG_ACCEL_BMA255 /* Host command over HECI */ -#define CONFIG_HOSTCMD_HECI +#define CONFIG_HOST_INTERFACE_HECI #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_USE_HECI diff --git a/chip/ish/build.mk b/chip/ish/build.mk index 9f220abd21..8072a20791 100644 --- a/chip/ish/build.mk +++ b/chip/ish/build.mk @@ -20,8 +20,8 @@ endif chip-y+=clock.o gpio.o system.o hwtimer.o uart.o flash.o ish_persistent_data.o chip-$(CONFIG_I2C)+=i2c.o chip-$(CONFIG_WATCHDOG)+=watchdog.o -chip-$(CONFIG_HOSTCMD_HECI)+=host_command_heci.o -chip-$(CONFIG_HOSTCMD_HECI)+=heci.o system_state_subsys.o ipc_heci.o +chip-$(CONFIG_HOST_INTERFACE_HECI)+=host_command_heci.o +chip-$(CONFIG_HOST_INTERFACE_HECI)+=heci.o system_state_subsys.o ipc_heci.o chip-$(CONFIG_HID_HECI)+=hid_subsys.o chip-$(CONFIG_HID_HECI)+=heci.o system_state_subsys.o ipc_heci.o chip-$(CONFIG_DMA_PAGING)+=dma.o diff --git a/docs/configuration/config_ap_to_ec_comm.md b/docs/configuration/config_ap_to_ec_comm.md index 24b309feb7..dbce22e31e 100644 --- a/docs/configuration/config_ap_to_ec_comm.md +++ b/docs/configuration/config_ap_to_ec_comm.md @@ -10,7 +10,7 @@ Configure the AP to EC communication channel, picking exactly one of the following options. - `CONFIG_HOSTCMD_SHI` - [SPI Host Interface](../ec_terms.md#shi) (SHI) -- `CONFIG_HOSTCMD_HECI` - HECI interface +- `CONFIG_HOST_INTERFACE_HECI` - HECI interface - `CONFIG_HOSTCMD_LPC` - [LPC](../ec_terms.md#lpc) bus - `CONFIG_HOSTCMD_ESPI` - [eSPI](../ec_terms.md#espi) bus diff --git a/include/config.h b/include/config.h index 7fc59ac4a1..dab353cbc0 100644 --- a/include/config.h +++ b/include/config.h @@ -3141,7 +3141,7 @@ #undef CONFIG_HID_HECI /* Support host command interface over HECI */ -#undef CONFIG_HOSTCMD_HECI +#undef CONFIG_HOST_INTERFACE_HECI /* * EC supports x86 host communication with AP. This can either be through LPC diff --git a/util/config_allowed.txt b/util/config_allowed.txt index ba0d54fd5a..2f3b8f3dab 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -498,7 +498,6 @@ CONFIG_HOSTCMD_ESPI_VW_SLP_S4 CONFIG_HOSTCMD_EVENTS CONFIG_HOSTCMD_FLASHPD CONFIG_HOSTCMD_FLASH_SPI_INFO -CONFIG_HOSTCMD_HECI CONFIG_HOSTCMD_I2C_ADDR_FLAGS CONFIG_HOSTCMD_I2C_SLAVE_ADDR CONFIG_HOSTCMD_I2C_CONTROL @@ -520,6 +519,7 @@ CONFIG_HOST_ESPI_VW_POWER_SIGNAL CONFIG_HOST_EVENT64 CONFIG_HOST_EVENT64_REPORT_MASK CONFIG_HOST_EVENT_REPORT_MASK +CONFIG_HOST_INTERFACE_HECI CONFIG_HWTIMER_64BIT CONFIG_HW_CRC CONFIG_HW_SPECIFIC_UDELAY |