From 707bebe29356b4804509d438bb6f02496cb8b1b3 Mon Sep 17 00:00:00 2001 From: Jett Rink Date: Mon, 21 May 2018 10:22:55 -0600 Subject: lpc: convert LPC only boards to use CONFIG_HOSTCMD_LPC BRANCH=none BUG=chromium:818804 TEST=Full stack builds and works on yorp (espi) and grunt (lpc) Change-Id: I4a70e10c34d79361ceada1ff40b8912b8a6fdaa7 Signed-off-by: Jett Rink Reviewed-on: https://chromium-review.googlesource.com/1067500 Reviewed-by: Randall Spangler --- board/bds/board.h | 3 ++- board/coral/board.h | 2 +- board/grunt/board.h | 2 +- board/kahlee/board.h | 2 +- board/npcx_evb/board.h | 2 +- board/reef/board.h | 2 +- board/reef_it8320/board.h | 2 +- board/wheatley/board.h | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/board/bds/board.h b/board/bds/board.h index 1d9b454769..93e3295ec3 100644 --- a/board/bds/board.h +++ b/board/bds/board.h @@ -19,7 +19,8 @@ /* Modules we want to exclude */ #undef CONFIG_LID_SWITCH -#undef CONFIG_LPC +#undef CONFIG_LPC /* TODO(chromium:818804): Remove after transition */ +#undef CONFIG_HOSTCMD_LPC #undef CONFIG_PECI #undef CONFIG_SWITCH diff --git a/board/coral/board.h b/board/coral/board.h index 484b83949d..e392ac38a6 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -103,7 +103,7 @@ #define CONFIG_USBC_VCONN_SWAP /* SoC / PCH */ -#define CONFIG_LPC +#define CONFIG_HOSTCMD_LPC #define CONFIG_CHIPSET_APOLLOLAKE #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_POWER_BUTTON diff --git a/board/grunt/board.h b/board/grunt/board.h index 364527226b..64d21ffaa5 100644 --- a/board/grunt/board.h +++ b/board/grunt/board.h @@ -45,7 +45,7 @@ #define CONFIG_HOSTCMD_SKUID #define CONFIG_I2C #define CONFIG_I2C_MASTER -#define CONFIG_LPC +#define CONFIG_HOSTCMD_LPC #define CONFIG_PWM #define CONFIG_PWM_KBLIGHT #define CONFIG_TEMP_SENSOR diff --git a/board/kahlee/board.h b/board/kahlee/board.h index ac9745ce3c..cfb9802341 100644 --- a/board/kahlee/board.h +++ b/board/kahlee/board.h @@ -82,7 +82,7 @@ #define CONFIG_USBC_VCONN_SWAP /* SoC / PCH */ -#define CONFIG_LPC +#define CONFIG_HOSTCMD_LPC #define CONFIG_CHIPSET_STONEY #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_POWER_BUTTON diff --git a/board/npcx_evb/board.h b/board/npcx_evb/board.h index b5dab2a370..59f6add2d4 100644 --- a/board/npcx_evb/board.h +++ b/board/npcx_evb/board.h @@ -12,7 +12,7 @@ #define CONFIG_ADC #define CONFIG_PWM #define CONFIG_SPI -#define CONFIG_LPC /* Used in Intel-based platform for host interface */ +#define CONFIG_HOSTCMD_LPC #define CONFIG_PECI /* Optional features */ diff --git a/board/reef/board.h b/board/reef/board.h index a1b45ddf08..3734c1c65b 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -101,7 +101,7 @@ #define CONFIG_USBC_VCONN_SWAP /* SoC / PCH */ -#define CONFIG_LPC +#define CONFIG_HOSTCMD_LPC #define CONFIG_CHIPSET_APOLLOLAKE #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_POWER_BUTTON diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h index 262a831b16..106a23d971 100644 --- a/board/reef_it8320/board.h +++ b/board/reef_it8320/board.h @@ -86,7 +86,7 @@ #define CONFIG_USBC_VCONN_SWAP /* SoC / PCH */ -#define CONFIG_LPC +#define CONFIG_HOSTCMD_LPC #define CONFIG_CHIPSET_APOLLOLAKE #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_POWER_BUTTON diff --git a/board/wheatley/board.h b/board/wheatley/board.h index 6b9308ba1f..caa3838a3d 100644 --- a/board/wheatley/board.h +++ b/board/wheatley/board.h @@ -42,7 +42,7 @@ #define CONFIG_HOSTCMD_PD_PANIC #define CONFIG_I2C #define CONFIG_I2C_MASTER -#define CONFIG_LPC +#define CONFIG_HOSTCMD_LPC #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LID_ANGLE -- cgit v1.2.1