From ba228d160f766e507f0c542cd97362a8b0a23ce2 Mon Sep 17 00:00:00 2001 From: Ivy Jian Date: Thu, 31 Jul 2025 15:46:04 +0800 Subject: [PATCH] mb/google/fatcat: Create new kinmen4es variant This new variant will support PTL pre-production silicon. The existing `kinmen` variant will support production silicon. BUG=b:434847748 TEST=Able to build google/kinmen4es. Change-Id: If0597c1b63179e46a83286f2d46f958189f627cc Signed-off-by: Ivy Jian Reviewed-on: https://review.coreboot.org/c/coreboot/+/88622 Reviewed-by: YH Lin Tested-by: build bot (Jenkins) Reviewed-by: Pranava Y N --- src/mainboard/google/fatcat/Kconfig | 23 +++++++++++++------ src/mainboard/google/fatcat/Kconfig.name | 3 +++ .../baseboard/fatcat/include/baseboard/gpio.h | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/mainboard/google/fatcat/Kconfig b/src/mainboard/google/fatcat/Kconfig index e0377cabaa..372b27ccd1 100644 --- a/src/mainboard/google/fatcat/Kconfig +++ b/src/mainboard/google/fatcat/Kconfig @@ -73,6 +73,13 @@ config BOARD_GOOGLE_MODEL_FELINO select DRIVERS_SOUNDWIRE_ALC1320 select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD +config BOARD_GOOGLE_MODEL_KINMEN + def_bool n + select BOARD_GOOGLE_BASEBOARD_FATCAT + select FSP_UGOP_EARLY_SIGN_OF_LIFE + select HAVE_SLP_S0_GATE + select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD + config BOARD_GOOGLE_FATCAT select BOARD_GOOGLE_MODEL_FATCAT select EC_GOOGLE_CHROMEEC_MEC @@ -117,10 +124,12 @@ config BOARD_GOOGLE_FRANCKA select HAVE_SLP_S0_GATE select SOC_INTEL_PANTHERLAKE_PRE_PRODUCTION_SILICON +config BOARD_GOOGLE_KINMEN4ES + select BOARD_GOOGLE_MODEL_KINMEN + select SOC_INTEL_PANTHERLAKE_PRE_PRODUCTION_SILICON + config BOARD_GOOGLE_KINMEN - select BOARD_GOOGLE_BASEBOARD_FATCAT - select HAVE_SLP_S0_GATE - select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD + select BOARD_GOOGLE_MODEL_KINMEN if BOARD_GOOGLE_FATCAT_COMMON @@ -158,7 +167,7 @@ config DRIVER_TPM_I2C_BUS default 0x03 if BOARD_GOOGLE_MODEL_FATCAT default 0x01 if BOARD_GOOGLE_FRANCKA default 0x01 if BOARD_GOOGLE_MODEL_FELINO - default 0x03 if BOARD_GOOGLE_KINMEN + default 0x03 if BOARD_GOOGLE_MODEL_KINMEN config HAVE_SLP_S0_GATE def_bool n @@ -174,7 +183,7 @@ config MAINBOARD_PART_NUMBER default "Fatcat" if BOARD_GOOGLE_MODEL_FATCAT default "Francka" if BOARD_GOOGLE_FRANCKA default "Felino" if BOARD_GOOGLE_MODEL_FELINO - default "Kinmen" if BOARD_GOOGLE_KINMEN + default "Kinmen" if BOARD_GOOGLE_MODEL_KINMEN config MEMORY_SOLDERDOWN def_bool n @@ -186,7 +195,7 @@ config TPM_TIS_ACPI_INTERRUPT default 47 if BOARD_GOOGLE_MODEL_FATCAT # GPE0_DW1_15 (GPP_D15) default 79 if BOARD_GOOGLE_MODEL_FELINO # GPE0_DW2_15 (GPP_F15) default 11 if BOARD_GOOGLE_FRANCKA # GPE0_DW0_11 (GPP_H11) - default 66 if BOARD_GOOGLE_KINMEN # GPE0_DW2_02 (GPP_E02) + default 66 if BOARD_GOOGLE_MODEL_KINMEN # GPE0_DW2_02 (GPP_E02) # FIXME: update as per board schematics config UART_FOR_CONSOLE @@ -201,7 +210,7 @@ config VARIANT_DIR default "fatcat" if BOARD_GOOGLE_MODEL_FATCAT default "francka" if BOARD_GOOGLE_FRANCKA default "felino" if BOARD_GOOGLE_MODEL_FELINO - default "kinmen" if BOARD_GOOGLE_KINMEN + default "kinmen" if BOARD_GOOGLE_MODEL_KINMEN config OVERRIDE_DEVICETREE default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" diff --git a/src/mainboard/google/fatcat/Kconfig.name b/src/mainboard/google/fatcat/Kconfig.name index 14ad4c1f6a..b7090069d4 100644 --- a/src/mainboard/google/fatcat/Kconfig.name +++ b/src/mainboard/google/fatcat/Kconfig.name @@ -32,5 +32,8 @@ config BOARD_GOOGLE_FELINO4ES config BOARD_GOOGLE_FRANCKA bool "-> Francka" +config BOARD_GOOGLE_KINMEN4ES + bool "-> Kinmen4ES" + config BOARD_GOOGLE_KINMEN bool "-> Kinmen" diff --git a/src/mainboard/google/fatcat/variants/baseboard/fatcat/include/baseboard/gpio.h b/src/mainboard/google/fatcat/variants/baseboard/fatcat/include/baseboard/gpio.h index 8c7121c1d8..f0a91b0ff7 100644 --- a/src/mainboard/google/fatcat/variants/baseboard/fatcat/include/baseboard/gpio.h +++ b/src/mainboard/google/fatcat/variants/baseboard/fatcat/include/baseboard/gpio.h @@ -32,7 +32,7 @@ #define GPIO_PCH_WP GPP_C08 /* Used to gate SoC's SLP_S0# signal */ #define GPIO_SLP_S0_GATE GPP_D03 -#elif CONFIG(BOARD_GOOGLE_KINMEN) +#elif CONFIG(BOARD_GOOGLE_MODEL_KINMEN) #define EC_SYNC_IRQ GPP_E07_IRQ #define GPIO_PCH_WP GPP_D02 /* Used to gate SoC's SLP_S0# signal */