summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWerner Zeh <werner.zeh@siemens.com>2019-10-22 15:22:21 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-11-11 10:34:36 +0000
commit7c276c0dd74623bc9e11584f3fb74e876823af9f (patch)
tree5e58f661514533514ed2365e03c2a778d963e16c /src
parent0dc87ef90db6944a1854c5f9a6e932903ebad5a4 (diff)
downloadcoreboot-7c276c0dd74623bc9e11584f3fb74e876823af9f.tar.xz
mb/siemens/mc_apl6: Enable VBOOT per default
mc_apl6 uses VBOOT scheme so enable it as default. Change-Id: I341180f3815ff9f3b2db801d9d989119a2585b03 Signed-off-by: Werner Zeh <werner.zeh@siemens.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36669 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Mario Scheithauer <mario.scheithauer@siemens.com>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig16
-rw-r--r--src/mainboard/siemens/mc_apl1/variants/mc_apl6/gpio.c2
2 files changed, 17 insertions, 1 deletions
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig
index e0f2948a7d..864e808f17 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig
@@ -8,5 +8,21 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVER_SIEMENS_NC_FPGA
select NC_FPGA_NOTIFY_CB_READY
select APL_SKIP_SET_POWER_LIMITS
+ select MAINBOARD_HAS_TPM2
+ select MAINBOARD_HAS_LPC_TPM
+ select TPM_ON_FAST_SPI
+
+config VBOOT
+ select VBOOT_MEASURED_BOOT
+ select VBOOT_VBNV_FLASH
+ select VBOOT_NO_BOARD_SUPPORT
+ select GBB_FLAG_DISABLE_LID_SHUTDOWN
+ select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
+ select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
+ select GBB_FLAG_DISABLE_FWMP
+
+config FMDFILE
+ string
+ default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd"
endif # BOARD_SIEMENS_MC_APL6
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/gpio.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/gpio.c
index 7401c74a01..43c2487032 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/gpio.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/gpio.c
@@ -253,7 +253,7 @@ static const struct pad_config gpio_table[] = {
/* SIO_SPI_0 -- unused */
PAD_CFG_GPI(GPIO_104, DN_20K, DEEP), /* GP_SSP_0_CLK */
PAD_CFG_GPI(GPIO_105, DN_20K, DEEP), /* GP_SSP_0_FS0 */
- PAD_CFG_GPI(GPIO_106, UP_20K, DEEP), /* GP_SSP_0_FS1 */
+ PAD_CFG_NF(GPIO_106, NATIVE, DEEP, NF3), /* FST_SPI_CS2_N */
PAD_CFG_GPI(GPIO_109, DN_20K, DEEP), /* GP_SSP_0_RXD */
PAD_CFG_GPI(GPIO_110, DN_20K, DEEP), /* GP_SSP_0_TXD */