From 2d086e6971fc5bed9e5a6c028ca8601d2499fd82 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 29 Nov 2019 13:05:11 -0600 Subject: [PATCH] mb/google/glados: restore device-specific VBTs When migrating glados (and variants) to FSP 2.0, the older board- specific VBTs were dropped in favor of the default FSP 2.0 VBT due to compatibility issues. Now that libgfxinit is available and the default, restore the board-specific VBTs so that external displays function properly. Select MAINBOARD_NO_FSP_GOP for all variants except glados since FSP/GOP init will not function properly with the older VBTs. Test: build/boot chell and caroline variants w/libgfxinit, verify external displays now work again. Change-Id: If55a67e0d3d78e4acf80cee1733ad8e14b8847d4 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/37397 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/google/glados/Kconfig | 5 ++--- .../google/glados/variants/asuka/data.vbt | Bin 0 -> 4608 bytes .../google/glados/variants/caroline/data.vbt | Bin 0 -> 4608 bytes .../google/glados/variants/cave/data.vbt | Bin 0 -> 4608 bytes .../google/glados/variants/chell/data.vbt | Bin 0 -> 4608 bytes .../google/glados/variants/lars/data.vbt | Bin 0 -> 4608 bytes .../google/glados/variants/sentry/data.vbt | Bin 0 -> 4608 bytes 7 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 src/mainboard/google/glados/variants/asuka/data.vbt create mode 100644 src/mainboard/google/glados/variants/caroline/data.vbt create mode 100644 src/mainboard/google/glados/variants/cave/data.vbt create mode 100644 src/mainboard/google/glados/variants/chell/data.vbt create mode 100644 src/mainboard/google/glados/variants/lars/data.vbt create mode 100644 src/mainboard/google/glados/variants/sentry/data.vbt diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 52907cc683..bc0c67ba46 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -20,6 +20,7 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS select SOC_INTEL_SKYLAKE select SYSTEM_TYPE_LAPTOP select MAINBOARD_HAS_LIBGFXINIT + select MAINBOARD_NO_FSP_GOP if !BOARD_GOOGLE_GLADOS if BOARD_GOOGLE_BASEBOARD_GLADOS @@ -63,9 +64,6 @@ config DEVICETREE string default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" -config INTEL_GMA_VBT_FILE - default "3rdparty/fsp/KabylakeFspBinPkg/SampleCode/Vbt/Vbt.bin" - config MAX_CPUS int default 8 @@ -94,4 +92,5 @@ config EC_GOOGLE_CHROMEEC_PD_BOARDNAME config UART_FOR_CONSOLE int default 2 + endif diff --git a/src/mainboard/google/glados/variants/asuka/data.vbt b/src/mainboard/google/glados/variants/asuka/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..8f2a7b0614404d5a1ba4a78e14a66d0f23b09012 GIT binary patch literal 4608 zcmeHKUu;ul6hF7Of4_TgcXx+U3eF?q=mu=J118KVw`&J0>sY&vIid+2wCG}CV;g4p zj~ZvP#9;d1A2dXl_+s#7iSfx8c`+_oRAM4N%8Lo2CMIHh0qXhgy{y%RtikvP<+SHJ z=lkyI@1AqMf2ZpPI|ne`vo8_p=|Y>bpu@cSJ+(`zGv1fpABzk`_ID=wqCL0(cf#xH zwMzh5L0Bb+bv+zEGMUSV`Wp#0fxV*#M)J9qSZ?Bp$5)RJ}di*1mPS!eU*~zTRX! z5gCa0?ZLi&jK$NDbh@jzGqDeo{e9i>&iFuAOks;*L`TPtkB>a|_#}p+jo3=>*kpp5 zE@O0be5@HG`8@V>n+fdCP2|R(%w?Mu#zD@4*C_x9E~trs09RW9yo+BIoCY`%oGKUy zh6S31{f=ST<&xzY$t#cl{K7|?oz#(wN@hPZ*Ju7M`=wuymT-afTYUM4Iv0X4A#L4$UxGp zo4jD&yp<`hZU_--mi)951|Sq9@QL4#QSS^9K;tVQKEQC8X%mb+%kUkheZbhq48LXC zuZ#&2u9vj!5{pVWB56-c>_rLRleCW{_NjzFN?J)`J{enNEh4iX8IQ`^3o<(?DnIVjz(n)DML6<#`Rz`8iu{^?T4MKQm4TcIU ztQ^(1op4ywA@k#Wd4%jLFe1>P2WHwVgh1N~(W=kLO>lCA4yu`M9EIKlr&6FB`dHnf z5A;K>%TumkRR~j<3aW-$fglvk>aR+KcUz_|q=F5`(5bQyLeZ@GWWzmIg%9034E?}d zt6`iiBe<;!NFH=mlgUH(44z3ry}q+(&jrt9(Y!m!m1^?vOmlHI6RbCMwC93m(^)jD zQ@P-&CW=r;VRmfpUP5Rp&qdL!Q{-9KbQSC2&Bobtsp++P@{N^?2qKuJF=etE1ii_a z&rE0aK+38Ifua!U=-}(&CfB5ipjZeltRjj_L6}YAN?q2YLv;4kjG$2!ex{RvUmVKZ@l>3m_ncSZoK9bAt89to* z4|J>mE87jvgM0Tp)#PXF_M%wUE64wYUit%7zMtzG?|_p#Nye#C-%FQO7B&j6!9}ro Y4q#@HZV7d>kM0G&pJ>tErkl&aZ;9f<9{>OV literal 0 HcmV?d00001 diff --git a/src/mainboard/google/glados/variants/caroline/data.vbt b/src/mainboard/google/glados/variants/caroline/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..02e1cd10f68fba12d9de799f7800043f63b4f2b8 GIT binary patch literal 4608 zcmeHKU2GIp6h5=FzjtP~(<#cbU_Bzjwm>^upq5%?w!4Kc-O}A|sU@1Qgy3zQ9>DfK^ zoO|}pH|J;WowMuu+xsxvwJ#Ox>OhC`pu>#%6pf3iJ=v4ppNRFv_P3{c;$3(i?uNJ2 z8&?4Gg0M=C>UuPJWV}#}^wtq<3cH673>6EFiNe^^7#$oh6^q!**NkCrVXQFvOd;Q(Fb;AK{B8k2@IX}z1i0P=;Gg}f;5NXG;8wvv zFjPR5|LO)X01!asPN?A8Cb-D9-Vfdox7;Lx7cJf3iycBYT+D&0`mYcYCm(>vQd9xS z6Y_-^4QJIgXO+vkE&oM8(w$YvHNpx8xH6vvv~Nu|a+*jb?{B+m{?-4CE>fh|o~3(P zVRIpH0tgB^917IJE-?b*q6=OWTVSnw2K)hpjR6%NA^#hFHq)dVS#+mrat-XJ4J`WGCf8Vj>;*92Q$&~mR_*LHvTO3qhtgWK;$85DEe(8a zwp={^o4Y514Z-*mHZFpgJwnat3$?)^x(f zK&gzE?os`@wRTQw|D5IC$LX1L`RQOV07;dh6Cx0T1gwJB+ZmqK*mN{i^;4@#-pruAF0-#?{8iR`3aeJ| zK}Aa{EUVygMSE3YZz%YQqJ62bZxy_*XjMVBDu_FRS|-RI3o7+4Psw#jC{+ioM#n!Y z)7dlNk}Y{vP)T~KHqcvcaZ#F2(951jE2B8zS{h-h3L!eM1|y{vc8+SBPq^%I$R%Hk zdufFHDllTOUJspYwh=rd$2chh>d@#Jz75LD(!_W^*HyOscIRvlW0m=Oy z5SPy6q5JyJW}sHzS$1l{Gg-FYo#aX-d3e5|Je3RA8ag_)plZ6yR(DF(tR#v^TWM-! z`hG&FpQ}aL>Qm$?&twHryi+%IAv3vFPrto#7C{8b$z&x6dc84|o6PH>jNK0cMIqAB zK_v4QW9dvTdL}Id#YXU81qfHdFqOuYx~#|fRbcs0ru|4hRJJc%t)md(b%=DAvk zP-P*|pB*oc;`aNZ&VXDAYI3St&9Ab3phJ{MPVG$ZPY)g`6!#1sF8mKBJg9}V@g?x? zo}r%ntTSE~=k)pZzo479&_WLYHr)lMc9Jnko%&vSS><7q@FrXq8>RtH&e9#BZV7-; SqW@nl&Yrq8)aCio8TcItGQ%GL literal 0 HcmV?d00001 diff --git a/src/mainboard/google/glados/variants/cave/data.vbt b/src/mainboard/google/glados/variants/cave/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..02e1cd10f68fba12d9de799f7800043f63b4f2b8 GIT binary patch literal 4608 zcmeHKU2GIp6h5=FzjtP~(<#cbU_Bzjwm>^upq5%?w!4Kc-O}A|sU@1Qgy3zQ9>DfK^ zoO|}pH|J;WowMuu+xsxvwJ#Ox>OhC`pu>#%6pf3iJ=v4ppNRFv_P3{c;$3(i?uNJ2 z8&?4Gg0M=C>UuPJWV}#}^wtq<3cH673>6EFiNe^^7#$oh6^q!**NkCrVXQFvOd;Q(Fb;AK{B8k2@IX}z1i0P=;Gg}f;5NXG;8wvv zFjPR5|LO)X01!asPN?A8Cb-D9-Vfdox7;Lx7cJf3iycBYT+D&0`mYcYCm(>vQd9xS z6Y_-^4QJIgXO+vkE&oM8(w$YvHNpx8xH6vvv~Nu|a+*jb?{B+m{?-4CE>fh|o~3(P zVRIpH0tgB^917IJE-?b*q6=OWTVSnw2K)hpjR6%NA^#hFHq)dVS#+mrat-XJ4J`WGCf8Vj>;*92Q$&~mR_*LHvTO3qhtgWK;$85DEe(8a zwp={^o4Y514Z-*mHZFpgJwnat3$?)^x(f zK&gzE?os`@wRTQw|D5IC$LX1L`RQOV07;dh6Cx0T1gwJB+ZmqK*mN{i^;4@#-pruAF0-#?{8iR`3aeJ| zK}Aa{EUVygMSE3YZz%YQqJ62bZxy_*XjMVBDu_FRS|-RI3o7+4Psw#jC{+ioM#n!Y z)7dlNk}Y{vP)T~KHqcvcaZ#F2(951jE2B8zS{h-h3L!eM1|y{vc8+SBPq^%I$R%Hk zdufFHDllTOUJspYwh=rd$2chh>d@#Jz75LD(!_W^*HyOscIRvlW0m=Oy z5SPy6q5JyJW}sHzS$1l{Gg-FYo#aX-d3e5|Je3RA8ag_)plZ6yR(DF(tR#v^TWM-! z`hG&FpQ}aL>Qm$?&twHryi+%IAv3vFPrto#7C{8b$z&x6dc84|o6PH>jNK0cMIqAB zK_v4QW9dvTdL}Id#YXU81qfHdFqOuYx~#|fRbcs0ru|4hRJJc%t)md(b%=DAvk zP-P*|pB*oc;`aNZ&VXDAYI3St&9Ab3phJ{MPVG$ZPY)g`6!#1sF8mKBJg9}V@g?x? zo}r%ntTSE~=k)pZzo479&_WLYHr)lMc9Jnko%&vSS><7q@FrXq8>RtH&e9#BZV7-; SqW@nl&Yrq8)aCio8TcItGQ%GL literal 0 HcmV?d00001 diff --git a/src/mainboard/google/glados/variants/chell/data.vbt b/src/mainboard/google/glados/variants/chell/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..a654a5efd5fb57401c093ce712fbf428ce3709ae GIT binary patch literal 4608 zcmeHKU2GIp6h1SvzjtP~(<#cbU_Bzjwm>^upq5%?w!4Kc-O}A|sYOlL!Y`tXksG97hpYiX6O%%bffVH!a$vx$_87HGsXft?*&mPgMfbNSdtzO94(^7x zwCk4va)Pi*i5NyCab!GS2=~?zY!bVN4-6IZjq&{0)8oSVkS6a9?HHd2k&NOSA9?JA3R#Cp0@ ziDa}d(X$78dNH2JL^GL=?)Kz9O!fA3CfXBy9dVV-g%KMbIX*h{j1~&m%g2miZ+WmVt*YZ08lJ1N`t`Szi&y|HFp#5sHk<&yPd4J1M3!naHbcrIp`YgT6 z3Y!ao6F@*P;E=x-c1d9vmqd6`YJs(`S@8K0Hu^Pqgg8xn&duN(;_rxmApV8;8nM^I zpqh9!@dLz-#M_Bu#NEV?5)Tr4j=|NkSmaYcR1_RpZA;Kx@LC-dPdoP0j@|z=O*Rp8 zr0ht`SV2=Rd%bYI{8bRjW#7Zx1CtOaY$5I-bviO>Nl8jM{XUXBR|8JJT=r+F+eFvj z*Rpdkx7f;MdXYu9tESYzZd$;SuWfRT706zI@_VWT6TqsSwMKSbx$#k2gI2r?o{*)1 zx6PJI+kf*;i0=uje-zJq8JzcC5vFSXn;OrWw#;Q`mOe0NTd@0g+B+FooPjl+aKT?J z;l+D2Uv{m1ulCPb?tOy3Nzq3eg9%8g0-X?sAjDxEtbi<}th&hu*2%lji^@!hP_^XI zg)ji&5P^>^wo&g45kTGRAU(uzkm+NLy}1`^9j+O4yEXAaV?LK zTLoqm)*Hd8W*Z^cd_uD8GjbCwgf^;~{x}Mw9!{mfFpZI#IUndjt}7GnP(=t6m=0;C zwg5pWS=C>K2p=>~Tug`7n**ojeGp0>%LmglQ-KeiJ51xiOp|Gzok#H46_C>J25I?B z9=fmpOd4v9oh4^3cqU8M*-5Tcl85ITO4Hd;t!bb$7c`r$l2x73Y*rFQxUD!nGIKv6 z)X&dF$*NP7Y4>CWQM^+(eLg+8)=0g*at=WP*~w%j2u8g*o1M%V!L(fu0!1Ow)0BpJoPVOXQf-3dBbXetJlkg^7k{V_Jrsn9jP`CI&DAND0 P7H3V}9O|9^@)`IYcV5CD literal 0 HcmV?d00001 diff --git a/src/mainboard/google/glados/variants/lars/data.vbt b/src/mainboard/google/glados/variants/lars/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..0aac82c3b18d3bb71258b1a04aaadf8dee2152e9 GIT binary patch literal 4608 zcmeHKUu;ul6hF7Of4_TgcXx+U3eF=UbOW~A0Tbqw+qHw0b*x>-9MOahT6D3nu?;i) zM~yQfF_=F12My6Bz8HL2Vtg`2UW`kK%8U3YFD6JdF%jbna6R9>m$kT%H5mV3IPLk) z`Of$C_nq_oJzX=@HHg{Xy{TAlH#(FD9p=>yR4%5jWPf&FA~qP?*Olsz_u@IY7v5H{ zUk1nv!U{R6>(S)lsX{R_&_u8)>>JxZS}e3C3X{)Fjg4bEp2XOJ1BGH?Vq~h2$L!F~ z7;;R7bsZfo=5hDYL;DL89Y{br^~UJtmQ9-xqpfZ9)uUTT)jOi?9b2|3EYThB?@K3B zvB6~jZtNexL^2!8X1n{kQhPBy(BG5nN)C1>6t)mXd~E#K#OPB`Phlk9gl#m&Mhnz( z8RKIU<1H8~7IA?0nZ$v@WMSgjLcT>|9ONwc-2#B%fw~w7aIFo%zwlMTZGaoWt%8AI zsDLVObpsdx2%vH&RB&w(Tx4782XBa5ZVe#I3~Jh~vb4#E%n?5POfpRnt}COF&c-99eHmP~Gr)6O>Ln_S23% z@Cz+A5p$&ENXuA5VVXW4TsOZCfob|5Kw%3B2dT%ADNBlC+Nlqc|&p&b46I@0NFG;N}@v z)dLp-r7~W;Pxa?k+ii`vXSx4L+LJCnT?_^wsWS9H1VWI2HLwhFkhbzBKUgnswHLLS z5TS0-Ppe@7B4GlbyxB&zGeiJQZ-Dp+!x5%UGWH_F5194|W1lnpfoZ=pCP=tW(zZz~ zF5#%8Juk6WCHzRzK9ks&68L6 z{t21xo?(}4$t!|N(o?sNUb)4K(teyCdmgQf;;?IJgxNZT=c;{;Hp=Z0H@1JWkjI$L4ublzO zL!Me@^56qQXEM;J?2uL!K&}K0IaRH%_&}E^_aU_-y)Qj-xKP|Za;We>sMrBkm+M~! z@2+{u$S+No<(|II%!?gt{p} P?*czhv}y0s?aja+nFGQf literal 0 HcmV?d00001 diff --git a/src/mainboard/google/glados/variants/sentry/data.vbt b/src/mainboard/google/glados/variants/sentry/data.vbt new file mode 100644 index 0000000000000000000000000000000000000000..0aac82c3b18d3bb71258b1a04aaadf8dee2152e9 GIT binary patch literal 4608 zcmeHKUu;ul6hF7Of4_TgcXx+U3eF=UbOW~A0Tbqw+qHw0b*x>-9MOahT6D3nu?;i) zM~yQfF_=F12My6Bz8HL2Vtg`2UW`kK%8U3YFD6JdF%jbna6R9>m$kT%H5mV3IPLk) z`Of$C_nq_oJzX=@HHg{Xy{TAlH#(FD9p=>yR4%5jWPf&FA~qP?*Olsz_u@IY7v5H{ zUk1nv!U{R6>(S)lsX{R_&_u8)>>JxZS}e3C3X{)Fjg4bEp2XOJ1BGH?Vq~h2$L!F~ z7;;R7bsZfo=5hDYL;DL89Y{br^~UJtmQ9-xqpfZ9)uUTT)jOi?9b2|3EYThB?@K3B zvB6~jZtNexL^2!8X1n{kQhPBy(BG5nN)C1>6t)mXd~E#K#OPB`Phlk9gl#m&Mhnz( z8RKIU<1H8~7IA?0nZ$v@WMSgjLcT>|9ONwc-2#B%fw~w7aIFo%zwlMTZGaoWt%8AI zsDLVObpsdx2%vH&RB&w(Tx4782XBa5ZVe#I3~Jh~vb4#E%n?5POfpRnt}COF&c-99eHmP~Gr)6O>Ln_S23% z@Cz+A5p$&ENXuA5VVXW4TsOZCfob|5Kw%3B2dT%ADNBlC+Nlqc|&p&b46I@0NFG;N}@v z)dLp-r7~W;Pxa?k+ii`vXSx4L+LJCnT?_^wsWS9H1VWI2HLwhFkhbzBKUgnswHLLS z5TS0-Ppe@7B4GlbyxB&zGeiJQZ-Dp+!x5%UGWH_F5194|W1lnpfoZ=pCP=tW(zZz~ zF5#%8Juk6WCHzRzK9ks&68L6 z{t21xo?(}4$t!|N(o?sNUb)4K(teyCdmgQf;;?IJgxNZT=c;{;Hp=Z0H@1JWkjI$L4ublzO zL!Me@^56qQXEM;J?2uL!K&}K0IaRH%_&}E^_aU_-y)Qj-xKP|Za;We>sMrBkm+M~! z@2+{u$S+No<(|II%!?gt{p} P?*czhv}y0s?aja+nFGQf literal 0 HcmV?d00001