diff options
author | Mathew King <mathewk@chromium.org> | 2019-02-26 15:04:21 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-01 19:50:20 -0800 |
commit | 4dd4b3153b2f067e5ee9efbcb4852c424be57348 (patch) | |
tree | f7e3d8b132926acc1bdb919e7344fbbc86ac2580 /board | |
parent | 7f6fdc5240618d7000ab1526b24f6e242adf1ac3 (diff) | |
download | chrome-ec-4dd4b3153b2f067e5ee9efbcb4852c424be57348.tar.gz |
ec: Cleanup ish config options
Remove all ISH related CONFIG_* options except for:
CONFIG_HOSTCMD_HECI: This will be used to enable the host command
interface using HECI. Similar to CONFIG_HOSTCMD_LPC or
CONFIG_HOSTCMD_ESPI. arcada_ish uses this config.
CONFIG_HID_HECI: This will be used to enable a HID interface using
HECI. It is compatible with the intel-ish-hid kernel driver. atlas_ish
uses this config.
Also remove ipc.c the functionality it has been superceded by
ipc_heci.c.
BUG=b:123634700
TEST=Built and tested on a arcada device
Verified that atlas_ish builds
BRANCH=none
Change-Id: I9d97693e2beca1c9fec8c4f17bd3706b0ea8e795
Signed-off-by: Mathew King <mathewk@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1490551
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/arcada_ish/board.c | 16 | ||||
-rw-r--r-- | board/arcada_ish/board.h | 4 | ||||
-rw-r--r-- | board/atlas_ish/board.c | 14 | ||||
-rw-r--r-- | board/atlas_ish/board.h | 6 |
4 files changed, 1 insertions, 39 deletions
diff --git a/board/arcada_ish/board.c b/board/arcada_ish/board.c index 0c0fabc86e..3cddfa393a 100644 --- a/board/arcada_ish/board.c +++ b/board/arcada_ish/board.c @@ -86,19 +86,3 @@ int board_idle_task(void *unused) while (1) task_wait_event(-1); } - -/* - * Dummy functions to remove 'undefined' symbol link error for acpi.o - * due to CONFIG_LPC flag - * TODO(b/123634700): clean this up when implement EC->AP communication - */ -#ifdef CONFIG_HOSTCMD_LPC -int lpc_query_host_event_state(void) -{ - return 0; -} - -void lpc_set_acpi_status_mask(uint8_t mask) -{ -} -#endif diff --git a/board/arcada_ish/board.h b/board/arcada_ish/board.h index 119b63ce9a..0956d1620e 100644 --- a/board/arcada_ish/board.h +++ b/board/arcada_ish/board.h @@ -35,10 +35,6 @@ /* TODO(b/123634700): This is temporary until FIFO is supported */ #define CONFIG_ACCEL_FORCE_MODE_MASK (1 << BASE_ACCEL) -/* HECI Support*/ -#define CONFIG_HECI -/* ISH IPC (over HECI) */ -#define CONFIG_ISH_IPC /* Host command over HECI */ #define CONFIG_HOSTCMD_HECI diff --git a/board/atlas_ish/board.c b/board/atlas_ish/board.c index ad6bfd18fa..066767638c 100644 --- a/board/atlas_ish/board.c +++ b/board/atlas_ish/board.c @@ -24,17 +24,3 @@ const struct i2c_port_t i2c_ports[] = { GPIO_I2C_PORT_TP_SCL, GPIO_I2C_PORT_TP_SDA}, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); - -/* dummy functions to remove 'undefined' symbol link error for acpi.o - * due to CONFIG_LPC flag - */ -#ifdef CONFIG_HOSTCMD_LPC -int lpc_query_host_event_state(void) -{ - return 0; -} - -void lpc_set_acpi_status_mask(uint8_t mask) -{ -} -#endif diff --git a/board/atlas_ish/board.h b/board/atlas_ish/board.h index b3bc256897..e4d1453cb5 100644 --- a/board/atlas_ish/board.h +++ b/board/atlas_ish/board.h @@ -31,12 +31,8 @@ #define CONFIG_I2C #define CONFIG_I2C_MASTER -/* ISH IPC */ -#define CONFIG_ISH_IPC -/* HECI */ -#define CONFIG_HECI /* HID subsystem */ -#define CONFIG_HID_SUBSYS +#define CONFIG_HID_HECI /* I2C ports */ #define I2C_PORT_TP ISH_I2C0 |