From c049dcc271fff0a38c2c25a51589bd215c683697 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Wed, 18 Mar 2026 20:50:30 -0500 Subject: [PATCH] mb/google/brya: Set correct SYSTEM_TYPE for all variants Set SYSTEM_TYPE_CONVERTIBLE for Brya 360/flip variants so SMBIOS reports a convertible enclosure type. This allows non-ChromeOS builds to enable EC_CHROMEEC_USE_VENDOR_TABLET_CONTROLS and use the vendor tablet mode ACPI (VBTN). Change-Id: I84bfd1df72d24b717f2b89906fd8dd2bef38d2b5 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/91746 Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai --- src/mainboard/google/brya/Kconfig | 41 ++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index c7fad434f4..1084aa42ba 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -55,7 +55,7 @@ config BOARD_GOOGLE_BASEBOARD_BRYA select HAVE_SLP_S0_GATE select MEMORY_SOLDERDOWN if !BOARD_GOOGLE_BANSHEE select SOC_INTEL_ALDERLAKE_PCH_P - select SYSTEM_TYPE_LAPTOP + select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_CONVERTIBLE select TPM_GOOGLE_CR50 config BOARD_GOOGLE_BASEBOARD_BRASK @@ -103,7 +103,7 @@ config BOARD_GOOGLE_BASEBOARD_NISSA select SOC_INTEL_ALDERLAKE_PCH_N select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW select SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE - select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_MINIPC + select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_MINIPC && !SYSTEM_TYPE_CONVERTIBLE select TPM_GOOGLE_TI50 select SOC_INTEL_COMMON_MMC_OVERRIDE @@ -124,7 +124,7 @@ config BOARD_GOOGLE_BASEBOARD_TRULO select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW select SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE select SOC_INTEL_TWINLAKE - select SYSTEM_TYPE_LAPTOP + select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_CONVERTIBLE select TPM_GOOGLE_TI50 config BOARD_GOOGLE_AGAH @@ -206,11 +206,13 @@ config BOARD_GOOGLE_CRAASK select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG select HAVE_WWAN_POWER_SEQUENCE select INTEL_GMA_HAVE_VBT + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_CRAASKOV select BOARD_GOOGLE_BASEBOARD_NISSA - select INTEL_GMA_HAVE_VBT select CHROMEOS_WIFI_SAR if CHROMEOS + select INTEL_GMA_HAVE_VBT + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_CONSTITUTION select BOARD_GOOGLE_BASEBOARD_BRASK @@ -227,6 +229,7 @@ config BOARD_GOOGLE_CROTA select HAVE_WWAN_POWER_SEQUENCE select INTEL_GMA_HAVE_VBT select SOC_INTEL_RAPTORLAKE + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_DIRKS select BOARD_GOOGLE_BASEBOARD_NISSA @@ -241,6 +244,7 @@ config BOARD_GOOGLE_DOCHI select CHROMEOS_WIFI_SAR if CHROMEOS select DRIVERS_INTEL_ISH select SOC_INTEL_RAPTORLAKE + select SYSTEM_TYPE_CONVERTIBLE select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS config BOARD_GOOGLE_DOMIKA @@ -258,6 +262,7 @@ config BOARD_GOOGLE_FELWINTER select DRIVERS_GENERIC_GPIO_KEYS select DRIVERS_GENESYSLOGIC_GL9755 select INTEL_GMA_HAVE_VBT + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_GAELIN select BOARD_GOOGLE_BASEBOARD_BRASK @@ -270,6 +275,7 @@ config BOARD_GOOGLE_GIMBLE select GOOGLE_DSM_CALIB if VPD select GOOGLE_DSM_PARAM_FILE_NAME if VPD select INTEL_GMA_HAVE_VBT + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_GIMBLE4ES select BOARD_GOOGLE_BASEBOARD_BRYA @@ -278,6 +284,7 @@ config BOARD_GOOGLE_GIMBLE4ES select DRIVERS_I2C_MAX98390 select GOOGLE_DSM_CALIB if VPD select GOOGLE_DSM_PARAM_FILE_NAME if VPD + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_GLADIOS select BOARD_GOOGLE_BASEBOARD_BRASK @@ -306,6 +313,7 @@ config BOARD_GOOGLE_GOTHRAX select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER select HAVE_WWAN_POWER_SEQUENCE select CHROMEOS_WIFI_SAR if CHROMEOS + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_GUREN select BOARD_GOOGLE_BASEBOARD_NISSA @@ -334,6 +342,7 @@ config BOARD_GOOGLE_KALADIN select SOC_INTEL_COMMON_BLOCK_HDA_VERB select SOC_INTEL_TCSS_USE_PDC_PMC_USBC_MUX_CONFIGURATION select SOC_INTEL_TWINLAKE + select SYSTEM_TYPE_CONVERTIBLE select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS config BOARD_GOOGLE_KANO @@ -346,6 +355,7 @@ config BOARD_GOOGLE_KANO select INTEL_GMA_HAVE_VBT select SOC_INTEL_COMMON_BLOCK_IPU select SOC_INTEL_RAPTORLAKE + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_KINOX select BOARD_GOOGLE_BASEBOARD_BRASK @@ -371,6 +381,7 @@ config BOARD_GOOGLE_JOXER select CHROMEOS_WIFI_SAR if CHROMEOS select DRIVERS_GENESYSLOGIC_GL9750 select INTEL_GMA_HAVE_VBT + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_LISBON select BOARD_GOOGLE_BASEBOARD_BRASK @@ -402,6 +413,7 @@ config BOARD_GOOGLE_MITHRAX select DRIVERS_GENERIC_GPIO_KEYS select DRIVERS_GENESYSLOGIC_GL9755 select INTEL_GMA_HAVE_VBT + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_MOLI select BOARD_GOOGLE_BASEBOARD_BRASK @@ -490,6 +502,7 @@ config BOARD_GOOGLE_PUJJO select DRIVERS_GENERIC_BAYHUB_LV2 select DRIVERS_GENERIC_GPIO_KEYS select DRIVERS_GENESYSLOGIC_GL9750 + select SYSTEM_TYPE_CONVERTIBLE select DRIVERS_I2C_SX9324 select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER select DRIVERS_WWAN_FM350GL @@ -512,6 +525,7 @@ config BOARD_GOOGLE_PUJJOGA select ENFORCE_MEM_CHANNEL_DISABLE select HAVE_WWAN_POWER_SEQUENCE select INTEL_GMA_HAVE_VBT + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_PUJJOGATWIN select BOARD_GOOGLE_BASEBOARD_NISSA @@ -523,33 +537,36 @@ config BOARD_GOOGLE_PUJJOGATWIN select HAVE_WWAN_POWER_SEQUENCE select INTEL_GMA_HAVE_VBT select SOC_INTEL_TWINLAKE + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_PUJJOLO select BOARD_GOOGLE_BASEBOARD_TRULO select CHROMEOS_WIFI_SAR if CHROMEOS - select DRIVERS_GENERIC_GPIO_KEYS - select DRIVERS_INTEL_MIPI_CAMERA - select DRIVERS_I2C_SX9324 select DRIVERS_GENERIC_BAYHUB_LV2 + select DRIVERS_GENERIC_GPIO_KEYS select DRIVERS_GFX_GENERIC + select DRIVERS_I2C_SX9324 select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER + select DRIVERS_INTEL_MIPI_CAMERA select ENFORCE_MEM_CHANNEL_DISABLE select HAVE_WWAN_POWER_SEQUENCE select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD select SOC_INTEL_COMMON_BLOCK_HDA_VERB select SOC_INTEL_TCSS_USE_PDC_PMC_USBC_MUX_CONFIGURATION select SOC_INTEL_TWINLAKE + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_PUJJONIRU select BOARD_GOOGLE_BASEBOARD_NISSA select BOARD_ROMSIZE_KB_16384 select CHROMEOS_WIFI_SAR if CHROMEOS + select DRIVERS_AUDIO_SOF select DRIVERS_GENERIC_BAYHUB_LV2 select DRIVERS_GENERIC_GPIO_KEYS - select DRIVERS_AUDIO_SOF select ENFORCE_MEM_CHANNEL_DISABLE select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD select SOC_INTEL_TWINLAKE + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_PUJJOCENTO select BOARD_GOOGLE_BASEBOARD_TRULO @@ -592,6 +609,7 @@ config BOARD_GOOGLE_REDRIX select GOOGLE_DSM_PARAM_FILE_NAME if VPD select INTEL_GMA_HAVE_VBT select SOC_INTEL_COMMON_BLOCK_IPU + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_REDRIX4ES select BOARD_GOOGLE_BASEBOARD_BRYA @@ -603,6 +621,7 @@ config BOARD_GOOGLE_REDRIX4ES select GOOGLE_DSM_CALIB if VPD select GOOGLE_DSM_PARAM_FILE_NAME if VPD select SOC_INTEL_COMMON_BLOCK_IPU + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_RIVEN select BOARD_GOOGLE_BASEBOARD_NISSA @@ -614,6 +633,7 @@ config BOARD_GOOGLE_RIVEN select INTEL_GMA_HAVE_VBT select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD select SOC_INTEL_TWINLAKE + select SYSTEM_TYPE_CONVERTIBLE select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS config BOARD_GOOGLE_RULL @@ -657,6 +677,7 @@ config BOARD_GOOGLE_TAEKO select DRIVERS_GENESYSLOGIC_GL9763E_L1_MAX if DRIVERS_GENESYSLOGIC_GL9763E select INTEL_GMA_HAVE_VBT select SOC_INTEL_RAPTORLAKE + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_TAEKO4ES select BOARD_GOOGLE_BASEBOARD_BRYA @@ -665,6 +686,7 @@ config BOARD_GOOGLE_TAEKO4ES select DRIVERS_GENERIC_BAYHUB_LV2 select DRIVERS_GENESYSLOGIC_GL9750 select DRIVERS_GENESYSLOGIC_GL9763E + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_TANIKS select BOARD_GOOGLE_BASEBOARD_BRYA @@ -749,8 +771,8 @@ config BOARD_GOOGLE_ULDRENITE config BOARD_GOOGLE_VELL select BOARD_GOOGLE_BASEBOARD_BRYA select CHROMEOS_WIFI_SAR if CHROMEOS - select DRIVERS_INTEL_MIPI_CAMERA select DRIVERS_I2C_CS35L53 + select DRIVERS_INTEL_MIPI_CAMERA select INTEL_GMA_HAVE_VBT select SOC_INTEL_COMMON_BASECODE_RAMTOP select SOC_INTEL_COMMON_BLOCK_IPU @@ -770,6 +792,7 @@ config BOARD_GOOGLE_XIVU select DRIVERS_GENESYSLOGIC_GL9750 select DRIVERS_INTEL_MIPI_CAMERA select INTEL_GMA_HAVE_VBT + select SYSTEM_TYPE_CONVERTIBLE config BOARD_GOOGLE_XOL select BOARD_GOOGLE_BASEBOARD_BRYA