13 files changed, 13 insertions, 25 deletions
diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h
index 9bc515759e..0b0018f6f0 100644
--- a/baseboard/octopus/baseboard.h
+++ b/baseboard/octopus/baseboard.h
@@ -210,9 +210,8 @@
  /* Common SoC / PCH defines */
 #define CONFIG_CHIPSET_GEMINILAKE
 #define CONFIG_CHIPSET_RESET_HOOK
-#define CONFIG_ESPI
+#define CONFIG_HOSTCMD_ESPI
 /* TODO(b/74123961): Enable Virtual Wires after bringup */
-#define CONFIG_LPC
 #define CONFIG_POWER_COMMON
 #define CONFIG_POWER_S0IX
 #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE
diff --git a/board/atlas/board.h b/board/atlas/board.h
index 61daae9f34..c10a0c4b4e 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -61,9 +61,8 @@
 #define CONFIG_CHIPSET_SKYLAKE
 #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET
 #define CONFIG_CHIPSET_RESET_HOOK
-#define CONFIG_ESPI
+#define CONFIG_HOSTCMD_ESPI
 #define CONFIG_ESPI_VW_SIGNALS
-#define CONFIG_LPC
 #define CONFIG_KEYBOARD_BOARD_CONFIG
 #define CONFIG_KEYBOARD_COL2_INVERTED
 #define CONFIG_KEYBOARD_PROTOCOL_8042
diff --git a/board/eve/board.h b/board/eve/board.h
index b9d0531a3b..2108dfc449 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -66,9 +66,8 @@
 #define CONFIG_CHIPSET_SKYLAKE
 #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET
 #define CONFIG_CHIPSET_RESET_HOOK
-#define CONFIG_ESPI
+#define CONFIG_HOSTCMD_ESPI
 #define CONFIG_ESPI_VW_SIGNALS
-#define CONFIG_LPC
 #define CONFIG_KEYBOARD_BOARD_CONFIG
 #define CONFIG_KEYBOARD_COL2_INVERTED
 #define CONFIG_KEYBOARD_PROTOCOL_8042
diff --git a/board/fizz/board.h b/board/fizz/board.h
index 5224b22d67..f10bbc8162 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -64,11 +64,10 @@
 #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET
 #define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK
 #define CONFIG_CHIPSET_RESET_HOOK
-#define CONFIG_ESPI
+#define CONFIG_HOSTCMD_ESPI
 /* Eve and Poppy all have wires from GPIO to PCH but CONFIG_ESPI_VW_SIGNALS
  * is defined. So, those GPIOs are not used by EC. */
 #define CONFIG_ESPI_VW_SIGNALS
-#define CONFIG_LPC
 
 /* Charger */
 #define CONFIG_CHARGE_MANAGER
diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h
index 91ac5c2c45..1b330f3d00 100644
--- a/board/glkrvp/board.h
+++ b/board/glkrvp/board.h
@@ -75,8 +75,7 @@
 #define CONFIG_USB_MUX_PS8743
 
 /* SoC / PCH */
-#define CONFIG_ESPI
-#define CONFIG_LPC
+#define CONFIG_HOSTCMD_ESPI
 #define CONFIG_CHIPSET_GEMINILAKE
 #define CONFIG_CHIPSET_RESET_HOOK
 #define CONFIG_POWER_BUTTON
diff --git a/board/glkrvp_ite/board.h b/board/glkrvp_ite/board.h
index 802b9beefe..52bf94e3f1 100644
--- a/board/glkrvp_ite/board.h
+++ b/board/glkrvp_ite/board.h
@@ -75,8 +75,7 @@
 #define CONFIG_USB_MUX_PS8743
 
 /* SoC / PCH */
-#define CONFIG_ESPI
-#define CONFIG_LPC
+#define CONFIG_HOSTCMD_ESPI
 #define CONFIG_CHIPSET_GEMINILAKE
 #define CONFIG_CHIPSET_RESET_HOOK
 #define CONFIG_POWER_BUTTON
diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h
index 679bd3b44f..4b7de96bd8 100644
--- a/board/mchpevb1/board.h
+++ b/board/mchpevb1/board.h
@@ -171,7 +171,7 @@
 #define CONFIG_CHIPSET_SKYLAKE
 #define CONFIG_CHIPSET_RESET_HOOK
 
-#define CONFIG_ESPI
+#define CONFIG_HOSTCMD_ESPI
 #define CONFIG_ESPI_VW_SIGNALS
 
 #define CONFIG_CLOCK_CRYSTAL
diff --git a/board/nami/board.h b/board/nami/board.h
index 8d38d9d4a0..4b527657e6 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -72,9 +72,8 @@
 #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET
 #define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK
 #define CONFIG_CHIPSET_RESET_HOOK
-#define CONFIG_ESPI
+#define CONFIG_HOSTCMD_ESPI
 #define CONFIG_ESPI_VW_SIGNALS
-#define CONFIG_LPC
 
 /* Battery */
 #define CONFIG_BATTERY_CUT_OFF
diff --git a/board/nautilus/board.h b/board/nautilus/board.h
index 2b8f7e71e8..5c45b47f45 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -62,9 +62,8 @@
 #define CONFIG_CHIPSET_SKYLAKE
 #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET
 #define CONFIG_CHIPSET_RESET_HOOK
-#define CONFIG_ESPI
+#define CONFIG_HOSTCMD_ESPI
 #define CONFIG_ESPI_VW_SIGNALS
-#define CONFIG_LPC
 
 /* Battery */
 #define CONFIG_BATTERY_CUT_OFF
diff --git a/board/nocturne/board.h b/board/nocturne/board.h
index 5d866f1056..13722d3e97 100644
--- a/board/nocturne/board.h
+++ b/board/nocturne/board.h
@@ -29,10 +29,9 @@
 #define CONFIG_ADC
 #define CONFIG_BACKLIGHT_LID
 #define CONFIG_BOARD_VERSION_CUSTOM
-#define CONFIG_ESPI
+#define CONFIG_HOSTCMD_ESPI
 #define CONFIG_I2C
 #define CONFIG_I2C_MASTER
-#define CONFIG_LPC
 #define CONFIG_PWM
 #define CONFIG_VBOOT_HASH
 #define CONFIG_VSTORE
diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h
index 250619a922..bae8f8a34e 100644
--- a/board/npcx7_evb/board.h
+++ b/board/npcx7_evb/board.h
@@ -19,10 +19,9 @@
 #define CONFIG_ADC
 #define CONFIG_PWM
 #define CONFIG_SPI
-#define CONFIG_LPC
 #define CONFIG_I2C
 /* Features of eSPI */
-#define CONFIG_ESPI /* Use eSPI protocol for host interface of x86 CPU */
+#define CONFIG_HOSTCMD_ESPI
 #define CONFIG_ESPI_VW_SIGNALS /* Use VW signals instead of GPIOs */
 
 /* Optional features */
diff --git a/board/poppy/board.h b/board/poppy/board.h
index 1c53018bd4..6ed87c9e86 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -61,9 +61,8 @@
 #define CONFIG_CHIPSET_SKYLAKE
 #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET
 #define CONFIG_CHIPSET_RESET_HOOK
-#define CONFIG_ESPI
+#define CONFIG_HOSTCMD_ESPI
 #define CONFIG_ESPI_VW_SIGNALS
-#define CONFIG_LPC
 
 /* Battery */
 #define CONFIG_BATTERY_CUT_OFF
diff --git a/board/zoombini/board.h b/board/zoombini/board.h
index b397ca4164..b5b0c26215 100644
--- a/board/zoombini/board.h
+++ b/board/zoombini/board.h
@@ -36,11 +36,10 @@
 
 /* EC Modules */
 #define CONFIG_ADC
-#define CONFIG_ESPI
+#define CONFIG_HOSTCMD_ESPI
 /* TODO(aaboagye): Uncomment when Si arrives. */
 /* #define CONFIG_ESPI_VW_SIGNALS */
 #define CONFIG_I2C
-#define CONFIG_LPC
 #define CONFIG_PWM
 
 /* KB backlight driver */