From f9d933db36f67ac4f1e86e83b64f96396933ef7c Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Wed, 14 May 2025 15:43:42 +0000 Subject: [PATCH] mb/google/bluey: Introduce MAINBOARD_HAS_GOOGLE_TPM Kconfig This commit introduces a new Kconfig option `MAINBOARD_HAS_GOOGLE_TPM` for the Bluey mainboard. Previously, `I2C_TPM`, `MAINBOARD_HAS_TPM2`, and `TPM_GOOGLE_TI50` were unconditionally selected within `BOARD_GOOGLE_BLUEY_COMMON`. These selections are now moved under the new `MAINBOARD_HAS_GOOGLE_TPM` boolean option, which defaults to disabled. This change allows for more granular control over enabling Google TPM (aka GSC) support, making it optional for Bluey configurations. As Bluey (Qualcomm CRD) lacks a Google TPM (GSC), the new `MAINBOARD_HAS_GOOGLE_TPM` option defaults to 'n'. This ensures GSC-related features (including `I2C_TPM`, `MAINBOARD_HAS_TPM2`, and `TPM_GOOGLE_TI50`) are not selected by default for Bluey, aligning the Kconfig with the hardware capabilities. BUG=b:404985109 TEST=Able to build google/bluey. Ensure `VBOOT_MOCK_SECDATA` Kconfig is default enabled for Bluey. Change-Id: Idc3d998bfc5a747a3068e87fd2f503190a0c1f3f Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/87676 Tested-by: build bot (Jenkins) Reviewed-by: Kapil Porwal --- src/mainboard/google/bluey/Kconfig | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/bluey/Kconfig b/src/mainboard/google/bluey/Kconfig index f1e2648af6..059708fbd0 100644 --- a/src/mainboard/google/bluey/Kconfig +++ b/src/mainboard/google/bluey/Kconfig @@ -7,9 +7,7 @@ config BOARD_GOOGLE_BLUEY_COMMON select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_RTC select EC_GOOGLE_CHROMEEC_SPI - select I2C_TPM select MAINBOARD_HAS_CHROMEOS - select MAINBOARD_HAS_TPM2 select RTC select SOC_QUALCOMM_X1P42100 select SPI_FLASH @@ -17,7 +15,6 @@ config BOARD_GOOGLE_BLUEY_COMMON select SPI_FLASH_GIGADEVICE select SPI_FLASH_MACRONIX select SPI_FLASH_WINBOND - select TPM_GOOGLE_TI50 config BOARD_GOOGLE_BASEBOARD_BLUEY def_bool n @@ -59,6 +56,15 @@ config MAINBOARD_HAS_SD_CONTROLLER help Enable this option if your mainboard is equipped with SD card controller. +config MAINBOARD_HAS_GOOGLE_TPM + bool + default n + select I2C_TPM + select MAINBOARD_HAS_TPM2 + select TPM_GOOGLE_TI50 + help + Enable this option if your mainboard is equipped with Google TPM aka GSC. + config MAINBOARD_VENDOR string default "Google"