summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/protectli/vault_cml/Kconfig8
-rw-r--r--src/mainboard/protectli/vault_cml/Kconfig.name7
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"