zephyr: remove prompt for npcx/ite shi drivers

This commit removes prompt for SHI_NPCX and SHI_IT8XXX2.
They will be automatically enabled depending on host command
interface and soc family.

BRANCH=main
BUG=b:195416058
TEST=zmake testall

Change-Id: Ic84982697de4bd3363d56c6e34e188006ea6c0e4
Signed-off-by: Michał Barnaś <mb@semihalf.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3214035
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Tested-by: Keith Short <keithshort@chromium.org>

5 files changed, 8 insertions, 17 deletions

diff --git a/zephyr/boards/riscv/asurada/asurada_defconfig b/zephyr/boards/riscv/asurada/asurada_defconfig
index 4c5f6f8285..c5a3d306fa 100644
--- a/zephyr/boards/riscv/asurada/asurada_defconfig
+++ b/zephyr/boards/riscv/asurada/asurada_defconfig
@@ -89,9 +89,6 @@ CONFIG_PWM_ITE_IT8XXX2=y
 CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 
-# Serial Host Interface (SHI) device.
-CONFIG_CROS_SHI_IT8XXX2=y
-
 # Timer configuration
 CONFIG_ITE_IT8XXX2_TIMER=y
 
diff --git a/zephyr/drivers/cros_shi/Kconfig b/zephyr/drivers/cros_shi/Kconfig
index 0baa8a5d80..8ca08b6b19 100644
--- a/zephyr/drivers/cros_shi/Kconfig
+++ b/zephyr/drivers/cros_shi/Kconfig
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-menuconfig CROS_SHI_NPCX
-	bool "Nuvoton NPCX Serial Host Interface driver for the Zephyr shim"
+config CROS_SHI_NPCX
+	bool
 	depends on SOC_FAMILY_NPCX
+	depends on PLATFORM_EC_HOST_INTERFACE_SHI
+	default y
 	help
 	  This option enables Serial Host Interface driver for the NPCX family
 	  of processors. This is used for host-command communication on the
@@ -35,9 +37,10 @@ config CROS_SHI_NPCX_DEBUG
 endif # CROS_SHI_NPCX
 
 config CROS_SHI_IT8XXX2
-	bool "ITE it81202 spi host interface driver for Zephyr"
-	depends on SOC_FAMILY_RISCV_ITE && AP_ARM
-	default y if PLATFORM_EC_HOSTCMD
+	bool
+	depends on SOC_FAMILY_RISCV_ITE
+	depends on PLATFORM_EC_HOST_INTERFACE_SHI
+	default y
 	help
 	  This option enables spi host interface driver which is required to
 	  communicate with the EC when the CPU is the ARM processor.
diff --git a/zephyr/projects/herobrine/herobrine_npcx9/prj.conf b/zephyr/projects/herobrine/herobrine_npcx9/prj.conf
index 1c72d99ca8..503cdc1e27 100644
--- a/zephyr/projects/herobrine/herobrine_npcx9/prj.conf
+++ b/zephyr/projects/herobrine/herobrine_npcx9/prj.conf
@@ -139,9 +139,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC_ALARM=y
 # EC software sync
 CONFIG_PLATFORM_EC_VBOOT_HASH=y
 
-# Serial Host Interface (SHI) device.
-CONFIG_CROS_SHI_NPCX=y
-
 # Sensors
 CONFIG_PLATFORM_EC_MOTIONSENSE=y
 CONFIG_PLATFORM_EC_ACCEL_FIFO=y
diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf
index 59ab01cc0a..f47eb7e437 100644
--- a/zephyr/projects/trogdor/lazor/prj.conf
+++ b/zephyr/projects/trogdor/lazor/prj.conf
@@ -127,9 +127,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC=y
 # EC software sync
 CONFIG_PLATFORM_EC_VBOOT_HASH=y
 
-# Serial Host Interface (SHI) device.
-CONFIG_CROS_SHI_NPCX=y
-
 # Sensors
 CONFIG_PLATFORM_EC_MOTIONSENSE=y
 CONFIG_PLATFORM_EC_ACCEL_FIFO=y
diff --git a/zephyr/projects/trogdor/trogdor/prj.conf b/zephyr/projects/trogdor/trogdor/prj.conf
index e2d944c196..a0bbc76b01 100644
--- a/zephyr/projects/trogdor/trogdor/prj.conf
+++ b/zephyr/projects/trogdor/trogdor/prj.conf
@@ -122,9 +122,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC=y
 # EC software sync
 CONFIG_PLATFORM_EC_VBOOT_HASH=y
 
-# Serial Host Interface (SHI) device.
-CONFIG_CROS_SHI_NPCX=y
-
 # Sensors
 CONFIG_PLATFORM_EC_MOTIONSENSE=y
 CONFIG_PLATFORM_EC_ACCEL_FIFO=y