Change in coreboot[master]: mb/intel/coffeelake_rvp: Rework Kconfig

[Felix Singer (Code Review)]

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56217 )

Change subject: mb/intel/coffeelake_rvp: Rework Kconfig
......................................................................

mb/intel/coffeelake_rvp: Rework Kconfig

Rework Kconfig file that each variant has its own config option with
their specific selects / configuration and move common selects to
`BOARD_INTEL_COFFEELAKE_COMMON`, which is used as base for each
variant.

Built each variant with `BUILD_TIMELESS=1` and all generated
coreboot.rom files remain identical.

Change-Id: I3b3d3cff5ea7a3f4d1c4ddd911240763e4891e06
Signed-off-by: Felix Singer 
---
M src/mainboard/intel/coffeelake_rvp/Kconfig
M src/mainboard/intel/coffeelake_rvp/Kconfig.name
2 files changed, 57 insertions(+), 20 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/56217/1

diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index e4c2d90..40aca30 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig
@@ -1,23 +1,56 @@
-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_COMMON
+	bool
+	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_OPTIONS
+	bool
+	select BOARD_INTEL_COFFEELAKE_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_OPTIONS
+	bool
+	select BOARD_INTEL_COFFEELAKE_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_OPTIONS
+	bool
+	select BOARD_INTEL_COFFEELAKE_COMMON
+	select BOARD_ROMSIZE_KB_32768
+	select SOC_INTEL_COFFEELAKE
+
+config BOARD_INTEL_WHISKEYLAKE_RVP_OPTIONS
+	bool
+	select BOARD_INTEL_COFFEELAKE_COMMON
+	select BOARD_ROMSIZE_KB_16384
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+	select SOC_INTEL_WHISKEYLAKE
+
+config BOARD_INTEL_COMETLAKE_RVPU_OPTIONS
+	bool
+	select BOARD_INTEL_COFFEELAKE_COMMON
+	select BOARD_ROMSIZE_KB_16384
+	select SOC_INTEL_COMETLAKE_1
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+
+if BOARD_INTEL_COFFEELAKE_COMMON

config MAINBOARD_DIR
    string
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig.name b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
index e03e862..ef96a52 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig.name
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
@@ -2,16 +2,20 @@

config BOARD_INTEL_COFFEELAKE_RVPU
    bool "-> Coffeelake U SO-DIMM DDR4 RVP"
-	select SOC_INTEL_COFFEELAKE
+	select BOARD_INTEL_COFFEELAKE_RVPU_OPTIONS
+
 config BOARD_INTEL_COFFEELAKE_RVP11
    bool "-> Coffeelake H SO-DIMM DDR4 RVP11"
-	select SOC_INTEL_COFFEELAKE
+	select BOARD_INTEL_COFFEELAKE_RVP11_OPTIONS
+
 config BOARD_INTEL_WHISKEYLAKE_RVP
    bool "-> Whiskeylake U DDR4 RVP"
-	select SOC_INTEL_WHISKEYLAKE
+	select BOARD_INTEL_WHISKEYLAKE_RVP_OPTIONS
+
 config BOARD_INTEL_COFFEELAKE_RVP8
    bool "-> Coffeelake S U-DIMM DDR4 RVP8"
-	select SOC_INTEL_COFFEELAKE
+	select BOARD_INTEL_COFFEELAKE_RVP8_OPTIONS
+
 config BOARD_INTEL_COMETLAKE_RVPU
    bool "-> Cometlake U DDR4 RVP"
-	select SOC_INTEL_COMETLAKE_1
+	select BOARD_INTEL_COMETLAKE_RVPU_OPTIONS