From 6b650811e500d78b91565d83ba5158d07a3672dd Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Mon, 15 Nov 2021 20:01:11 -0600
Subject: [PATCH] mb/google/dedede: add VBTs for drawcia, mangolor variants

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

TEST=build/boot drawcia, mangolor variants with FSP/GOP display
init and edk2 payload

Change-Id: I58a2ed59bd858ce772e92f6659d341036823b11a
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68464
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/dedede/Kconfig.name         |   2 ++
 .../google/dedede/variants/drawcia/Makefile.inc  |   2 ++
 .../google/dedede/variants/drawcia/data.vbt      | Bin 0 -> 7680 bytes
 .../dedede/variants/drawcia/drawman-data.vbt     | Bin 0 -> 7680 bytes
 .../google/dedede/variants/magolor/Makefile.inc  |   2 ++
 .../google/dedede/variants/magolor/data.vbt      | Bin 0 -> 7680 bytes
 .../dedede/variants/magolor/magister-data.vbt    | Bin 0 -> 7680 bytes
 7 files changed, 6 insertions(+)
 create mode 100644 src/mainboard/google/dedede/variants/drawcia/data.vbt
 create mode 100644 src/mainboard/google/dedede/variants/drawcia/drawman-data.vbt
 create mode 100644 src/mainboard/google/dedede/variants/magolor/data.vbt
 create mode 100644 src/mainboard/google/dedede/variants/magolor/magister-data.vbt

diff --git a/src/mainboard/google/dedede/Kconfig.name b/src/mainboard/google/dedede/Kconfig.name
index dca36a6e9b..3bb63639a0 100644
--- a/src/mainboard/google/dedede/Kconfig.name
+++ b/src/mainboard/google/dedede/Kconfig.name
@@ -19,6 +19,7 @@ config BOARD_GOOGLE_DRAWCIA
 	select DRIVERS_GENERIC_MAX98357A
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select DRIVERS_INTEL_MIPI_CAMERA
+	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_IPU
 	help
 	  The Drawcia board supports the following devices:
@@ -73,6 +74,7 @@ config BOARD_GOOGLE_MAGOLOR
 	select DRIVERS_I2C_DA7219
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_IPU
 
 config BOARD_GOOGLE_METAKNIGHT
diff --git a/src/mainboard/google/dedede/variants/drawcia/Makefile.inc b/src/mainboard/google/dedede/variants/drawcia/Makefile.inc
index c517214e46..9e9af40e76 100644
--- a/src/mainboard/google/dedede/variants/drawcia/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/drawcia/Makefile.inc
@@ -5,3 +5,5 @@ ramstage-y += ramstage.c
 ramstage-$(CONFIG_FW_CONFIG) += variant.c
 
 smm-y += variant.c
+
+$(call add_vbt_to_cbfs, vbt_drawman.bin, drawman-data.vbt)
diff --git a/src/mainboard/google/dedede/variants/drawcia/data.vbt b/src/mainboard/google/dedede/variants/drawcia/data.vbt
new file mode 100644
index 0000000000000000000000000000000000000000..7a45a860ec11f7a9f27a5e399a019c47c5a17387
GIT binary patch
literal 7680
zcmeHMO-vg{6n?YoU5snOQc!S!kSRpO&;W}elpt4GV<0i%#|DBNwGsxrZBQMcKq^vI
zVykjMm8$NkC26I)l`2*A!lga?R3Y_Z^-%TD1IH-Jkz13xZ)T0bP=eExsziR)o1LBa
z=G*t)yq%x*`LV81+UFYy_6+y?uJ=$zQBc8O^&^%CsVguvGT!YQ^^JG+5BaatM{pWm
zuKM#KK$MU(&K6Z|3Ct|&G52si9hjY*j_J+a`ocSlvvV})4^ZFKlpfRPCl>W69T~go
zqYSUe(RF7!7NvuCZcpm-ofJV-)TS+MO|5N|dR}W*Tbn&<%O#X_wzPL%x?JSw?(q)|
z1OxrP(ZJ9k9U7+Hff3)xNY6l5|4kYk9=aCj3XJx27df(A@XyZOou7XD)*^NL>!}By
z)5vkT$<#kPKi5Qku^1g@Itz4IU(n~@)1ysA4hEC}yNv)435pXy;E4yY0qh#sG_V8M
z05kxa^}u~M3J6gmpyCBP$gaIYgctd}wg-VC=1;dkQDCalQZ4`xcugS`O-YlerPY?x
zYG{pxMzho?(?_%~Div0PLUe{#)V*rF<%AcH-$w`10U|&c0h}TSGx}3;^MI@8BnQ+Z
zw<5oed=)u_{06d)Jd1o6`6J{{kUvNM8u@$VACL>92r2M^I<9gZ$?-E}vOAU9@#3V`
zoTbo*=`Py6D^=W=8vv=V%GN=)ZlS=t<Kn^V|3g;k6q5xGNEU39)zZDSNa4Y@ztcPZ
zwu7NNtR<ByNz-8(`SyGSo)!UjHBNyGSsEX+c?-#EY#5acVT%|gr}%PZpLgQB6BeBO
zx=j?kO2ro-mHM^NFzMD=#U81#dRDhD<E+l=PAZ0lqY>i86k5Vn)NPby5UjZwoNU%P
z8X<ZHG#}KduGMx6!PUMjTB|IY2{wk{#YOjUFVqHD3xTSsbEO#@up_HGm!yiE5SD1D
zLeZ2x2*i}00pYvmrL9m!ofcl(wSky2N6_Sr9BjCDMN=m?Jero+MUVmaCFsSNluIPv
zdSz@q1l4M<nH~!kNfWm$xMG`fE^+vv$&5!Tsx_6S#{%=gX5wxJZ7>RQ@xtvj;&U6d
zh|s`#0U&~8^5xVSmsWDfhx_&MWN4*E4c;ryAc*i1t2;G07X-CI+l;J4Rac1T0JlNJ
zbYuwsFelLq5sEAXiRR$N!wQH8X}RiD{j8T|gNg4Wk7NhW2bScAXSL92xZdq()WVIs
zV<AE@N5EaNeDr%!uR+9s(ukszuwLmnD6Hn}?+uOzCua26;KXhH1-M~O9XGvNLgc<p
zki+Z8SElxnu#ebw^m&-gNYBIeeRQ!C9`zz-0JqFHAP7;oNIruHB4K{~fsE#II=zor
zdy`6FHA5$(Y9-muso+1qw(`l?GNP>=ClC|gXFj!AZJ9Eax`Gh~V3R1bGRapGewc>h
z<#SicaKPBW9Y$U+*geyAz3l{Qr)NBPm>YL{0Z-=a(8oLFpS&Bpe6;`l4BIBwZ?*K<
zYr7+pU6VO={9>);*|HOUcez0l`7Y^%`;j+4AAx)X@)0=J2y}iURKc5*0ES@VVJZS!
z<ZSxOGW$CMK>HGaia^|8Kp1t2^*w>h9y~z>n?_u)ir-i2@E9j^V+|~~zQxUvw1ywV
z=TJw*ez-?NN+2`Yl0=DuvI?7$B{P3#vMmyZHI&t5$&yO~XtFA3h_YexWXT>65Ezrz
zNiUdaOEt=@Gp~Wq`z=Ypl;ik!6GhDGjGYOTnKuP63M|=%trmT^K6x{lElwaVB}owO
z!HQUenAYBr$(RqCya_G{p)AU@kuCoYi%SCK=Zjce;<!~sYs7NwwHueRZf1)MeQ$&g
mTVs};_dmqHW$Y19@CR}!+G1@!8RpZ*??sTIi+MV!5%>#f+h8sL

literal 0
HcmV?d00001

diff --git a/src/mainboard/google/dedede/variants/drawcia/drawman-data.vbt b/src/mainboard/google/dedede/variants/drawcia/drawman-data.vbt
new file mode 100644
index 0000000000000000000000000000000000000000..b29655cf6c8c3a2a2e0f4bb4264a94319e306542
GIT binary patch
literal 7680
zcmeHMO-vhC5T3W|U5snOQc!S!kXML^p#c^{C_%1RV<0i%#|DBNwGsxrZBQMcKq^vI
zVykjMm8$NkB}t{al`2*A!X<Z36;dx&4pk35aEziHxizUf@2xQyN^qJ|mB_Q2-M4S%
zeLFL6_WkUhAMG5Wy}sdK_fVhjS~q1B1r_`i5Ab}DIs=2lV_m)x-&kkgp#K_u0;l2i
zia#F%L<u?LY*N*x!1RJ1a}U+h{+WrXnBLf>&wsEmGfRX10QF5y>M?z8d_j-W;n6ET
z%J2#towuiAQ95w@)`ULSP7y>!ZQ9h*(A+|)=dDJyxzVFGT|!BFQ)~OB%LR_EZvS9^
zFwo~42@DR<!6Die81@YhclUSp-Jrpt!K;DJz({vjfg{5O|IF;2xvBSWE>O3>mU{3x
z^&FR*O#L%+vklZ2i_sybGf#)~d4299J=##<U_cvSw-Ep$LE#1vc;*4D0J{b@4eS6m
z01bd<JaFHQ0z#AssCdB+vTLsp;YEJ0?LnZ3`SVRs6qqcxl=A=tUQ!4}Q&J>q@G!#E
zmQreHjfF<{s#(aWcE4QVE%VVCUQjdCQm7~S^7Lc0J{2GWgb~0gaxkO66gLm}c}{Xb
zEpjvR+sIdtL&)zS>&P?6caT3r{sQ@H<nNGwLVkdpA4N!kchqs6*N_~)KsvjV$sI3F
zYROp)y_oKz-Md`DeYp;h{I+BbWa}34ygM!)y#7CA<xVk?=YT}sHd!g&TZ-f#tou8?
z<F7jyy2EOc$)Xe;rje`9Mc{c6a983GIG>^MIUBc-tjf9($q=@PQFMw=SN1t4zB^&T
z$*<c)!K+kw0g}mI^9_@3omK3SDywB>>k^LYtn8#>SU4IXUPz%STtVGNNgBZ#o59IO
zoud(=XF&5ojp|xywGdpbOQJQ)qM2Z02wt3Y5BEZ?gVhkInmSvYwgDTmvU5=?%L-wU
zhRPI8*@Hk#=>-seY+T$5mDOnB)m<BiDRTr(UeCgYs~ws;vF_2dja>v8a9x64j7r%=
z^1U}k*FsRK_L!-@V39O&$$~SsDQ6RhPa4d4q^wd?X{s+UA8aPBX3z#BFB>o1UL!uc
zUX2KKtQ7zvNG6|7opEV7i+s3O8&8CmtJL7#(lmkyud%XIle0lk>$J_ta#VGNcn)wI
zL`+A9@DFnmy%3?mLXc<{UOX;?c#xK=PSwv^SvHvXKJrMm@qA!Oet1?3?S|{awt6jG
zzuOlg6mkSy70XAz7quEh3@DB$N)c<7ii5&R&c2@DSa5t=j}469(qDla=G1Z1n?*$K
z-2^$jc6{gLJ`(m3TaLaAvk~cK*uIZ0w!@Pi#0=n)`8ot43Kz*&@JJ-gk3W#nTu!I=
z5vy-d39O{)WE8C=+u0TT=htRF7+XfPwBi6_;`_{pHmfduP9{4r!T@X#WmYEmOu{$Q
zP`GriqXavQb=+a(^@80qRnyZ-pn7WBgPXZAw-<0{&Nh9#QSQmRvCBpK-_NjZVjU~R
zFJ9X1naq;RsqLXPmuJdO_}%3?N#v`f6YfXO{9FWb5y(a0SR>H>y-)$~P5>B!iJPei
zY>~66FU#zA1c3Gp02P6_!GJL866<>cmpyuh3O0?nU<JRg)ZjKw=EfR$-ueL-N75>O
z5T8XI72Dw&4QT_J$rdF_6qJ?Olnj~qJCkjZFs!1iCPS836hM<zK|_>vn<qo|w4cDJ
zv_^WsL|ZCRX6<<meBN&f0;U|t-%S)TE7Nvvpv=4>fRSg()@{}3yY<PN$!u`~aVbH9
za2J-vD#Wzbj!edU(Bw^UK?r40rj2a*cUW9DP=3CE#U+kQRkTJd#a6p<Dd}RixX|}{
oXtUL4*m>_${4Hb0e=vA}T#U9@i%*96y#9L?Wawg!PHF`H0%)ONE&u=k

literal 0
HcmV?d00001

diff --git a/src/mainboard/google/dedede/variants/magolor/Makefile.inc b/src/mainboard/google/dedede/variants/magolor/Makefile.inc
index 33333832e8..f2cbf8d8e0 100644
--- a/src/mainboard/google/dedede/variants/magolor/Makefile.inc
+++ b/src/mainboard/google/dedede/variants/magolor/Makefile.inc
@@ -2,3 +2,5 @@
 
 ramstage-$(CONFIG_FW_CONFIG) += variant.c
 ramstage-y += gpio.c
+
+$(call add_vbt_to_cbfs, vbt_magister.bin, magister-data.vbt)
diff --git a/src/mainboard/google/dedede/variants/magolor/data.vbt b/src/mainboard/google/dedede/variants/magolor/data.vbt
new file mode 100644
index 0000000000000000000000000000000000000000..fa3d21a1d676f9ccd730d53331f333b0f5ae933c
GIT binary patch
literal 7680
zcmeHMO-vg{6n?YoU5snOQc!S!kSRpO&;W}elpt4GV<0i%#|DBNwGsxrZBQMcKq^vI
zVykjMm8$NkC26I)l`2*A!lkz!e5#Oov3jU_=z(Jt<;bl`-8ZwwU?{<9N>w61>&?#2
zd-LskZ{E(&`uteeDDCr&1bc@2eb;*^qbR80ulf<ogVYrm8X52QjrzvB`iK12=_5D|
zFIWBf5Fkp(8E1>CwghGt^_Y9Oo({}TPRI1-ZhhgM#o0L;^arSKYD$mk^An4Dl#YyD
z^-+db<mkFH9gEVzJGUqG`A&);Dr(b~wx-rLN<FVNtF6r*wdE2@I$PR1FI_Hjbocm&
z27-Zp-)LZHkPZ#g?!bs|WTa=HtN$hq4i8-mbOlCxx{DlHF8F8X?#@rYeQS}r{q@v?
z&uQei++^yXou6x>zF3S7Go1xGtS{*E@9EK|A_oIXfZav_hy=w6An?Qk*Z_77Y#P`B
zYycVn&3fRz8wG?Y5m51h9c0&DA;OFNUfY8}5%Z^8peQg^X(<-~2)w2cil*$4mR4I%
ztD!X(8qHFpOdrv{s8m=D3eg!}QM1%|)5$I#zmN8(14Mu@0ysquX7s1x<^fO7Ne-w-
zZbg0_`6_Y<`3+<pc^3ID@<+&@Ab*bhHS+h!KOh%I5mMj-bzJ2-lH+H{WOpjH<Hbp>
zIZL4r(_OTCSE{%#Hvm#!m92wp-9mwP$Hjx!|A(y7DJBaXkSy3HtEGEuk-~#*f2Vi+
zZ3jblSW7BZlBUBn^6mKuJS_t5YMcTWvNS$s^A?iT*f1&?!WJ<~PVwc+KJUbLCoDMm
zb(<)7m5MJwD)nojVbZO$iak<e^{j4R##x=!om319M<c|GDYS&EsM{#ZAXsxVIN7Xo
zG(z+YXg;V@U90UDf~$R5v{qR(6Ko8@i;M2zUZ@SQ76MgM=Snj+U`JMWE=d(RAuQ2Q
zg`z2Y5Qr%~1HyOBOIx9eIxW1mYXdQ5j-bgKIoNRRil$C(cr-1siy#B;OVEokDVIpT
z^~%_K2&&ayGd&h8k|u6haK$#|T;lLSlNpaxRBI|tj|Jv~&BWad+F%sq;)UC5#OF3@
z5ut(g0zd@G<jbiuF0JH{5BKZi$<RuT8oXDYK@j03R(EQ0E(mIawi#K8s;&^v0d9kc
z>BtcNVNRkKA{1E&63xMjhZPVH(sI?Q`dKf_1{2>$9?1@#4=l+K&uXF5aJ}2nsD&GM
z$3lc+j)1#j`RMneUW14Mr4dCbVZG9EP*}~`-y0kcPR!`B!HL`Y3vk1nI&ONkgvfoH
zAcxnFuT1SDVIQ&W=<_g}k)DU``{-gPJnBWv0B)IYKoFvEk$eUZM8f>|0~yWbbb24L
z_9m6UYKBfm)k?CRQ^9|JZRL}(Wkg#$P9P?}&wOgL+A?J-bp;~~z$Q^<Ws<KX{4fp0
z%jd3?;efG$JB++uuzRNKdfN%qPS1GoFgNb@0-ns-p^taUKY2HH`Dp+98MaNV-)iZz
z*LFuHyC!q$_{Cbwvt=jz?s9`9@?Fvi_akq9J_7j&<Rfsb5$OCzsDd{q0Sv*!!&C&e
z$l3IlW%hRjfc7N-6@j?HfH3M3>w5y1J$Ql&HjTJo6~C|4;W19;#u`{|eT$nTX$?P!
z&!LWr{cw+llt5;(C5aLRWfe9hOJ@GgWLqQ*YbdMBk|mb}&}3E65M{&W$&x)DATTDa
zlU^{<mTHt)XI=xJ_gj*HDaY~eCW@HV89NgwGj9rD6j-tiTP^x-eez~9Tbw{#N|GSl
zgB7s`F|EBLlQADOc@ta^LRpk)BU}C*7MBFd&lj<{#Br;N)`;cUYd0=s-OLsj`rZf~
mw#F<w?|+DY%h)5J;1A?dw8h$dGR&uq--{qa7xQ#dBk&h=QeZ9s

literal 0
HcmV?d00001

diff --git a/src/mainboard/google/dedede/variants/magolor/magister-data.vbt b/src/mainboard/google/dedede/variants/magolor/magister-data.vbt
new file mode 100644
index 0000000000000000000000000000000000000000..b05d1e92d22dd9e62ac73da9e52ef22bb31f0a41
GIT binary patch
literal 7680
zcmeHMO-vhC5T3W|U5snOQc!S!kXML^p#c^{C_%1RV<0i%#|DBNwGsxrZBQMcKq^vI
zVykjMm8$NkB}t{al`2*A!lhD=oGPSVtQ@Kydf*sEIdW@KcivlLFqGglr7DqUHM?)$
z%=>m`-t7C?JwMtxLVJC~!S10x-?eVaC<-e0D}KWBLFx<)4v%&DMtozPeS`jM^f8=<
zS1bN}1P~?UjI&8qn*!4dddxjkOZ#Ugreb<ymp=dA!ptlU`UBKAIjP6=x$y-(N{2_U
z_$b3GaCF|Dibd(b?OPN2TsuV&6}4$oOG9%DrJgq$)#gTz+H?se?M<!imo67Ly1M;?
z{lP$=ZzM1{KnI6tS76vTJlx&i*>{5mhX$_(Is+r!T?LK|7yL7`cjl(vy}3Z${#xq6
z=hSmtZZh@H%*{4XUo1w4n9e*M(&zQL5A<k5fr9~UfZav_hy;ZjK;WqdumbEF*fg*M
z*Z?#Dn(@GWHwp+*BB0_0JIJoRLWCFjy|xE|BIeIGK~Z3`+)~a15O_%;6iwM74IV_8
z+EPjlt+CK(h8ku1sCK_xVI{~%XLv!)P~%l6`}E{Pv_BOf0)!F3DRMBQKNmL-czRB9
zKrM1J@|(z4kVD9CA?wI9$aj!GLH-Q+OXP2me?a~bIX{Y!0`I8fI<Fx)et~p$CzCr~
zoYa!D7<w_?MZ0&og8OnEAo+F48pzfy<au{oJb3+o$jY5!BF_Pdylt{lytfp|KUnv7
zddFXPFm#92B$GucI!q&1pNqh=BH*sXA#grJ<5M<nAz77mBa$I(5u@l7pRVk4PJDO5
zf|FmjiGo+D@B$>0zvdez-8!q-BUM(*%GM<u)mhm|#jtQRLcEYdQ@Db<jgmBiH8z8j
zjXFmoM9+ZcgBsPf(rO{NT9-s?mPIqc#t^(X=^pNdS_i8kP&IY7IBf$qWM$`~RF)OO
zA`O)(nz9Fhn9_3~eBZdZ6)LOI!mGPB5L4y|n!KKc4Ocrfbz<G4X&bu;GT^!dy%?3U
ziR3%4jjn~DQtdHQeZeAW;*tetY*WrA4j(m`@km*vrqWbjU_RJPT+N^jMqV~vxV=Vv
zcD))A>R2lPM378AojT*vau)e;uQr|tEmx_*yQOIa5nf?srzU5Epw?-dk>#lB3h^A^
zHi(#x4B;Q<Bzhr2frTK^EWCJB2Js**Rh_DzwX$q5@qOfxY~%UBlKk+j7TOKh`)&1F
zxPG@UL@4A4xGI*9elKb@h!{{DQIsOqDisHXm7IM&!Li`@v>qE6zoowfH_WNyrq_#z
z+`9>Kc<uPk$$cd3BeooU5oROOi?DqkU2KQPJ%|~=CG&L%LKH5NFW{j_m>+*2qq&?;
z?;}><pb}U~)5$1WNw%{q_|LD+d@#0*Xlca(#KiZR4{cUm`kYL5V1xnKAj+&v@R@{f
zrlD}@Tt^9Z80)yh$m<2WXR4;Bl|c2>v<EkHV{R|t&YW%fc%$5tcVm}}_P?KD+r&Cn
zil4u<+cTLZnN!;XYc9`}o$$NMb&|+eNhjQoocXy3<RXxZz_CW4{ac{|-ktz31QRz?
z5!fPUQ(u<Z?+5_xD*!42af1P2)FsyU1TK5{6cub5als0HU#Y=uoXm|i@VxaME{>#C
z{2)GyIx4oqH5$?eGLtPzlqe`Gvnd%e^LHlOB4JoXSxts4u_%BhtAd6o>o!k@>`6a?
zQE83zfQhzLqRiU!8u+~55(G>+j=!5IVpgW@+(4OmLjWVslC9gS(Rb^UH<Q`o1maSH
z1mP|$i&cnetsR++`Jl<0;DQj!qD&jv^6#*?Y@qyn0gFo<m#S!uSc<K7<5JSaY;mFQ
p_0VRk&#?2}$M{>uj{jir0J#`#u@;{U^I84(GRV-y9G%n%`~_{IU@iav

literal 0
HcmV?d00001