From 644b0f5f454eec6476de9dbd73aaf058e12c57c0 Mon Sep 17 00:00:00 2001 From: Mike Shih Date: Wed, 14 Dec 2022 16:02:50 +0800 Subject: [PATCH] mb/google/brya/var/gaelin: Use RPL FSP headers Select SOC_INTEL_RAPTORLAKE to force coreboot to use the RPL FSP headers for FSP. Since we use RPL FSP and it will support ADL as well, we rename "Gaelin4ADL" to "Gaelin". BUG=b:258603624 BRANCH=firmware-brya-14505.B TEST=emerge-brask coreboot Cq-Depend: chrome-internal:5227091, chromium:4113361 Change-Id: Ie7349f3670aeec166228e7df55300cd30d0ca16c Signed-off-by: Mike Shih Reviewed-on: https://review.coreboot.org/c/coreboot/+/70746 Tested-by: build bot (Jenkins) Reviewed-by: Derek Huang Reviewed-by: Nick Vaccaro --- src/mainboard/google/brya/Kconfig | 6 +++--- src/mainboard/google/brya/Kconfig.name | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index 1fb78c01d5..bc754beefb 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -152,7 +152,7 @@ config DRIVER_TPM_I2C_BUS default 0x1 if BOARD_GOOGLE_LISBON default 0x1 if BOARD_GOOGLE_GLADIOS default 0x1 if BOARD_GOOGLE_MARASOV - default 0x1 if BOARD_GOOGLE_GAELIN4ADL + default 0x1 if BOARD_GOOGLE_GAELIN config DRIVER_TPM_I2C_ADDR hex @@ -216,7 +216,7 @@ config MAINBOARD_PART_NUMBER default "Joxer" if BOARD_GOOGLE_JOXER default "Pujjo" if BOARD_GOOGLE_PUJJO default "Xivu" if BOARD_GOOGLE_XIVU - default "Gaelin4ADL" if BOARD_GOOGLE_GAELIN4ADL + default "Gaelin" if BOARD_GOOGLE_GAELIN default "Yaviks" if BOARD_GOOGLE_YAVIKS default "Lisbon" if BOARD_GOOGLE_LISBON default "Zydron" if BOARD_GOOGLE_ZYDRON @@ -257,7 +257,7 @@ config VARIANT_DIR default "joxer" if BOARD_GOOGLE_JOXER default "pujjo" if BOARD_GOOGLE_PUJJO default "xivu" if BOARD_GOOGLE_XIVU - default "gaelin" if BOARD_GOOGLE_GAELIN4ADL + default "gaelin" if BOARD_GOOGLE_GAELIN default "yaviks" if BOARD_GOOGLE_YAVIKS default "lisbon" if BOARD_GOOGLE_LISBON default "zydron" if BOARD_GOOGLE_ZYDRON diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name index 8e38735215..72685013fa 100644 --- a/src/mainboard/google/brya/Kconfig.name +++ b/src/mainboard/google/brya/Kconfig.name @@ -275,9 +275,10 @@ config BOARD_GOOGLE_XIVU select DRIVERS_GENESYSLOGIC_GL9750 select DRIVERS_INTEL_MIPI_CAMERA -config BOARD_GOOGLE_GAELIN4ADL - bool "-> Gaelin4ADL" +config BOARD_GOOGLE_GAELIN + bool "-> Gaelin" select BOARD_GOOGLE_BASEBOARD_BRASK + select SOC_INTEL_RAPTORLAKE config BOARD_GOOGLE_YAVIKS bool "-> Yaviks"