From 43df7b14ae760542ae6e85ab574c7ebd890927b2 Mon Sep 17 00:00:00 2001 From: John Su Date: Wed, 8 Oct 2025 17:48:20 +0800 Subject: [PATCH] mb/var/uldrenite: Fix ISH UART port and VR configuration mismatch During Uldrenite development, the ISH UART port design and VR settings were changed, so the switching mechanism was implemented based on the board ID. Uldrino adopts the latest Uldrenite design; however, its board ID starts from 0. To resolve this issue, an additional FW_CONFIG field is added to further distinguish between Uldrenite and Uldrino. BUG=b:450182476 TEST=Verified the ISH log and used the servod board to dump the CPU log for checking PMC Descriptor Record 7 at offset 0xC33. Change-Id: Id24659d6f910de1d3da36c5da808fd768dbdbc37 Signed-off-by: John Su Reviewed-on: https://review.coreboot.org/c/coreboot/+/89457 Reviewed-by: Paul Menzel Reviewed-by: Kapil Porwal Tested-by: build bot (Jenkins) Reviewed-by: Dtrain Hsu --- src/mainboard/google/brya/variants/uldrenite/variant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mainboard/google/brya/variants/uldrenite/variant.c b/src/mainboard/google/brya/variants/uldrenite/variant.c index c096e9fbbf..6cbd2d2657 100644 --- a/src/mainboard/google/brya/variants/uldrenite/variant.c +++ b/src/mainboard/google/brya/variants/uldrenite/variant.c @@ -136,7 +136,7 @@ void fw_config_gpio_padbased_override(struct pad_config *padbased_table) } /* b/415605630: Support different ISH UART mappings according the board id */ - if (board_version < 2) { + if (fw_config_probe(FW_CONFIG(SERIES, SERIES_ULDRENITE)) && board_version < 2) { /* Override ISH UART0 to ISH UART1 */ gpio_padbased_override(padbased_table, switch_ish_uart1_pads, ARRAY_SIZE(switch_ish_uart1_pads)); @@ -184,7 +184,7 @@ void variant_update_descriptor(void) uint32_t board_version = board_id(); /* b/404126972: Only this phase has M/B with both FIVR and MBVR. */ - if (board_version != 1) + if (fw_config_probe(FW_CONFIG(SERIES, SERIES_ULDRENITE)) && board_version != 1) return; /* VccanaVrLocation = "VCCANA is CPU FIVR" */