Felix Singer has uploaded this change for review.

View Change

soc/intel/tigerlake: Use Kconfig option per variant

Change-Id: I575f28c7eaa82ed5d52ba7c9328a52e76d71dc5b
Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
M src/mainboard/google/deltaur/Kconfig
M src/mainboard/google/volteer/Kconfig
M src/mainboard/intel/tglrvp/Kconfig
M src/soc/intel/tigerlake/Kconfig
M src/soc/intel/tigerlake/Makefile.inc
5 files changed, 15 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/49055/1

diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig
index 8d95849..0dfec23 100644
--- a/src/mainboard/google/deltaur/Kconfig
+++ b/src/mainboard/google/deltaur/Kconfig
@@ -14,7 +14,7 @@
 	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select MAINBOARD_USES_IFD_EC_REGION
-	select SOC_INTEL_TIGERLAKE
+	select SOC_INTEL_TIGERLAKE_CLIENT
 	select SYSTEM_TYPE_LAPTOP
 	select MAINBOARD_USES_IFD_GBE_REGION if BOARD_GOOGLE_DELTAN
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index c776ba1..a602932 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -30,7 +30,7 @@
 	select MAINBOARD_HAS_I2C_TPM_CR50 if BOARD_GOOGLE_VOLTEER2_TI50
 	select MAINBOARD_HAS_TPM2
 	select PCIEXP_HOTPLUG
-	select SOC_INTEL_TIGERLAKE
+	select SOC_INTEL_TIGERLAKE_CLIENT
 	select HAVE_SPD_IN_CBFS
 
 if BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig
index 9df542d..8aedefc 100644
--- a/src/mainboard/intel/tglrvp/Kconfig
+++ b/src/mainboard/intel/tglrvp/Kconfig
@@ -13,7 +13,8 @@
 	select DRIVERS_INTEL_PMC
 	select DRIVERS_USB_ACPI
 	select DRIVERS_SPI_ACPI
-	select SOC_INTEL_TIGERLAKE
+	select SOC_INTEL_TIGERLAKE_IOT if BOARD_INTEL_TGLRVP_UP3
+	select SOC_INTEL_TIGERLAKE_CLIENT if BOARD_INTEL_TGLRVP_UP4
 	select SOC_INTEL_COMMON_BLOCK_DTT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select DRIVERS_INTEL_ISH
diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig
index c7e10a9..0267252 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -1,9 +1,17 @@
-config SOC_INTEL_TIGERLAKE
+config SOC_INTEL_TIGERLAKE_COMMON
 	bool
 	help
 	  Intel Tigerlake support
 
-if SOC_INTEL_TIGERLAKE
+config SOC_INTEL_TIGERLAKE_IOT
+	bool
+	select SOC_INTEL_TIGERLAKE_COMMON
+
+config SOC_INTEL_TIGERLAKE_CLIENT
+	bool
+	select SOC_INTEL_TIGERLAKE_COMMON
+
+if SOC_INTEL_TIGERLAKE_COMMON
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
diff --git a/src/soc/intel/tigerlake/Makefile.inc b/src/soc/intel/tigerlake/Makefile.inc
index 4a41812..d695a24 100644
--- a/src/soc/intel/tigerlake/Makefile.inc
+++ b/src/soc/intel/tigerlake/Makefile.inc
@@ -1,4 +1,4 @@
-ifeq ($(CONFIG_SOC_INTEL_TIGERLAKE),y)
+ifeq ($(CONFIG_SOC_INTEL_TIGERLAKE_COMMON),y)
 
 subdirs-y += romstage
 subdirs-y += ../../../cpu/intel/microcode

To view, visit change 49055. To unsubscribe, or for help writing mail filters, visit settings.