From 71ae2c7366529ea1b0cc67d33fa8dec9bbd1f7e8 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Wed, 21 May 2025 09:25:00 -0500 Subject: [PATCH] mb/google/octopus: Add VBTs for DOOD and FOOB variants These variants were missing VBTs necessary for display init, so add them. VBT files taken from the stock firmware images: coreboot-Google_Dood.11297.368.0.bin coreboot-Google_Foob.11297-169.0.bin Since all variants other than the baseboard have VBTs, move the selection of INTEL_GMA_HAVE_VBT to the baseboard and exclude the octopus board. TEST=build/boot various ocotpus variants, including dood/foob. Change-Id: I67655b149de40e3e7f83971780f62cd7fce820c8 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/87774 Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) --- src/mainboard/google/octopus/Kconfig | 11 +---------- .../google/octopus/variants/dood/data.vbt | Bin 0 -> 5632 bytes .../google/octopus/variants/foob/data.vbt | Bin 0 -> 5632 bytes 3 files changed, 1 insertion(+), 10 deletions(-) create mode 100644 src/mainboard/google/octopus/variants/dood/data.vbt create mode 100644 src/mainboard/google/octopus/variants/foob/data.vbt diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index 9ae9e4c8e5..f5aed08225 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -19,6 +19,7 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS select GOOGLE_SMBIOS_MAINBOARD_VERSION select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES + select INTEL_GMA_HAVE_VBT if !BOARD_GOOGLE_OCTOPUS select INTEL_LPSS_UART_FOR_CONSOLE select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_TPM2 @@ -31,24 +32,20 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS config BOARD_GOOGLE_AMPTON select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select INTEL_GMA_HAVE_VBT select NHLT_RT5682 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_BLOOG select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_BOBBA select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_CASTA select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_DOOD @@ -57,7 +54,6 @@ config BOARD_GOOGLE_DOOD config BOARD_GOOGLE_FLEEX select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS @@ -67,18 +63,15 @@ config BOARD_GOOGLE_FOOB config BOARD_GOOGLE_GARG select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_LICK select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_MEEP select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS @@ -87,13 +80,11 @@ config BOARD_GOOGLE_OCTOPUS config BOARD_GOOGLE_PHASER select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_YORP select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS if BOARD_GOOGLE_BASEBOARD_OCTOPUS diff --git a/src/mainboard/google/octopus/variants/dood/data.vbt b/src/mainboard/google/octopus/variants/dood/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..2848abe03352eaeedb9f8765343fc35d4577af87 GIT binary patch literal 5632 zcmeHLYitx%6h5=F&pR{icFLnHwOk&SZGm=Lpp;teY_~04=wr7nwMLUZ*hLx(Ep5>v zLdRH=Mx)suKF|=YF-C)bNYr1(h(A;kqPB^T@XHcnf&>y0YxD;&o;x$`wv^HZK}9*6 zbI-YF&i(E^=iWQ_&aP@MZ=zc&YeRLRn!vV7$|wp7ytZ%x%h^;Os&8zq2s8y+%WLX` z+vs<&2zD;KdLAIkaXzs?Q3^tP`eR-Gh8$Yk-Ox%WZ z_s62Nv3W~?GCYZt@9XS}(z<=SJ7T>h6hRd9rUe`F)^DJ+a8tgrKEF^Y*oaR`3W`cL zZk9+zWw5?BjAL#J)z{Jb23iqn3^X=Y)|S^iLcJR47LhNUqfolwz2D^KE@@Sx|i#9NyKH3oLi}gMki{?p$0i6K1ode(;kcuT-DFko> z*a6fTo!p?}1=~i>hApz);LMori10kty@*8R%D z9m+If*$$w;CGju-B+c4uXqUywMQJ!KcoUpHGjvy}DQB1eC?66?6Ymx^Skr5*;$**qU&iE&E;{={{PNEW;Oia(c*OcKCioNg_(=2TeB>C49{O1 z2Od29ZQ#Hcgor0_1yn;|T8{A<2g}h^jc%rkVX8*YHdqCIpxDYV*-@xi^`OxKltQX) z8qjrAzYja^oAKcJV>$r1_#85Xm-??iJ zNs>bnX_V-GNq#{huSoP0N&Z?QKT7n9B&Vj3B`LHlMUJG9M^mI+*`e9SIV~;4xahch zMSS9w>u1NzyG7%g!i73wdU?fZzE20u)t&BYIaomqM2F+D$tOvHp=U&ye5-nqI z@jA6-U1BbH_A$hwz%QEl_eG8hZ5pJvdA(_@l{p4{pCXAhRpHif`<_@=UHk6Xf1tvG zx-qSJ7Mxp8;vM~%Ri5J$`gHqW&_B9{Y}e4*MR1`ChZ(|~`*sLJ6xMRD!a1JHQ#cr& zqPs&i(>?j&@wdzM9z3Yn2FG2rp$LmOu54qIU$YK$y$p{!0QNdzqa3xqB3awi!DVF& za5C7W%tfW8;4bXUt}5bSW#^tkTpq3dQo#Qs*jKU9=w8o>+}+Fe?O$ONocSA0zj-Y& zGcz@(L7Qxx26#GXcqLAdHl>>T3I9CfnI;I3l9^jv)zs11^VI$W2M=j(4c>;&|2TW; z?76e!{F#+!f~RAr50AY&_TJdVu_=^!6r+D7;l$ymzeUDzho{{f{j0a7|H;noxcn32 CN@6Ym literal 0 HcmV?d00001 diff --git a/src/mainboard/google/octopus/variants/foob/data.vbt b/src/mainboard/google/octopus/variants/foob/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..fbcf46e8494c759ef00a29bbd1b59c648a398994 GIT binary patch literal 5632 zcmeHLYitx%6h1Sv&$~0*?UYAZYPmct+XC&hKqkf^_m5r3#8L~Rq)@XHcnf&>y0G5P}-&z+feTT1DIprV}3 zx#!$7=YIE|bMKvdXIHdTG}BF0b>aGOZE#B!WfTJiUY~yo%b8RWZfI(&3^oVbDry@- zTj(iR0NdwZI}Z@!IKNn^D23r&1M%)aV=k@h>Fnx`7gWakpBm`trIApW2DfdCcgOoW z2I4W=)Uqi^8JiXaMl)53N6Yu8a)w4p#*TTrAFuE!^(g~g@o zH%g?kD%4OH!7(?78|rC8BdrWK1)G|x>MCju$y!4SLd2>!qhz^iwd%U=ZpSKbERDNWl9MpG;dFf>zI#;@Ghj1rZ^2bI zlx4)S6+nMm5?~NWy0zEPE{hY3(r}vh7C8K7=*}`z&Mg1QCw}&FSbTvWbrKkLUgm}~ zrfM(PX4-D#clT{Gvo@PW*V8SU&EvlP|DA!X8u-DjCFuAAK3DrPGZ)#nXIb(Dp1(W? zZan;Xu;U9t#1ps@Y9Kfz$M}qcrD&=_H`B#1)u3lPtbhPeY-N~iC{(Pv(P#%sA&s8` zbOSZu$Bz4_JveF+K<+CbJVa;*k^2eRPw2Zu{)CXv3H_PKzZ1fF=t_^g(L+KW+U1e= zdB`CT{m>(S<{@8u=tYmLdx%@41)>}j$rh3B7UdU2@{&kD66G&N@|{S36J@7F(j~e< zlEV^dlIUJZeo-Q?O7v4n{zf7{O7yBEr+LXDFD>`VQ7?JiE9J>{jUVTP}rJ91KK<@N7=;(%>xf-3SZ}Q zBg7Vg8iX7rbGX<<$Sgi6822+oz!_%~Y;En(bYMa`K?6oE2rr1#iz zM95>Y10aGuVcb*15&KXI>*3AZkPA>8JgG!P^c!A?_%;=CV5B6Oi5Dk0X&$b*o;{fJ}GoF&G3V2gbARn3=bnY&BY zsI6;~b0M&gAr=LG(agOsa#d*8Afw&qOJ}XjG2r_YNvy4ov_(30#k=b}cEtI?(lUJn8`0>x7MR)cT5KZPN}eDW8Xv z!6s!kDk}q5QCCiNF$c@Lb`|0BXbY49{vW}9(?P>4agwx2)!a|`=b6AXj|aS2c_r1&on5`p?A^EjfacQR9r)spvzN}E zJ3B6%S$-yTI)3`l*n4B|k6j#_M43Y|`d5-p9De#+WE^*R+Rf6xdPn-7=