From 9868417d5ed764be23d568b6cfed726414a2c59d Mon Sep 17 00:00:00 2001 From: Kapil Porwal Date: Sat, 16 Aug 2025 00:45:37 +0530 Subject: [PATCH] mb/google/bluey: Refactor Kconfig for Hamoa SoC BUG=b:436402120 TEST=Build Google/Quenbi. Change-Id: Ia9cb040930be1609a9b2a0c9934b30e85386a2d6 Signed-off-by: Kapil Porwal Reviewed-on: https://review.coreboot.org/c/coreboot/+/88785 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik --- src/mainboard/google/bluey/Kconfig | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/mainboard/google/bluey/Kconfig b/src/mainboard/google/bluey/Kconfig index 356ec0705d..6e9cc6168d 100644 --- a/src/mainboard/google/bluey/Kconfig +++ b/src/mainboard/google/bluey/Kconfig @@ -4,7 +4,6 @@ config BOARD_GOOGLE_BLUEY_COMMON def_bool n select COMMON_CBFS_SPI_WRAPPER select MAINBOARD_HAS_CHROMEOS - select SOC_QUALCOMM_X1P42100 select SPI_FLASH select SPI_FLASH_FORCE_4_BYTE_ADDR_MODE @@ -12,14 +11,20 @@ config BOARD_GOOGLE_BASEBOARD_BLUEY def_bool n select BOARD_GOOGLE_BLUEY_COMMON -config BOARD_GOOGLE_BLUEY +config BOARD_GOOGLE_MODEL_BLUEY + def_bool n select BOARD_GOOGLE_BASEBOARD_BLUEY select BOARD_ROMSIZE_KB_65536 select MAINBOARD_HAS_FINGERPRINT_VIA_USB select MISSING_BOARD_RESET select SPI_FLASH_MACRONIX -config BOARD_GOOGLE_QUENBI +config BOARD_GOOGLE_BLUEY + select BOARD_GOOGLE_MODEL_BLUEY + select SOC_QUALCOMM_X1P42100 + +config BOARD_GOOGLE_MODEL_QUENBI + def_bool n select BOARD_GOOGLE_BASEBOARD_BLUEY select BOARD_ROMSIZE_KB_32768 select MAINBOARD_HAS_CHROME_EC @@ -27,6 +32,10 @@ config BOARD_GOOGLE_QUENBI select MAINBOARD_HAS_GOOGLE_TPM select SPI_FLASH_WINBOND +config BOARD_GOOGLE_QUENBI + select BOARD_GOOGLE_MODEL_QUENBI + select SOC_QUALCOMM_X1P42100 + if BOARD_GOOGLE_BLUEY_COMMON config MAINBOARD_DIR @@ -84,7 +93,7 @@ config MAINBOARD_VENDOR default "Google" config VBOOT - select VBOOT_NO_BOARD_SUPPORT if BOARD_GOOGLE_BLUEY + select VBOOT_NO_BOARD_SUPPORT if BOARD_GOOGLE_MODEL_BLUEY select VBOOT_VBNV_FLASH ########################################################## @@ -92,13 +101,13 @@ config VBOOT ########################################################## config MAINBOARD_PART_NUMBER - default "Bluey" if BOARD_GOOGLE_BLUEY - default "Quenbi" if BOARD_GOOGLE_QUENBI + default "Bluey" if BOARD_GOOGLE_MODEL_BLUEY + default "Quenbi" if BOARD_GOOGLE_MODEL_QUENBI config DRIVER_TPM_I2C_BUS depends on I2C_TPM hex - default 0xa if BOARD_GOOGLE_QUENBI + default 0xa if BOARD_GOOGLE_MODEL_QUENBI default 0x10 config DRIVER_TPM_I2C_ADDR @@ -107,13 +116,13 @@ config DRIVER_TPM_I2C_ADDR config EC_GOOGLE_CHROMEEC_SPI_BUS depends on EC_GOOGLE_CHROMEEC hex - default 0xd if BOARD_GOOGLE_QUENBI + default 0xd if BOARD_GOOGLE_MODEL_QUENBI default 0xb config MAINBOARD_GPIO_PIN_FOR_GSC_AP_INTERRUPT depends on TPM_GOOGLE_TI50 int - default 91 if BOARD_GOOGLE_QUENBI + default 91 if BOARD_GOOGLE_MODEL_QUENBI default 34 help This option specifies the GPIO pin number on the mainboard that is