mainboard/starlabs: drop display_native_res VBT toggle

A local patch providing basic 2x scaling in edk2 means that the
fixed resolution VBTs are no longer needed so always use the
native-resolution VBT by default,

Remove the CFR option to pick which VBT to use, so only the native
resolution VBTs are used and included.

Change-Id: Ib7f4c546a01ebfba963b7591af9d5e24c0611206
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/91618
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/mainboard/starlabs/adl/cfr.c

@@ -58,23 +58,16 @@ static struct sm_obj_form keyboard_group = {
 };
 #endif
 
-#if CONFIG(SYSTEM_TYPE_LAPTOP) || CONFIG(SYSTEM_TYPE_DETACHABLE)
+#if CONFIG(BOARD_STARLABS_LITE_ADL)
 static struct sm_obj_form display_group = {
 	.ui_name = "Display",
 	.obj_list =
 		(const struct sm_object *[]){
-#if CONFIG(BOARD_STARLABS_LITE_ADL)
 					     &accelerometer,
-#endif
-					     &display_native_res,
-#if CONFIG(BOARD_STARLABS_LITE_ADL)
 					     &touchscreen,
-#endif
 					     NULL, },
 };
-#endif
 
-#if CONFIG(BOARD_STARLABS_LITE_ADL)
 static struct sm_obj_form io_expansion_group = {
 	.ui_name = "I/O / Expansion",
 	.obj_list =
@@ -140,10 +133,8 @@ static struct sm_obj_form *sm_root[] = {
 #endif
 	&battery_group,
 	&debug_group,
-#if CONFIG(SYSTEM_TYPE_LAPTOP) || CONFIG(SYSTEM_TYPE_DETACHABLE)
-	&display_group,
-#endif
 #if CONFIG(BOARD_STARLABS_LITE_ADL)
+	&display_group,
 	&io_expansion_group,
 #endif
 #if CONFIG(SYSTEM_TYPE_LAPTOP)

src/mainboard/starlabs/adl/variants/hz/Makefile.mk

@@ -8,5 +8,3 @@ ramstage-y += devtree.c
 ramstage-y += gpio.c
 ramstage-y += hda_verb.c
 ramstage-y += ramstage.c
-
-$(call add_vbt_to_cbfs, vbt_native_res.bin, data_native_res.vbt)

src/mainboard/starlabs/adl/variants/hz/ramstage.c

@@ -2,7 +2,6 @@
 
 #include <drivers/intel/gma/opregion.h>
 #include <soc/ramstage.h>
-#include <option.h>
 #include <common/pin_mux.h>
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
@@ -12,8 +11,5 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 
 const char *mainboard_vbt_filename(void)
 {
-	if (get_uint_option("display_native_res", 0) == 1)
-		return "vbt_native_res.bin";
-
 	return "vbt.bin";
 }

src/mainboard/starlabs/adl/variants/i5/Makefile.mk

@@ -9,5 +9,3 @@ ramstage-y += gpio.c
 ramstage-y += hda_verb.c
 ramstage-y += mainboard_ssdt.c
 ramstage-y += ramstage.c
-
-$(call add_vbt_to_cbfs, vbt_native_res.bin, data_native_res.vbt)

src/mainboard/starlabs/adl/variants/i5/ramstage.c

@@ -2,7 +2,6 @@
 
 #include <drivers/intel/gma/opregion.h>
 #include <soc/ramstage.h>
-#include <option.h>
 #include <common/pin_mux.h>
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
@@ -12,8 +11,5 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 
 const char *mainboard_vbt_filename(void)
 {
-	if (get_uint_option("display_native_res", 0) == 1)
-		return "vbt_native_res.bin";
-
 	return "vbt.bin";
 }

src/mainboard/starlabs/common/include/common/cfr.h

@@ -40,14 +40,6 @@ static const struct sm_object card_reader = SM_DECLARE_BOOL({
 	.default_value	= !CONFIG(BOARD_STARLABS_LITE_ADL),
 }, WITH_CALLBACK(cfr_card_reader_update));
 
-static const struct sm_object display_native_res = SM_DECLARE_BOOL({
-	.opt_name	= "display_native_res",
-	.ui_name	= "Display: Use Native Resolution",
-	.ui_helptext	= "Enabled: use the native panel resolution at boot.\n"
-			  "Disabled: use a fixed/scaled video mode at boot.",
-	.default_value	= false,
-});
-
 static const struct sm_object fingerprint_reader = SM_DECLARE_BOOL({
 	.opt_name	= "fingerprint_reader",
 	.ui_name	= "Fingerprint Reader",

src/mainboard/starlabs/starbook/cfr.c

@@ -36,16 +36,6 @@ static struct sm_obj_form debug_group = {
 	},
 };
 
-#if CONFIG(BOARD_USES_FIXED_MODE_VBT)
-static struct sm_obj_form display_group = {
-	.ui_name = "Display",
-	.obj_list = (const struct sm_object *[]) {
-		&display_native_res,
-		NULL
-	},
-};
-#endif
-
 static struct sm_obj_form io_expansion_group = {
 	.ui_name = "I/O / Expansion",
 	.obj_list = (const struct sm_object *[]) {
@@ -156,9 +146,6 @@ static struct sm_obj_form *sm_root[] = {
 	&audio_video_group,
 	&battery_group,
 	&debug_group,
-	#if CONFIG(BOARD_USES_FIXED_MODE_VBT)
-	&display_group,
-	#endif
 	&io_expansion_group,
 	&keyboard_group,
 	&leds_group,

src/mainboard/starlabs/starbook/mainboard.c

@@ -4,7 +4,6 @@
 #include <device/device.h>
 #include <drivers/intel/gma/opregion.h>
 #include <soc/ramstage.h>
-#include <option.h>
 #include <variants.h>
 
 static void starlabs_configure_gpios(void *unused)
@@ -22,8 +21,5 @@ struct chip_operations mainboard_ops = {};
 
 const char *mainboard_vbt_filename(void)
 {
-	if (CONFIG(BOARD_USES_FIXED_MODE_VBT) && get_uint_option("display_native_res", 0) == 1)
-		return "vbt_native_res.bin";
-
 	return "vbt.bin";
 }

src/mainboard/starlabs/starbook/variants/adl_n/Makefile.mk

@@ -8,5 +8,3 @@ ramstage-y += devtree.c
 ramstage-y += gpio.c
 ramstage-y += hda_verb.c
 ramstage-y += ramstage.c
-
-$(call add_vbt_to_cbfs, vbt_native_res.bin, data_native_res.vbt)

src/mainboard/starlabs/starbook/variants/mtl/Makefile.mk

@@ -8,5 +8,3 @@ ramstage-y += devtree.c
 ramstage-y += gpio.c
 ramstage-y += hda_verb.c
 ramstage-y += ramstage.c
-
-$(call add_vbt_to_cbfs, vbt_native_res.bin, data_native_res.vbt)

src/mainboard/starlabs/starfighter/cfr.c

@@ -28,14 +28,6 @@ static struct sm_obj_form debug_group = {
 	},
 };
 
-static struct sm_obj_form display_group = {
-	.ui_name = "Display",
-	.obj_list = (const struct sm_object *[]) {
-		&display_native_res,
-		NULL
-	},
-};
-
 #if CONFIG(DRIVERS_INTEL_USB4_RETIMER)
 static struct sm_obj_form io_expansion_group = {
 	.ui_name = "I/O / Expansion",
@@ -138,7 +130,6 @@ static struct sm_obj_form wireless_group = {
 static struct sm_obj_form *sm_root[] = {
 	&battery_group,
 	&debug_group,
-	&display_group,
 	#if CONFIG(DRIVERS_INTEL_USB4_RETIMER)
 	&io_expansion_group,
 	#endif

src/mainboard/starlabs/starfighter/variants/mtl/Makefile.mk

@@ -10,6 +10,4 @@ ramstage-y += devtree.c
 ramstage-y += gpio.c
 ramstage-y += hda_verb.c
 ramstage-y += ramstage.c
-
-$(call add_vbt_to_cbfs, vbt_native_res.bin, data_native_res.vbt)
 $(call add_vbt_to_cbfs, vbt_qhd.bin, data_qhd.vbt)

src/mainboard/starlabs/starfighter/variants/mtl/ramstage.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <option.h>
 #include <drivers/intel/gma/opregion.h>
 #include <soc/ramstage.h>
 #include <variants.h>
@@ -14,10 +13,6 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 
 const char *mainboard_vbt_filename(void)
 {
-	if (get_uint_option("display_native_res", 0) == 1)
-		return "vbt_native_res.bin";
-
-
 	if (get_memory_config_straps() == 13)
 		return "vbt_qhd.bin";
 	return "vbt.bin";

src/mainboard/starlabs/starfighter/variants/rpl/Makefile.mk

@@ -8,5 +8,3 @@ ramstage-y += devtree.c
 ramstage-y += gpio.c
 ramstage-y += hda_verb.c
 ramstage-y += ramstage.c
-
-$(call add_vbt_to_cbfs, vbt_native_res.bin, data_native_res.vbt)

src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c

@@ -15,8 +15,5 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 
 const char *mainboard_vbt_filename(void)
 {
-	if (get_uint_option("display_native_res", 0) == 1)
-		return "vbt_native_res.bin";
-
 	return "vbt.bin";
 }