2 files changed, 47 insertions, 20 deletions
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index 98debfb231..4148b473e4 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig
@@ -1,23 +1,51 @@
-if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVPU || BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COFFEELAKE_RVP8 || BOARD_INTEL_COMETLAKE_RVPU
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
-	select BOARD_ROMSIZE_KB_16384 if !BOARD_INTEL_COFFEELAKE_RVPU
-	select BOARD_ROMSIZE_KB_32768 if BOARD_INTEL_COFFEELAKE_RVPU
+config BOARD_INTEL_COFFEELAKE_RVP_COMMON
+	def_bool n
+	select DRIVERS_GENERIC_MAX98357A
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_I2C_GENERIC
+	select DRIVERS_I2C_HID
+	select DRIVERS_I2C_MAX98373
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select DRIVERS_I2C_HID
-	select DRIVERS_I2C_GENERIC
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_I2C_MAX98373
-	select DRIVERS_GENERIC_MAX98357A
-	select SOC_INTEL_CANNONLAKE_PCH_H if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8
-	select SOC_INTEL_COMMON_BLOCK_HDA_VERB if !BOARD_INTEL_COFFEELAKE_RVPU
-	select MAINBOARD_USES_IFD_EC_REGION
-	select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8
 	select MAINBOARD_HAS_LPC_TPM
+	select MAINBOARD_USES_IFD_EC_REGION
+
+config BOARD_INTEL_COFFEELAKE_RVP8
+	select BOARD_INTEL_COFFEELAKE_RVP_COMMON
+	select BOARD_ROMSIZE_KB_16384
+	select MAINBOARD_USES_IFD_GBE_REGION
+	select SOC_INTEL_CANNONLAKE_PCH_H
+	select SOC_INTEL_COFFEELAKE
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+
+config BOARD_INTEL_COFFEELAKE_RVP11
+	select BOARD_INTEL_COFFEELAKE_RVP_COMMON
+	select BOARD_ROMSIZE_KB_16384
+	select MAINBOARD_USES_IFD_GBE_REGION
+	select SOC_INTEL_CANNONLAKE_PCH_H
+	select SOC_INTEL_COFFEELAKE
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+
+config BOARD_INTEL_COFFEELAKE_RVPU
+	select BOARD_INTEL_COFFEELAKE_RVP_COMMON
+	select BOARD_ROMSIZE_KB_32768
+	select SOC_INTEL_COFFEELAKE
+
+config BOARD_INTEL_WHISKEYLAKE_RVP
+	select BOARD_INTEL_COFFEELAKE_RVP_COMMON
+	select BOARD_ROMSIZE_KB_16384
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+	select SOC_INTEL_WHISKEYLAKE
+
+config BOARD_INTEL_COMETLAKE_RVPU
+	select BOARD_INTEL_COFFEELAKE_RVP_COMMON
+	select BOARD_ROMSIZE_KB_16384
+	select SOC_INTEL_COMETLAKE_1
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+
+if BOARD_INTEL_COFFEELAKE_RVP_COMMON
 
 config MAINBOARD_DIR
 	default "intel/coffeelake_rvp"
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig.name b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
index e03e862636..bebdda4e75 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig.name
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
@@ -2,16 +2,15 @@ comment "Coffeelake RVP"
 
 config BOARD_INTEL_COFFEELAKE_RVPU
 	bool "-> Coffeelake U SO-DIMM DDR4 RVP"
-	select SOC_INTEL_COFFEELAKE
+
 config BOARD_INTEL_COFFEELAKE_RVP11
 	bool "-> Coffeelake H SO-DIMM DDR4 RVP11"
-	select SOC_INTEL_COFFEELAKE
+
 config BOARD_INTEL_WHISKEYLAKE_RVP
 	bool "-> Whiskeylake U DDR4 RVP"
-	select SOC_INTEL_WHISKEYLAKE
+
 config BOARD_INTEL_COFFEELAKE_RVP8
 	bool "-> Coffeelake S U-DIMM DDR4 RVP8"
-	select SOC_INTEL_COFFEELAKE
+
 config BOARD_INTEL_COMETLAKE_RVPU
 	bool "-> Cometlake U DDR4 RVP"
-	select SOC_INTEL_COMETLAKE_1