From e657f5da15758592d046d27923d21941dbc0451d Mon Sep 17 00:00:00 2001
From: Sean Rhodes <sean@starlabs.systems>
Date: Sun, 22 Mar 2026 19:58:05 +0000
Subject: [PATCH] mainboard/starlabs: drop redundant vbt.bin overrides

drivers/intel/gma/opregion already provides a weak
mainboard_vbt_filename() implementation that returns "vbt.bin".

Drop the Starlabs overrides that return the same filename and keep only
the remaining board-specific override that still selects an alternate
VBT. This also removes the now-dead overrides left behind after
display-native-resolution VBT selection was dropped.

Change-Id: I89ec4f55d4c4ed3265a8d429c3d399977ad466d7
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/91814
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
---
 src/mainboard/starlabs/adl/variants/hz/ramstage.c          | 6 ------
 src/mainboard/starlabs/adl/variants/i5/ramstage.c          | 6 ------
 src/mainboard/starlabs/starbook/mainboard.c                | 5 -----
 src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c | 6 ------
 4 files changed, 23 deletions(-)

diff --git a/src/mainboard/starlabs/adl/variants/hz/ramstage.c b/src/mainboard/starlabs/adl/variants/hz/ramstage.c
index de25c0a7e5..3e9cfb13c4 100644
--- a/src/mainboard/starlabs/adl/variants/hz/ramstage.c
+++ b/src/mainboard/starlabs/adl/variants/hz/ramstage.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <drivers/intel/gma/opregion.h>
 #include <soc/ramstage.h>
 #include <common/pin_mux.h>
 
@@ -8,8 +7,3 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 {
 	configure_pin_mux(supd);
 }
-
-const char *mainboard_vbt_filename(void)
-{
-	return "vbt.bin";
-}
diff --git a/src/mainboard/starlabs/adl/variants/i5/ramstage.c b/src/mainboard/starlabs/adl/variants/i5/ramstage.c
index de25c0a7e5..3e9cfb13c4 100644
--- a/src/mainboard/starlabs/adl/variants/i5/ramstage.c
+++ b/src/mainboard/starlabs/adl/variants/i5/ramstage.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <drivers/intel/gma/opregion.h>
 #include <soc/ramstage.h>
 #include <common/pin_mux.h>
 
@@ -8,8 +7,3 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 {
 	configure_pin_mux(supd);
 }
-
-const char *mainboard_vbt_filename(void)
-{
-	return "vbt.bin";
-}
diff --git a/src/mainboard/starlabs/starbook/mainboard.c b/src/mainboard/starlabs/starbook/mainboard.c
index 93982cf807..31ec59bb30 100644
--- a/src/mainboard/starlabs/starbook/mainboard.c
+++ b/src/mainboard/starlabs/starbook/mainboard.c
@@ -18,8 +18,3 @@ static void starlabs_configure_gpios(void *unused)
 BOOT_STATE_INIT_ENTRY(BS_PRE_DEVICE, BS_ON_ENTRY, starlabs_configure_gpios, NULL);
 
 struct chip_operations mainboard_ops = {};
-
-const char *mainboard_vbt_filename(void)
-{
-	return "vbt.bin";
-}
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c b/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c
index 6e4471589e..6ffe593f7f 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <option.h>
-#include <drivers/intel/gma/opregion.h>
 #include <soc/ramstage.h>
 #include <common/pin_mux.h>
 
@@ -12,8 +11,3 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 	if (get_uint_option("thunderbolt", 1) == 0)
 		supd->UsbTcPortEn = 0;
 }
-
-const char *mainboard_vbt_filename(void)
-{
-	return "vbt.bin";
-}