From 17b36286c894dbaa72b9d278c47a5ffd429d3f92 Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Mon, 29 Dec 2025 08:39:03 -0600
Subject: [PATCH] mb/google/hatch/var/kindred: Drop VBT for KLED variant

The KLED VBT file is misconfigured and results in an error under Linux:

    [drm] ERROR VBT has malformed LFP data table pointers

Inspecting the VBT using the Intel BMP tool reveals invalid data for
many of the panel definitions, as well as other settings.

KLED works perfectly fine with the kindred VBT, so use that instead.

TEST=build/boot Win11/Linux on KLED, verify display output works
properly.

Change-Id: I09aaa5c17517633fdae508239ecf8e72e3990e33
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/90637
Reviewed-by: Eric Lai <ericllai@google.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 .../google/hatch/variants/kindred/Makefile.mk    |   2 --
 .../google/hatch/variants/kindred/kled-data.vbt  | Bin 4612 -> 0 bytes
 .../google/hatch/variants/kindred/variant.c      |  11 -----------
 3 files changed, 13 deletions(-)
 delete mode 100644 src/mainboard/google/hatch/variants/kindred/kled-data.vbt

diff --git a/src/mainboard/google/hatch/variants/kindred/Makefile.mk b/src/mainboard/google/hatch/variants/kindred/Makefile.mk
index 767e119dbc..1676fd9798 100644
--- a/src/mainboard/google/hatch/variants/kindred/Makefile.mk
+++ b/src/mainboard/google/hatch/variants/kindred/Makefile.mk
@@ -12,5 +12,3 @@ SPD_SOURCES += 16G_3200   # 0b111
 bootblock-y += gpio.c
 ramstage-y += gpio.c
 ramstage-y += variant.c
-
-$(call add_vbt_to_cbfs, vbt-kled.bin, kled-data.vbt)
diff --git a/src/mainboard/google/hatch/variants/kindred/kled-data.vbt b/src/mainboard/google/hatch/variants/kindred/kled-data.vbt
deleted file mode 100644
index f07cb69c062a52918f8fbbf02c6d9474579ef699..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4612
zcmeHKU2GIp6h5=l{kt=>ot+Zdu2>Jyz;2;sw!n(D#M$l^yL8KLyQL}7qy=_?hK1Jt
zXfc?sNuxX{*#|UeQ2IhtUc@Kk8@?D46D2XxCnF{%D85MK#el45?o59y!7dn33}@%u
zbMBdYzd7gro~`d|>&0y6u2ihE9c{{i4rlynDsQE>WI8*Li1o$>+EVFwC;kYJz_|bB
z6@Z)|)XEWEk0cL|=L?~pFu|s<Yk1F4A-^G!A3HccJc5~c5@UP!<_r1J-Q)QjX8WFr
zp^2%mwuzxa4tGo(+LIq`K?2gLHAXfyZQO(y+0aan9@$K)-V%wnY<^N<iS~H9E0avc
zdXwoLnC`(uG8@Zg+q>FQyD-y}?nt&Jd)pHVn+qd8JaS}oX#at648_CPOy6kapxkAQ
z508#CVXRQV9<$9D_T<O%qc7xhO$swX&V#2)01%u|ZGZrOGy`}RJXHYJV*t=YL~qGr
z>D-`#W2@jG+gcB}0^DR51TS*c0GzWUb^rVTsH#WvT1Gd0o-_ee0ZoP1kUn8GtGAoc
zhaJ2F3dj|+Ez*yO(4uxT64pm`0WF0$Q>|vuVK<Y^x=Hw#X54hY3y~tZ@e+O2jED=t
zBmkeF!*OpNq{R>%6&>)ZxCI)jE`aVu$a+=SM|_0%YbS&6h%XagCB9DVbTOzVt|eYg
z+(`Tcag4Z=cqj1y@er|V0&bKYMWC4=DhjsrTN2bNI39-LDcgR^wtIi2Nhe~qlx)e3
z6%^&N+YL9%Uk0FD_G~phFbILd77{j6hb>cFiekpD_mVWns^6}c%ibJS9ejb@tMV)n
z`vT@RUb#FQ<AbWnHL#s_qv&a!UcqD82~a+*h%gDvPutBVO`ctt+_3CDa0RVb?$+5h
zi{-!hCTN}xkILdjH-n4rYr?Ub|E6Y+nYzT!8dq9i_R(O~AC?bC;Lb*1MF)K2Etc@o
zW2$FxmDRWI?ktZ#M{CyMp@YK!BvpnE2tfc6P!G#s5HdW+^4OR40yir&Awo63-WT*-
zq=xDUd~A^sz&xNWWB3G!`x(B$w9|}z$nYzs{lM5S4E>U}T4Ie7W+g2zv0(|{l(hFH
z_OXQDO4`p7`%S`HSz9Nw%`!eKYlmd^qKxm#+D9_`RL1XR?W)YK%eYd}HY#kZf_oKh
zLSa)1o>8<<6!w{dmlf@Ig^4~4`?RNgtlftPecH=D_L@&=(40lbC86l|@f^i7D%1JY
z?~u8?Ca5Hx)obZCymextQ-XB_$SC$ZmPVMVMu_yUz)*3SH6(S>DeGdS`Jy9#X@p!Y
z7%^C*2aZK8gg|skv{EZ_6RJ#vR!XpLABElkC%Zv6^pTo5AE=|L%ahJvMF^AF9aIf<
z0fJC+-T}e~8zwJx2iF+=C+B?-N-mCIxXxAJL&wvGzUN%CVVs{wa9Np>+~=%hB=@cC
zJKGI)`nHli7v@No`29+*R5A`nn@Tf-!8$`ndoE};t4chRm5c65q6oDXXGYGgCWHnv
zb^t<fmUu2B&p4+mSP$=nXD)V6uhKJbFP}pYfv3^3;i?2dZ!j(lPUrMMx0N@VK8Um&
ziSBkyas<UfaAE~fTnWNV2AAuy9-oh*MEj9^D7v@s^<XaY+plUzOEK{LmPVt$aegjD
zsJ48de?Uv`i?9KMMW`86RsXyXbdZ`pq_$-SGP@7w3p;in%Kr~4R)Bw3u6qSs+b>Wq
zf7UL466f`W_J5$47m;HTt&hU%+sMfzW%oPj0?WaA;VmFXX8TcI%*nNgnsfn<&C!FQ
XT9YyR=jFc3jpngs9ssn<?jijNQ1;p)

diff --git a/src/mainboard/google/hatch/variants/kindred/variant.c b/src/mainboard/google/hatch/variants/kindred/variant.c
index cf23608f67..e379419c0f 100644
--- a/src/mainboard/google/hatch/variants/kindred/variant.c
+++ b/src/mainboard/google/hatch/variants/kindred/variant.c
@@ -5,7 +5,6 @@
 #include <soc/pci_devs.h>
 #include <ec/google/chromeec/ec.h>
 #include <sar.h>
-#include <drivers/intel/gma/opregion.h>
 #include <static.h>
 
 void variant_devtree_update(void)
@@ -45,13 +44,3 @@ const char *get_wifi_sar_cbfs_filename(void)
 		return "wifi_sar-kled.hex";
 	return WIFI_SAR_CBFS_DEFAULT_FILENAME;
 }
-
-const char *mainboard_vbt_filename(void)
-{
-	uint32_t sku_id = google_chromeec_get_board_sku();
-
-	if (sku_id == 1 || sku_id == 2 || sku_id == 3 || sku_id == 4)
-		return "vbt-kled.bin";
-	else
-		return "vbt.bin";
-}