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.

Also, move selects from Kconfig.name to Kconfig so that the
configuration is at one place and not distributed over two files.

Built each variant with `BUILD_TIMELESS=1` and all generated
coreboot.rom files remain identical. Excluded the .config file by
disabling `INCLUDE_CONFIG_FILE` to make this reproducible.

Change-Id: I3b3d3cff5ea7a3f4d1c4ddd911240763e4891e06
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56217
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Thomas Heijligen <src@posteo.de>
This commit is contained in:
Felix Singer 2021-07-12 17:24:43 +02:00
parent 2d2cc0dcb9
commit e4047354ec
2 changed files with 47 additions and 20 deletions

View File

@ -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"

View File

@ -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