From adf21da26429855ba516c383dd946171db3eb2b1 Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Sat, 12 Mar 2022 11:14:17 -0600
Subject: [PATCH] mb/google/volteer: add VBTs for lindar variant

Add VBT data files, ensure secondary VBTs compiled in as needed,
select INTEL_GMA_HAVE_VBT.

TEST=build/boot lindar variant with FSP/GOP display init, edk2 payload

Change-Id: I81022670fabda7994e292d333c999b508e61b469
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68465
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <inforichland@gmail.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/mainboard/google/volteer/Kconfig             |   1 +
 .../google/volteer/variants/lindar/Makefile.inc  |   2 ++
 .../google/volteer/variants/lindar/data-oled.vbt | Bin 0 -> 8704 bytes
 .../google/volteer/variants/lindar/data.vbt      | Bin 0 -> 8704 bytes
 4 files changed, 3 insertions(+)
 create mode 100644 src/mainboard/google/volteer/variants/lindar/data-oled.vbt
 create mode 100644 src/mainboard/google/volteer/variants/lindar/data.vbt

diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 926a0ca4b1..51210e44ed 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -55,6 +55,7 @@ config BOARD_GOOGLE_LINDAR
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_I2C_RT1011
 	select INTEL_CAR_NEM
+	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_MALEFOR
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/mainboard/google/volteer/variants/lindar/Makefile.inc b/src/mainboard/google/volteer/variants/lindar/Makefile.inc
index 22bcbd7727..82518a503e 100644
--- a/src/mainboard/google/volteer/variants/lindar/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/lindar/Makefile.inc
@@ -7,3 +7,5 @@ romstage-y += memory.c
 ramstage-y += gpio.c
 
 ramstage-$(CONFIG_FW_CONFIG) += variant.c
+
+$(call add_vbt_to_cbfs, vbt-oled.bin, data-oled.vbt)
diff --git a/src/mainboard/google/volteer/variants/lindar/data-oled.vbt b/src/mainboard/google/volteer/variants/lindar/data-oled.vbt
new file mode 100644
index 0000000000000000000000000000000000000000..dfeea359f9c0127338e0f1f8f42cb68a3202f90b
GIT binary patch
literal 8704
zcmeHMO-vg{6n?YoT|3TFj6jJ)6FQKH7#d)45|<!LSz{n^0>L(fI#MMJvD=_H!39#$
zABnBRf!<cCRFSk*tV&fYPW046FI-w7^<uSB)I$#(qbO1@IVN@A%&zTh5Q)<?O^Ezf
zZ)SGhH*em1Gdnx8duY6GjE+T44aA2+X9p;!6sYiVa{$w=)E5~Uo#+pZg(mujM#5+5
zUDyL>n*Y87kRoKC(ygl9k*o9Rj4$3shi9gyGwH7W^xWn7nJkTlBQ$jJVmgzaot#gn
z=;-*V5M}ym+<n)kGbwuR+LfvFY%fJ6DxzukvCgB%DD}V9r5^3_tKG*@(%T*AJ$|Cb
z-9Hc>8IDGVLSvDUb95w5`y->F(b0k7zM%^=8Xq|w>5GgF^w+p;E`(>YAI?s{cWIvb
z!fn)#{d91>++-S_nay_6P$om;3^PaL>ACdm2kBI2jhiW22bY5Y5D9A6fxv@4@PG>(
z$Qm+5X7>UzK?Z`1Qa~x76i^B%MFFyz;C+e+h&k*6*~_Yngx!g}tnsF1H3hvWxAMKk
zdyfs~fLlrMc;HLQ`UG&A9is_^^4`s68p{y&V;N?4YKKwy<r0JaZozh$tpQX^o7KpI
z{bj*+7hzEwOt4_Pn>`#*Q-mdLFk-<DTd>+9ENg@DIHGM~3syt{*kJcRLV@Ku0m6s{
zLo36r(oJz=OI?@bh7-tP<YDBuktdNaBVR*aME(r<bL6j)zeD~3`6uL`k$0s~rND>&
zd8MmJ?q8ua+Y5!F7dy42)WaEkdPG-nX+QVnJV4=Q!z#$;EjWWk7q{jwhwODl%sbtX
zcitn*^)F{>Yv{JCDHQ4~+73~zuSVc;5%4vEAkNtkY}sODR<@5xy0A&~y4U#2&o!&y
zvy%`Mp5G%L%%$4HP$=Bmr5kkffX9_=F<UkT7I9T)Wrd0f;mI0uwG_G&`>9WFC}}X)
zW>DCw^JERFeV~P)RrM|hOby<^qG-Oe(M)hK4MBV{ZtsQK4l6NGH8opbvH=^iva%pG
zR-|Ep#u`1E=OGQmke))r_gxE{vBp*{u~N2y7&6zO$!itZaQdXCPObShZN02PW*ZLl
zVqB^ulJ7Q;ug0KB9W<=5V39P~<_XZ0O5*TIr;$rGHfbug#scSq!{FN#MR!)>g)gY*
zvTFxXLp$pi05wPkf1N5hX{mzwaHB1kk1e&R(d*Wp3^j<r_dtp!SE4~}*EW(%Db*X}
zbAa0*;&ep%w{w!)z&BVpCus#<+-Zbdl<rj(HO%@oZ7}e8L>qKx51$Wgl5an&g<jqJ
zeou#%=qQhc2z>XZ;I3GH@^jIqK~jhMq{mao`nBS~H;c;9V00onc{QCmH+d!f3f!0u
zKHv1sIwGIh06DSx{L;cBBnXo5FtP3EvoKqco`qeH(2-uaJBT_XxMe;MQAoiN@&()$
z@#SI?n#*a=BgE=ERRYT;+8IT2iWN@<|9gIvEyiqF!?ojB022eBXTG$VhLzGn;Uq>F
zfGwiT$~=FQm~Cqp-#FQT1I7k!I|>HD<)3aH3=lXtebtYLxd~qo{0QeqKFq5<mt$9r
z_J2Ra?h*4^u7CPcd1UM*nN!biQ2JP6m+#=a6LGg(`ckxm{ivE=jX*U5)d*B0P>nz}
z0@VmqBk%$v(EE+BAKsY)&;<iOIwfI~9I*btvER4=+E)Nn1mXi75{M<{cULaE{Qv<D
zjd)=h&#SF?WR<xqI;NZ7;#X#Ag{Y84jEe2>EQ_>`%w!7^B_5PDIy^R+@h6jQk_4=v
ztkovVF9@K?s-U5kHHY6OyFW}|Tv{cAV4y8cC^Nqe>e$~Oc>;!<0~ILhY%1Bgjxytd
z0J_tZtvL>&@8+*TCUfKn<fJ@_!gW{@TTrKY#%40+gC=i)7h)(&F*LI2-*$0XNBN-|
z7MC0z>CqZ-FSaVjrJ<kM;zi#(pvTc+v-8HM_(R-<|Elo<xgKrdU-5Z7A2)ulf(*m<
G;^`kxxN9x|

literal 0
HcmV?d00001

diff --git a/src/mainboard/google/volteer/variants/lindar/data.vbt b/src/mainboard/google/volteer/variants/lindar/data.vbt
new file mode 100644
index 0000000000000000000000000000000000000000..2b48ae097861a465ed639c875c0942e46973adaa
GIT binary patch
literal 8704
zcmeHMK};J*6#cVnFOItuM@ET56FQKH7#d*hB$OaaS=&J31cGe{b)-rdVmCo?zy(s#
zsuEj?1HG+OsUlIUSdpq$oaniSa%qLs9;_asO6`GT6!p+Uq+XJ`e`eQq7esKH(uT-?
z^=D@1zxnh3pV`@&-D9Jn5jqk%*B2iMUhJcsQlP-yrXMlgN}<Tm@K|qfBsdlt7z$sc
zzrz8TYWnjbK#Gt<vQJTbk*T?K#v5;?gVPg}nRI7wdiKWLbe2ZL5gNRDHJwS%jL)T0
zba?b!kTQL>&d{yNOp0E*b#o#;(?d~-f@tbH)p7C^rT#ZNm6M%*#djJdJ-)7<(`Ra(
zy?x=K!DwV4I1(AUM2F(EH!>U?9_||q4P2qo_|W-CC^FL5TkEvA5T4GyKQnpl`W*F!
zTd5!WY3F*m$uvAYlkK3vOoql8W|qd&v+0@l(y5MGCsVWr4jTa=cBoqe0#8EV0teWT
zRb-0H?geCm3<MdafKosypcGJw0%Rk>`xFrnbKC)vhgBB|yAyd?<xP!h3R+Qa<_C-S
zE(^>C_mkjq!MBw42~cBnj3yAudpDY?EJN5YWth>a6-MFv>kRgX3EOA122f0GW+M~k
zZZbN3r3i~!V1fzjG-0(xSkeL`ChVdKt1H5?78s8s+IG!^6;S{d*y9gSV0un~Fk-<_
z%W$)FS6tsx*J*dc8RRhXAo5$t<H$FVZy_%re~kPI^5@83B7cqi4f1!$`%<V<;6uM#
z=?aqb2Pn<<LZRrzUM<OPxPVWO=m;zx=Du78DBP`I0m-<9nn2OTt@(=~drcPeHBQLa
zJR(c(7qhfAblcSw3j0mk4pFVIM&M}?@HT@W&RP&`*<w_#Y#Xs_!Uoayzsg^Lju{!B
zpM)Uu{1I_sZm&BIg~I)Pnoc*4xE#r5qjh7~0<P?=EK@Nd?5rVIN5PjkOubrtNrSOI
zgUnW*oi(Hmff|Gs#k169Xz+9`h{k&x%>*0M5Wtt?_FgD$up9$LRkH4q4cL&C<#~HU
zMH=R5tih$a{-%NG_Gi%WRp<Ohtf56sESGH{y2Lf8(rN`ZoIk576RUnzT`Oyl*ro%$
z7`0at$#<GYS7Okp^y}tWut@4`0|jVGC2{z$L(e4}8dZgwV}bL*rt__etkqQFg*Tw(
zva3f?LmTTC05#Zk{z{c|_QeY3!=2V#KDOAbL~on>GSnaf-v`O6REY+qO<hkerW8+%
z&jD_Oh|>}2pUz2c1K(ufoTL?a@vs4MQF>63l`!kqutCS?5pB?Fy7_!ylYIMGE%a!f
zce~rwM0<HGMBqC(8F$9g&d)`w3P}yzNtbIs>(`8fi<RVo{^(eAd@7x}G=4Mv65KGS
zcAMVt5$VD@NQsr*OADJw*hFkg`aH~5q~~GBCfX_HCwkzwegs8uTYVX#kb)EBQ+Oca
z%f}#ehtq*g#OgZ~0!t;@8$}}^#goH-o}XlkHCy&@Z8_D2iH^@ZU-}HgN@<~R79$M6
z7FlLxp1)~~wsi}ypRLCMV*|Gx1p?skPqy@T5jZ+I<;Mfxm^T1^g!5w|=GC6dv8zV=
z-=ATRh;c2spS@Hb8EZ-6)cq5bKB!pbd-(25+$oj5ChcKAs-{;XP>nz}0@VmqBT$V%
zH3HQL{ErdnxhEWkw<iEJLC23$N!TDq%)fN(S1*A282}Z5ctL{%Vu|rxmdhSIL4Zvq
z9$3QjY6~7&CGLub>BblM723W`6v!e*!FG6-MOs5<vUxitE|fLcTo#%BE0b-I1T3Sh
z#Ujhk3!qAhprV#lo8KaPJV;>FzC!vzM_U?EW_&x;u)m-41av6}3Q*M9Sh8~sW%?BX
zv>HRUYCDR)8@~^k%$6gNv*$?^Zo{J3j5>`oHj^<QRB0VN5JOptp^**$wu{Re%8%8u
zxa9CikJg9>u~j)P^}Wm%5BlB?-L`g%op(OMpXLtypN$ttZnTAe<>&Ey+W5T;G7Q`9
F(q9vSY%Tx*

literal 0
HcmV?d00001