sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/protectli/vault_cml: use combo v1/v2 FSP

Browse Source 
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>
This commit is contained in:
Michał Kopeć 2023-10-19 16:23:16 +02:00 committed by Martin L Roth
parent 1a395728df
commit c42e28f077
4 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/config.protectli_vp4670 → configs/config.protectli_cml_vp46xx
View File

@ -1,5 +1,5 @@
CONFIG_VENDOR_PROTECTLI=y CONFIG_VENDOR_PROTECTLI=y
CONFIG_BOARD_PROTECTLI_VP4670=y CONFIG_BOARD_PROTECTLI_VP46XX=y
CONFIG_TPM_MEASURED_BOOT=y CONFIG_TPM_MEASURED_BOOT=y
CONFIG_SMMSTORE_SIZE=0x40000 CONFIG_SMMSTORE_SIZE=0x40000
CONFIG_TPM2=y CONFIG_TPM2=y

13
configs/config.protectli_vp4630_vp4650
View File

@ -1,13 +0,0 @@
CONFIG_VENDOR_PROTECTLI=y
CONFIG_BOARD_PROTECTLI_VP4630_VP4650=y
CONFIG_TPM_MEASURED_BOOT=y
CONFIG_SMMSTORE_SIZE=0x40000
CONFIG_TPM2=y
CONFIG_POST_IO_PORT=0x80
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_BOOT_MANAGER_ESCAPE=y
CONFIG_EDK2_BOOT_TIMEOUT=6
CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
# CONFIG_EDK2_FULL_SCREEN_SETUP is not set
CONFIG_EDK2_SD_MMC_TIMEOUT=10
CONFIG_EDK2_SERIAL_SUPPORT=y

8
src/mainboard/protectli/vault_cml/Kconfig
View File

@ -1,11 +1,12 @@
## SPDX-License-Identifier: GPL-2.0-only ## SPDX-License-Identifier: GPL-2.0-only
if BOARD_PROTECTLI_VP4630_VP4650 || BOARD_PROTECTLI_VP4670 if BOARD_PROTECTLI_VP46XX
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select GFX_GMA_IGNORE_PRESENCE_STRAPS select GFX_GMA_IGNORE_PRESENCE_STRAPS
select SOC_INTEL_COMETLAKE_1_2
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select HAVE_CMOS_DEFAULT select HAVE_CMOS_DEFAULT
@ -15,8 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_LIBGFXINIT
select MEMORY_MAPPED_TPM select MEMORY_MAPPED_TPM
select SEABIOS_ADD_SERCON_PORT_FILE if PAYLOAD_SEABIOS 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 SOC_INTEL_COMMON_BLOCK_HDA_VERB
select SPI_FLASH_MACRONIX select SPI_FLASH_MACRONIX
select SUPERIO_ITE_IT8784E select SUPERIO_ITE_IT8784E
@ -25,8 +24,7 @@ config MAINBOARD_DIR
default "protectli/vault_cml" default "protectli/vault_cml"
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "VP4630/VP4650" if BOARD_PROTECTLI_VP4630_VP4650 default "VP46XX"
default "VP4670" if BOARD_PROTECTLI_VP4670
config MAINBOARD_FAMILY config MAINBOARD_FAMILY
default "Vault Pro" default "Vault Pro"

7
src/mainboard/protectli/vault_cml/Kconfig.name
View File

@ -1,7 +1,4 @@
## SPDX-License-Identifier: GPL-2.0-only ## SPDX-License-Identifier: GPL-2.0-only
config BOARD_PROTECTLI_VP4630_VP4650 config BOARD_PROTECTLI_VP46XX
bool "VP4630/VP4650" bool "VP4630/VP4650/VP4670"
config BOARD_PROTECTLI_VP4670
bool "VP4670"