From a61e781e4b7a9c2b918401d0e61a7c86e888ae01 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 12 Jul 2021 19:01:23 +0200 Subject: [PATCH] mb/intel/jasperlake_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_JASPERLAKE_RVP_COMMON`, which is used as base for each variant. Also, move selects from Kconfig.name to Kconfig 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: Ic7552195ed5a3ae6ab8e456d7d38d5539a052009 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/56222 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Subrata Banik --- src/mainboard/intel/jasperlake_rvp/Kconfig | 30 +++++++++++++------ .../intel/jasperlake_rvp/Kconfig.name | 6 ---- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig b/src/mainboard/intel/jasperlake_rvp/Kconfig index 9409432eb5..a5b5c39fd4 100644 --- a/src/mainboard/intel/jasperlake_rvp/Kconfig +++ b/src/mainboard/intel/jasperlake_rvp/Kconfig @@ -1,25 +1,37 @@ -if BOARD_INTEL_JASPERLAKE_RVP || BOARD_INTEL_JASPERLAKE_RVP_EXT_EC - -config BOARD_SPECIFIC_OPTIONS - def_bool y +config BOARD_INTEL_JASPERLAKE_RVP_COMMON + def_bool n select BOARD_ROMSIZE_KB_16384 select DRIVERS_I2C_DA7219 - select DRIVERS_I2C_HID - select DRIVERS_INTEL_DPTF select DRIVERS_I2C_GENERIC + select DRIVERS_I2C_HID select DRIVERS_I2C_MAX98373 + select DRIVERS_INTEL_DPTF select DRIVERS_INTEL_MIPI_CAMERA select DRIVERS_SPI_ACPI select DRIVERS_USB_ACPI select EC_ACPI - select HAVE_SPD_IN_CBFS select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES + select HAVE_SPD_IN_CBFS select MAINBOARD_HAS_CHROMEOS - select SOC_INTEL_COMMON_BLOCK_IPU - select SOC_INTEL_JASPERLAKE select SOC_INTEL_COMMON_BLOCK_DTT + select SOC_INTEL_COMMON_BLOCK_IPU select SOC_INTEL_CSE_LITE_SKU + select SOC_INTEL_JASPERLAKE + +config BOARD_INTEL_JASPERLAKE_RVP + select BOARD_INTEL_JASPERLAKE_RVP_COMMON + select DRIVERS_UART_8250IO + select MAINBOARD_USES_IFD_EC_REGION + +config BOARD_INTEL_JASPERLAKE_RVP_EXT_EC + select BOARD_INTEL_JASPERLAKE_RVP_COMMON + select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_LPC + select EC_GOOGLE_CHROMEEC_SWITCHES if VBOOT + select INTEL_LPSS_UART_FOR_CONSOLE + +if BOARD_INTEL_JASPERLAKE_RVP_COMMON config MAINBOARD_DIR default "intel/jasperlake_rvp" diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig.name b/src/mainboard/intel/jasperlake_rvp/Kconfig.name index 68419ac1f5..1a56f05485 100644 --- a/src/mainboard/intel/jasperlake_rvp/Kconfig.name +++ b/src/mainboard/intel/jasperlake_rvp/Kconfig.name @@ -1,11 +1,5 @@ config BOARD_INTEL_JASPERLAKE_RVP bool "Jasperlake DDR4/LPDDR4 RVP" - select DRIVERS_UART_8250IO - select MAINBOARD_USES_IFD_EC_REGION config BOARD_INTEL_JASPERLAKE_RVP_EXT_EC bool "Jasperlake DDR4/LPDDR4 RVP with Chrome EC" - select EC_GOOGLE_CHROMEEC - select EC_GOOGLE_CHROMEEC_LPC - select EC_GOOGLE_CHROMEEC_SWITCHES if VBOOT - select INTEL_LPSS_UART_FOR_CONSOLE