From 7e6f323d9891302093617f4d8e55ef6db3bb8b05 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 28 Apr 2023 10:21:02 -0500 Subject: [PATCH] mb/google/volteer: Add VBT data files for variants Add data.vbt files for all variants supported by current volteer recovery image. Several boards use the same VBT, so place the "common" VBT under the baseboard directory and set it as the default. For variants with a unique VBT, override the default and use the file in their respective variant directory. Select INTEL_GMA_HAVE_VBT for all variants which have a VBT file. TEST=build/boot various volteer variants Change-Id: I728ab81938c78f600ff8931a8073d1f7de152c09 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/74852 Reviewed-by: Nico Huber Reviewed-by: Sean Rhodes Tested-by: build bot (Jenkins) --- src/mainboard/google/volteer/Kconfig | 16 ++++++++++++++++ .../google/volteer/variants/baseboard/data.vbt | Bin 0 -> 8704 bytes .../google/volteer/variants/elemi/data.vbt | Bin 0 -> 8704 bytes .../google/volteer/variants/voema/data.vbt | Bin 0 -> 8704 bytes 4 files changed, 16 insertions(+) create mode 100644 src/mainboard/google/volteer/variants/baseboard/data.vbt create mode 100644 src/mainboard/google/volteer/variants/elemi/data.vbt create mode 100644 src/mainboard/google/volteer/variants/voema/data.vbt diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 51210e44ed..c4d6f4a82e 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -41,9 +41,11 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER config BOARD_GOOGLE_DELBIN select BOARD_GOOGLE_BASEBOARD_VOLTEER select DRIVERS_GENESYSLOGIC_GL9755 + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_ELDRID select BOARD_GOOGLE_BASEBOARD_VOLTEER + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_HALVOR select BOARD_GOOGLE_BASEBOARD_VOLTEER @@ -82,6 +84,7 @@ config BOARD_GOOGLE_VOLTEER2 select BOARD_GOOGLE_BASEBOARD_VOLTEER select DRIVER_I2C_TPM_ACPI select DRIVERS_GENESYSLOGIC_GL9755 + select INTEL_GMA_HAVE_VBT select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES select VARIANT_HAS_MIPI_CAMERA @@ -95,32 +98,40 @@ config BOARD_GOOGLE_VOLTEER2_TI50 config BOARD_GOOGLE_VOXEL select BOARD_GOOGLE_BASEBOARD_VOLTEER select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR + select INTEL_GMA_HAVE_VBT select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES config BOARD_GOOGLE_ELEMI select BOARD_GOOGLE_BASEBOARD_VOLTEER + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_VOEMA select BOARD_GOOGLE_BASEBOARD_VOLTEER + select INTEL_GMA_HAVE_VBT select VARIANT_HAS_MIPI_CAMERA config BOARD_GOOGLE_DROBIT select BOARD_GOOGLE_BASEBOARD_VOLTEER select DRIVERS_GENESYSLOGIC_GL9755 + select INTEL_GMA_HAVE_VBT select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES config BOARD_GOOGLE_COPANO select BOARD_GOOGLE_BASEBOARD_VOLTEER + select INTEL_GMA_HAVE_VBT select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES config BOARD_GOOGLE_COLLIS select BOARD_GOOGLE_BASEBOARD_VOLTEER + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_VOLET select BOARD_GOOGLE_BASEBOARD_VOLTEER + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_CHRONICLER select BOARD_GOOGLE_BASEBOARD_VOLTEER + select INTEL_GMA_HAVE_VBT if BOARD_GOOGLE_BASEBOARD_VOLTEER @@ -165,6 +176,11 @@ config DRIVER_TPM_I2C_ADDR hex default 0x50 +config INTEL_GMA_VBT_FILE + default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(VARIANT_DIR)/data.vbt" \ + if BOARD_GOOGLE_ELEMI || BOARD_GOOGLE_LINDAR || BOARD_GOOGLE_VOEMA + default "src/mainboard/\$(MAINBOARDDIR)/variants/baseboard/data.vbt" if INTEL_GMA_HAVE_VBT + config MAINBOARD_DIR default "google/volteer" diff --git a/src/mainboard/google/volteer/variants/baseboard/data.vbt b/src/mainboard/google/volteer/variants/baseboard/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..a7cd7da8b696921b4cf68c9c738d30f5ec43cca7 GIT binary patch literal 8704 zcmeHMK};J*6#cWd*N(fCjf@h9CUhVXF*Ly1Nhm>(9~WK^ukM)K|LSsDxL*a|` zcQ^o3jekA@ND*>K@+*ozGBuaZ_~I>eaC%}glkVtE&)%4u&eCW&LPJ-trZef8@ws%0 z4v(G-QKqlP-E(U)lcJYy-JD3zbW>EKAe#D5wVymiY2fV+L1+6GIp9hO& z*#fh}{UpdTd{0@QyffA@nm{P;ofo)a4EBo&a~3Wge5I7V!|$(u-YOlYk~1NqHWhqSP=zafj#*M1*Yc&2qP8@ zwG20NcWvui>N*^5ID;HU9z=czc^vr$@-5^AYuWN%2eyweSN z=VP+uc{y`iL$_T`p|Ibi?GV-aY6PAY0bdgcwpj~;EnAGrm8~NVP1qpX{@3}p$TcJ3 z`;!nP{(MYid^&26L!t0spQh7|BeE;mWVCMRT)>r`-Y)l%>$4pX02SJGgt z&mggtXJ-wmL!gGBS@AA)8XCNv3pV4sjb?(KX$a!SaeFV6R#=XKqAFQW$p&o5^3uGc zz9J3tG*&OG^4~NN-SHe6zUi3Xh}Ac%iRH2lL>IXRRa~vWhVy4tWnwj;s%vEpBH(TU zy%=>=63O=(M^|Fdp!DnJSg=UyYy$;oN+oglxLwaB>l;*snqz_U!LIYIiljL!@xm9> za@p0RsG*hh3xFCNI{&0fImcoJ^WjcQE+1QLQlhubeHm)70pABns#u8zrBz)|E~XT3 zjL!jXgAJ!6(m$P(+y=hM!Z}GR@ZwQDM%&tjH_z7LfU$wwj)FmO1ty#OI|&?}oC@H9Z_F2j0K)mP5TDha%dx9Q z``@2okBRYH@;ra8JTlgt$f@f-lrB`P@;zKS6L*WH+oV10N7eLd1ga6JMxYvjY6Pkg zs79a~f&VcA-S>pU@a_bFCg^x6m4pp)#Qc|z{nZPgegQyjKzyJ<0s@0WTZz|7`q$=s{cfEkBRvv&QdLkYU(% Gm;M4JL2NDn literal 0 HcmV?d00001 diff --git a/src/mainboard/google/volteer/variants/elemi/data.vbt b/src/mainboard/google/volteer/variants/elemi/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..f3597e289a7a6ab4e4310283129af958d84730db GIT binary patch literal 8704 zcmeHMK};J*6#cVnuN~Kvjf@h9CUhVXF*Ly1Nhm>GLxd0Zrz+n&va8%q9B_3Pqm*sMQPyG4&`J=K=GeONw>eV`}CO_ zS5I$ba3B`#4~;|zFVVpv+7lfP4G;GYg!`}1*wEnlXgE63+f(DRxDc7nzCAN}?fM+` zMOtV8`)T8Pxydv#J(F#xp-hGjG0ZF-O3$We-b$z1Yg|mx8aQnPfY_mS4G266gA7iv zA*;v~nUw`(f(!&1rGQdEDWDWkiUMRK!E%ZSh&k>A$;+yXgx!feukxlwH3h9GH=hTK zW!VC=!QCXtGJHc>pS&~HF`7Uq@0}O8VGQ<@33C)XwZbTTcb&n0GhzFT)&PpB&9GE9 zVV*{#(-(@cm<1-7unrSeQ-mcgFk-?kny}g;ENg-BIHGOWOjr>GV1Ye+2L-0*1PCJ* z47Ch5b9cn`Ep;7s7o0(kAP*qFhCGgZ1Nj#60`mLFA0mH>`~~t?$X_FWi@Yy|Dg{3D zyOpjWxxRgRj2=|nN`&=m*r4P4h&E`BEPo*=L#&4#d zg93AEx9Jr>kuI!*lvvrlw6KYUO~kgOPs40QdKz|aqMc%Xq8oncLr@gA)t4a#DL6qs zf_oxkkK7Z2R0F_Z&wH`m1u8djerzS4*&V{BwMW6vWIKSsZLCEeBb%fXBbvW z3x%^7VF0$sGAr}^OJlUHU3mFy9S#^9xa}wy1ZQBfxv!JJ(aEU*9{9$5K?oq69}DqW z?YSJgYPA3T8TNn}za`I;=gK2v%}JcP?n3E8#VX&!r87e=sdSsPhyAFUUX4IC0@Vmq zBT$V%H3HQLR3q>|MxgsM;V`^D0iX#wUP>ilgB&scrDK2f0;rz=P!Wg^G)N$p827SV zcJC1aY%1}>5}sF^@yIH1S2RpFKF3>V`!Z1=ix>sl;aL`G4VlU2?UcwUtGCG(nf^1A zZIA>kqpaB?%g+m-N{XPOmQ`E8B6~PMVAQ@s`anlp8c=539ctL$k9h*Rlmi7Q>TD?4 zxrQ?RiU69!kgeK|qVLAvhfHS65y;u|BnG!(QEWn;#u=N*m=CJ74qk|(EXB~shJV|| zWew%WYFJ!yc%(;b#DmzX9GAKtW{VenZ-Xvdo5jwL-xKh%5&zG|A4ndwh2Qe?cs_3Y Lo(CC*ZFlJ}Zb)n{ literal 0 HcmV?d00001 diff --git a/src/mainboard/google/volteer/variants/voema/data.vbt b/src/mainboard/google/volteer/variants/voema/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..6242c7fd2596d9a2bc17606609da0c28dc4d206b GIT binary patch literal 8704 zcmeHMK};J*6#cVnuN`+O8yO`IP3S-(VrYQ1lTd;zWsQNv2?W~^>PVF^#BPG(fD5Fe zRVB6(2YOqnQbnRxu_{%qIMH(t<x&HpFZNMRNl@W#<4>4wrJnH6@K|qfBskVHFci8- ze}e-s)%fQFfFvP@WS^?~!c%jpv^Um52d5_{)2WW$)a;G9=?sm8!ZdjGYAT(Y8J|lf z>G0^eAZ7Y$Ts^lY(@A>i*3F63OgBX(Dx#_HRQt(Ol=@%qP)~OFRo`ipbo)BHPoJrA z_4b8^1|#8t;7EAr5*>=s-tcg6c(`w{XW$Br#D>m?d%`1qy)~{f7edpScV{NAU7w@g zPz&{AKW$tuH<^Z}XEN9e!_3lHYBn|VPAb`6<6?@|z-c1@#16Gv^zH zR?1*DxR(G$fo~}5lXu2CMiU6-z4HP$jKO}kV2(nk&KaYWm$S+D{MpbYltJrr1;6CjLO zFtiff%H0*$x72mmU2q0Dggl7+2J$%a4dh$M3&sCNAi{Jy|-fuUuiTVajrPf&Be6SgOt0L=;O1$s} z^lWDJC~9bB{Q{r{yTL!Ha@M|B!F;&WlFdaIo7Bi{YhQ*MMBw`%S(7T!ptfr3iN&Pq ziSjwXZ4hxfBK^}j$!*}9ES!_H0xuraLpDMWsbbO^dgc#zF+XgOhP*EbaVWv}lmf!JSZ){j6Ur4hqZ31O1V)$oNz$eQEq=>IEn; zr*@lO^AYL7I!N)A-AnVENZ3SdOZqI#R-|WP=O)@I<|n%0*M0YI??kc*&>A)sp_3bKwr6TQ(tQnBP$>BeLo@9$PTlR2mIn{}Yf$uwC`b@)$X+D1z zBMiV6S!QL9e`(CNwF|GFt-}Fh1GgOo0^sydHurZDI667y#{=J(HvoQw^J5`Ct38)u zSB>_+Kf@jp^S9)F`dn#b%5xH@u6t0tP$`%1;nJCyODf(b?O{KvrdK0SjX*U5)d*B0 zP>nz}0@Vooj}hqpOgId0P5|hFftOMV*dRx&f9cp?y#U%L08|9x1s&puCFZ>>m)(Di z0GmcUu!QH;W<0V=+!Y^Cc{?Qv%Ia-Onaucw$u>wF zmQmJRCdErp_WyfzfAUMkie*Yh4h1gwltv3ygSsfzaMi13@HmLP}JE_v~vw* z#uWi{hbddN9Yx>GzYm$rmL-t2=ST!@!=l)PI?XdSlQADOX&pQeMOl)ekxl=$i_03y zkJYfaWbsIk)`$nORVglYz04L5`rZazwze`m?|dNOWh4HdjX#jwXbZpP=ka{f_`L`+ I4BPI~UtzIqE&u=k literal 0 HcmV?d00001