From 1e98e733c1fc6ea7e558ad87297e51eafd7c985c Mon Sep 17 00:00:00 2001 From: Uwe Poeche Date: Tue, 21 Jun 2022 08:13:25 +0200 Subject: [PATCH] mb/siemens/mc_apl7: Disable VBOOT and TPM mc_apl7 does not use security features like VBOOT and TPM. Test: flash mc_apl4 mainboard and ensure the disabled features via log. Change-Id: I16683b92deb047208848b69c5aa79dc4212ce930 Signed-off-by: Uwe Poeche Reviewed-on: https://review.coreboot.org/c/coreboot/+/65284 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh --- .../siemens/mc_apl1/variants/mc_apl7/Kconfig | 18 +----------------- .../mc_apl1/variants/mc_apl7/devicetree.cb | 6 +----- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/Kconfig index a4a958919c..3d9440664b 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/Kconfig @@ -5,28 +5,12 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select DRIVER_INTEL_I210 select SOC_INTEL_SET_MIN_CLOCK_RATIO - select MAINBOARD_HAS_TPM2 - select MEMORY_MAPPED_TPM - select TPM_ON_FAST_SPI select DRIVERS_I2C_PTN3460 - select TPM_MEASURED_BOOT - select HAS_RECOVERY_MRC_CACHE config UART_FOR_CONSOLE default 1 -config CBFS_SIZE - default 0xb4e000 - -config VBOOT - 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 - default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_apl1.fmd" endif # BOARD_SIEMENS_MC_APL7 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/devicetree.cb b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/devicetree.cb index 58791f3f10..c879fef3ed 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/devicetree.cb +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/devicetree.cb @@ -105,11 +105,7 @@ chip soc/intel/apollolake device pci 1c.0 on end # - eMMC device pci 1d.0 off end # - UFS device pci 1e.0 off end # - SDIO - device pci 1f.0 on # - LPC - chip drivers/pc80/tpm - device pnp 0c31.0 on end - end - end + device pci 1f.0 on end # - LPC device pci 1f.1 on end # - SMBUS end end