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

[Felix Singer (Code Review)]

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

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

mb/intel/kblrvp: 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_KBLRVP_COMMON`, which is used as base for each
variant.

Change-Id: I2a9c12a15c098fcb64c006a707c94a1aed93d73a
Signed-off-by: Felix Singer 
---
M src/mainboard/intel/kblrvp/Kconfig
M src/mainboard/intel/kblrvp/Kconfig.name
2 files changed, 36 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/56219/1

diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig
index fcce402..5b6e35d 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -1,21 +1,39 @@
-if BOARD_INTEL_KBLRVP3 || BOARD_INTEL_KBLRVP7 || BOARD_INTEL_KBLRVP8 \
-	|| BOARD_INTEL_KBLRVP11
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
+config BOARD_INTEL_KBLRVP_COMMON
+	bool
    select BOARD_ROMSIZE_KB_16384
    select EC_ACPI
    select HAVE_ACPI_RESUME
    select HAVE_ACPI_TABLES
    select HAVE_OPTION_TABLE
-	select SOC_INTEL_COMMON_BLOCK_HDA_VERB if !BOARD_INTEL_KBLRVP8
-	select SOC_INTEL_KABYLAKE
-	select SKYLAKE_SOC_PCH_H if BOARD_INTEL_KBLRVP8 || BOARD_INTEL_KBLRVP11
-	select MAINBOARD_HAS_CHROMEOS
    select HAVE_SPD_IN_CBFS
-	select MAINBOARD_HAS_LPC_TPM
    select INTEL_LPSS_UART_FOR_CONSOLE
-	select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_KBLRVP8
+	select MAINBOARD_HAS_CHROMEOS
+	select MAINBOARD_HAS_LPC_TPM
+	select SOC_INTEL_KABYLAKE
+
+config BOARD_INTEL_KBLRVP_RVP3_OPTIONS
+	bool
+	select BOARD_INTEL_KBLRVP_COMMON
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+
+config BOARD_INTEL_KBLRVP_RVP7_OPTIONS
+	bool
+	select BOARD_INTEL_KBLRVP_COMMON
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+
+config BOARD_INTEL_KBLRVP_RVP8_OPTIONS
+	bool
+	select BOARD_INTEL_KBLRVP_COMMON
+	select MAINBOARD_USES_IFD_GBE_REGION
+	select SKYLAKE_SOC_PCH_H
+
+config BOARD_INTEL_KBLRVP_RVP11_OPTIONS
+	bool
+	select BOARD_INTEL_KBLRVP_COMMON
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+	select SKYLAKE_SOC_PCH_H
+
+if BOARD_INTEL_KBLRVP_COMMON

config VBOOT
    select VBOOT_LID_SWITCH
diff --git a/src/mainboard/intel/kblrvp/Kconfig.name b/src/mainboard/intel/kblrvp/Kconfig.name
index df65e32..62c334c 100644
--- a/src/mainboard/intel/kblrvp/Kconfig.name
+++ b/src/mainboard/intel/kblrvp/Kconfig.name
@@ -1,8 +1,15 @@
 config BOARD_INTEL_KBLRVP3
    bool "Kabylake LPDDR3 RVP3"
+	select BOARD_INTEL_KBLRVP_RVP3_OPTIONS
+
 config BOARD_INTEL_KBLRVP7
    bool "Kabylake DDR3L RVP7"
+	select BOARD_INTEL_KBLRVP_RVP7_OPTIONS
+
 config BOARD_INTEL_KBLRVP8
    bool "Kabylake DDR4 RVP8"
+	select BOARD_INTEL_KBLRVP_RVP8_OPTIONS
+
 config BOARD_INTEL_KBLRVP11
    bool "Kabylake DDR4 RVP11"
+	select BOARD_INTEL_KBLRVP_RVP11_OPTIONS