commit 644b0f5f454eec6476de9dbd73aaf058e12c57c0
author Mike Shih <mikeshih@msi.corp-partner.google.com> Wed Dec 14 16:02:50 2022 +0800
committer Nick Vaccaro <nvaccaro@google.com> Wed Jan 04 00:48:17 2023 +0000
tree df2e3a20877cf120d2de0c0c41d45c29e5bc5b80
parent 7f5adef6342cfe9eae45e91c324350912e8604f3

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 <mikeshih@msi.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70746
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Derek Huang <derekhuang@google.com>
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>

src/mainboard/google/brya/Kconfig

diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 1fb78c0..bc754be 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -152,7 +152,7 @@
 	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 @@
 	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 @@
 	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

src/mainboard/google/brya/Kconfig.name

diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name
index 8e38735..7268501 100644
--- a/src/mainboard/google/brya/Kconfig.name
+++ b/src/mainboard/google/brya/Kconfig.name
@@ -275,9 +275,10 @@
 	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"