From 6364bd827c4f982b46720ba9debe15947ccf862d Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Sun, 16 Mar 2025 15:42:40 -0500
Subject: [PATCH] mb/google/sarien: Update VBT for both variants

Arcada and Sarien use different VBTs in the current stock ChromeOS
firmware, so use the correct VBT for each. Files taken from images
Google_Sarien.12200.222.0.bin and Google_Arcada.12200.103.0.bin.

Change-Id: I0b07fadd34f84889c8bb186a9a22ed1bce36d6b1
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86906
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
---
 src/mainboard/google/sarien/Kconfig           |   5 -----
 .../google/sarien/variants/arcada/data.vbt    | Bin 0 -> 4608 bytes
 .../sarien/{ => variants/sarien}/data.vbt     | Bin 6144 -> 4608 bytes
 3 files changed, 5 deletions(-)
 create mode 100644 src/mainboard/google/sarien/variants/arcada/data.vbt
 rename src/mainboard/google/sarien/{ => variants/sarien}/data.vbt (75%)

diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index 8dab0e0a82..c0c5e02387 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -103,11 +103,6 @@ config VBOOT
 	select HAS_RECOVERY_MRC_CACHE
 	select VBOOT_LID_SWITCH
 
-# Override the default variant behavior, since the data.vbt is the same
-# for all variants.
-config INTEL_GMA_VBT_FILE
-	default "src/mainboard/\$(MAINBOARDDIR)/data.vbt"
-
 config FMDFILE
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/default.fmd" if !CHROMEOS
 
diff --git a/src/mainboard/google/sarien/variants/arcada/data.vbt b/src/mainboard/google/sarien/variants/arcada/data.vbt
new file mode 100644
index 0000000000000000000000000000000000000000..99968705ee185afa191c9b8d65bf794b04eaaaad
GIT binary patch
literal 4608
zcmeHKZERCz6h61NpYOf5y}cvQRh);9KsVWTJ7C~4!tL6Pm33>oj%AA`>!4K^3me-o
zLrExc8WKO!1T|<-_tW4X5`P*K5@RGWDv1&QNaT;v5KYwJFFxwIA6sD)S4luIoc6ru
zyyu=i?>X<seNWd9b_`&qXE+h*=|qcipu(vC2Wpp6M?9GsiA4q?BOQrkv<EN3N>Keb
zE(7E^u2u}IYB+viI$sF&*Ar|4d&l>V74pro{M0kk;}e*Q#xb&QU%rr^9G%YRFf+I-
zf;y(eIu4B$a@coh|K9v$8xoL8-WcA}w0R3+xVeSCYIrNDYFoIqZR=wai*-hmy{UL2
zG7wMpVX_}%@k}I>>Fn)D3}dQ4*&XkQ4|K*Pwva}2eB$ur*i%nWV<=jWEi^`>0cwPd
z(ecTNCX5sc*suFcVSj!qKlyAv*Ca6=<Se-D902D4p9UOUZvirZTLU+OTL!xZb_BZ&
z8iFPR%HRgD184vUAnQTMVB5jj$hOf9&VX*2CxYh<UDKT{A~d*=1zC3gPEb1O!yAgs
zp{Y=hhO^x49^;`tu+7vsG!)$z>0_d;wA@ITgQ^^wis5F4DnrO}6HF*VxW#SWdQT-!
znOu90hSW1M1g8^#ms8<@rw)>Q2#)YJc!}Q*4fb;&dk{8zWauIuCjQ#N;3Dyl#J>?=
zC3ZL&_=szX*AX`oZzGNn_Ym(P9w8nhb{>LjWm^$k#_&bXl73TyY=_tCp?J!&pR(+p
zUun^am?Z^E8pbM`a@pmA8|5zpP%gW7=n-gyKxuO^3#r?Z2}AOH%IXi0)aPo*>X*x&
zEOl+h2Dw`;`y6OPn^Z2}@0wTxyXhqI?)KT$MlO2*uD&PnFaykQ9Za$-;{2vGoL0OG
z&Y+pPtKF1K+kf*(P=7N#^t0`}i@|x<74CS=&DwX4rMAEFyZbhM*5qYA=FHMovtA2k
z|3Uj;25y~!)!lHxQ!L@7hh=wmt@*6(&Mc2Sp<m~2dNF8#q>9iDAqYSW*24<OLdvM0
z-18T4C64M$h~P7>?#d4rYoQ>4Pc62>X(E97*MW~R9AnD!jJ?S41Eze;*k=rXVM>`X
zkATgB5)oLBfCmNT1%bUP;D>_psldJx@DD+8iOetJHc^R-EF<D!QF&QpZ;1GjsC*%^
zZ$-Q=Dn5zTO1M)}(h_@I!ef$hLSpYo_=%)^BeCx#ba<6jUbe=IyS&P<m+kXP4T_^^
zyTld!UZeJKPm1*J8M29nyu!&O9lnip%Pn1$)}x$xyhY@PY|A6e`4GZGt1(nuVa`!q
z>rwN<qqU;f`SJ+4TF@e}K@A*lH4y@>M|rbkqA<a(BeYZDbo(sS1~{1pRZ}Nw7Gj_u
z>bf}N2v&tKgXy5G$u}WzCC5KNc)xk(QaZRn8#-Bufh#!;1kHJ-iWs_gYU<uIEt+<=
zg5WeOAaT%9%}hSIX7F?x>eQ~1wHEqJmW;cTLaAmRjx?3#vcWn{MQbf+HSHy%LKTay
zYO)Bm7w0C<tRsX5J$C>?aFmQXMVxcYR<R%6uAe)fo?WY^-deSQz=Kg9i<+|<1hqjs
zmz~Y2fwWl<>M`)N9f|IAPZ|i4iQvF0vbY?CxfHHaMKxN<qD1GBVko+{8~Z`u<hS3|
zwzgv6;PysssIjsZJowBQ=%3B<=b~PNY!Pa*vh1(KKrc}}hD29tBsF><U+5d%pZ_0p
z%mn|gee@VOcb}sg{q)^y%Ztdih&HW+SGp+3I92X@=<>?JChkr6iH9bYgX0Tyf2ihU
V&;Rkb=W?@$E-L+i(<%Co)1Sn2%O3y$

literal 0
HcmV?d00001

diff --git a/src/mainboard/google/sarien/data.vbt b/src/mainboard/google/sarien/variants/sarien/data.vbt
similarity index 75%
rename from src/mainboard/google/sarien/data.vbt
rename to src/mainboard/google/sarien/variants/sarien/data.vbt
index f9c498e45c3e31f24dac26e43a3f8e653826ba8c..0fb57722a22d10198bc05e4fc2cc6c831b582723 100644
GIT binary patch
delta 6
NcmZoLXi!-o1ONxL0tWy9

delta 21
WcmZorX)stIwD|!WKNF02#0UUZGY8iI