diff options
| author | Michał Kopeć <michal.kopec@3mdeb.com> | 2023-10-19 16:23:16 +0200 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2024-05-12 18:52:41 +0000 |
| commit | c42e28f077cbf108085dff8d847a74d23782d703 (patch) | |
| tree | f2804f06a12779c4cd65130c394d2fe20fed6899 /src/mainboard | |
| parent | 1a395728dfdb6a32757ba7e120eb0e62d503e447 (diff) | |
mb/protectli/vault_cml: use combo v1/v2 FSP
Also switch configs to use combo v1/v2 FSP
The reason for this change is to simplify configuration - instead of
multiple targets for VP4630 and VP4650 or VP4670, it's now possible to
have one target covering all VP46x0.
Change-Id: I1a6f6e873e4ec35b9777dc17c0495151348d1d88
Signed-off-by: Michał Kopeć <michal.kopec@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81963
Reviewed-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/protectli/vault_cml/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/protectli/vault_cml/Kconfig.name | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/mainboard/protectli/vault_cml/Kconfig b/src/mainboard/protectli/vault_cml/Kconfig index 2389520ef8..87de08829a 100644 --- a/src/mainboard/protectli/vault_cml/Kconfig +++ b/src/mainboard/protectli/vault_cml/Kconfig @@ -1,11 +1,12 @@ ## SPDX-License-Identifier: GPL-2.0-only -if BOARD_PROTECTLI_VP4630_VP4650 || BOARD_PROTECTLI_VP4670 +if BOARD_PROTECTLI_VP46XX config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_16384 select GFX_GMA_IGNORE_PRESENCE_STRAPS + select SOC_INTEL_COMETLAKE_1_2 select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_CMOS_DEFAULT @@ -15,8 +16,6 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_HAS_LIBGFXINIT select MEMORY_MAPPED_TPM select SEABIOS_ADD_SERCON_PORT_FILE if PAYLOAD_SEABIOS - select SOC_INTEL_COMETLAKE_1 if BOARD_PROTECTLI_VP4670 - select SOC_INTEL_COMETLAKE_2 if BOARD_PROTECTLI_VP4630_VP4650 select SOC_INTEL_COMMON_BLOCK_HDA_VERB select SPI_FLASH_MACRONIX select SUPERIO_ITE_IT8784E @@ -25,8 +24,7 @@ config MAINBOARD_DIR default "protectli/vault_cml" config MAINBOARD_PART_NUMBER - default "VP4630/VP4650" if BOARD_PROTECTLI_VP4630_VP4650 - default "VP4670" if BOARD_PROTECTLI_VP4670 + default "VP46XX" config MAINBOARD_FAMILY default "Vault Pro" diff --git a/src/mainboard/protectli/vault_cml/Kconfig.name b/src/mainboard/protectli/vault_cml/Kconfig.name index f0f3257f05..1aaac81544 100644 --- a/src/mainboard/protectli/vault_cml/Kconfig.name +++ b/src/mainboard/protectli/vault_cml/Kconfig.name @@ -1,7 +1,4 @@ ## SPDX-License-Identifier: GPL-2.0-only -config BOARD_PROTECTLI_VP4630_VP4650 - bool "VP4630/VP4650" - -config BOARD_PROTECTLI_VP4670 - bool "VP4670" +config BOARD_PROTECTLI_VP46XX + bool "VP4630/VP4650/VP4670" |