diff --git a/src/mainboard/starlabs/adl/cfr.c b/src/mainboard/starlabs/adl/cfr.c index 8c8f5f601f..89f7730e45 100644 --- a/src/mainboard/starlabs/adl/cfr.c +++ b/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) diff --git a/src/mainboard/starlabs/adl/variants/hz/Makefile.mk b/src/mainboard/starlabs/adl/variants/hz/Makefile.mk index bfea7ef255..9abc069b38 100644 --- a/src/mainboard/starlabs/adl/variants/hz/Makefile.mk +++ b/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) diff --git a/src/mainboard/starlabs/adl/variants/hz/data.vbt b/src/mainboard/starlabs/adl/variants/hz/data.vbt index 8c22ab4f40..a101af780b 100644 Binary files a/src/mainboard/starlabs/adl/variants/hz/data.vbt and b/src/mainboard/starlabs/adl/variants/hz/data.vbt differ diff --git a/src/mainboard/starlabs/adl/variants/hz/data_native_res.vbt b/src/mainboard/starlabs/adl/variants/hz/data_native_res.vbt deleted file mode 100644 index a101af780b..0000000000 Binary files a/src/mainboard/starlabs/adl/variants/hz/data_native_res.vbt and /dev/null differ diff --git a/src/mainboard/starlabs/adl/variants/hz/ramstage.c b/src/mainboard/starlabs/adl/variants/hz/ramstage.c index 370f5c8769..de25c0a7e5 100644 --- a/src/mainboard/starlabs/adl/variants/hz/ramstage.c +++ b/src/mainboard/starlabs/adl/variants/hz/ramstage.c @@ -2,7 +2,6 @@ #include #include -#include #include 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"; } diff --git a/src/mainboard/starlabs/adl/variants/i5/Makefile.mk b/src/mainboard/starlabs/adl/variants/i5/Makefile.mk index d6e2d5b29d..4bd5ef44c0 100644 --- a/src/mainboard/starlabs/adl/variants/i5/Makefile.mk +++ b/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) diff --git a/src/mainboard/starlabs/adl/variants/i5/data.vbt b/src/mainboard/starlabs/adl/variants/i5/data.vbt index 3b0236d896..13c5b92d61 100644 Binary files a/src/mainboard/starlabs/adl/variants/i5/data.vbt and b/src/mainboard/starlabs/adl/variants/i5/data.vbt differ diff --git a/src/mainboard/starlabs/adl/variants/i5/data_native_res.vbt b/src/mainboard/starlabs/adl/variants/i5/data_native_res.vbt deleted file mode 100644 index 13c5b92d61..0000000000 Binary files a/src/mainboard/starlabs/adl/variants/i5/data_native_res.vbt and /dev/null differ diff --git a/src/mainboard/starlabs/adl/variants/i5/ramstage.c b/src/mainboard/starlabs/adl/variants/i5/ramstage.c index 370f5c8769..de25c0a7e5 100644 --- a/src/mainboard/starlabs/adl/variants/i5/ramstage.c +++ b/src/mainboard/starlabs/adl/variants/i5/ramstage.c @@ -2,7 +2,6 @@ #include #include -#include #include 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"; } diff --git a/src/mainboard/starlabs/common/include/common/cfr.h b/src/mainboard/starlabs/common/include/common/cfr.h index de4f108404..1a0dabbe86 100644 --- a/src/mainboard/starlabs/common/include/common/cfr.h +++ b/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", diff --git a/src/mainboard/starlabs/starbook/cfr.c b/src/mainboard/starlabs/starbook/cfr.c index d2e8b7c9ae..a561666812 100644 --- a/src/mainboard/starlabs/starbook/cfr.c +++ b/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, diff --git a/src/mainboard/starlabs/starbook/mainboard.c b/src/mainboard/starlabs/starbook/mainboard.c index 8916dda296..93982cf807 100644 --- a/src/mainboard/starlabs/starbook/mainboard.c +++ b/src/mainboard/starlabs/starbook/mainboard.c @@ -4,7 +4,6 @@ #include #include #include -#include #include 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"; } diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/Makefile.mk b/src/mainboard/starlabs/starbook/variants/adl_n/Makefile.mk index bfea7ef255..9abc069b38 100644 --- a/src/mainboard/starlabs/starbook/variants/adl_n/Makefile.mk +++ b/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) diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/data.vbt b/src/mainboard/starlabs/starbook/variants/adl_n/data.vbt index 70c3e07ea6..0cd0ec4b77 100644 Binary files a/src/mainboard/starlabs/starbook/variants/adl_n/data.vbt and b/src/mainboard/starlabs/starbook/variants/adl_n/data.vbt differ diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/data_native_res.vbt b/src/mainboard/starlabs/starbook/variants/adl_n/data_native_res.vbt deleted file mode 100644 index 0cd0ec4b77..0000000000 Binary files a/src/mainboard/starlabs/starbook/variants/adl_n/data_native_res.vbt and /dev/null differ diff --git a/src/mainboard/starlabs/starbook/variants/mtl/Makefile.mk b/src/mainboard/starlabs/starbook/variants/mtl/Makefile.mk index bfea7ef255..9abc069b38 100644 --- a/src/mainboard/starlabs/starbook/variants/mtl/Makefile.mk +++ b/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) diff --git a/src/mainboard/starlabs/starbook/variants/mtl/data.vbt b/src/mainboard/starlabs/starbook/variants/mtl/data.vbt index 680f2cfe23..f855dabf24 100644 Binary files a/src/mainboard/starlabs/starbook/variants/mtl/data.vbt and b/src/mainboard/starlabs/starbook/variants/mtl/data.vbt differ diff --git a/src/mainboard/starlabs/starbook/variants/mtl/data_native_res.vbt b/src/mainboard/starlabs/starbook/variants/mtl/data_native_res.vbt deleted file mode 100644 index f855dabf24..0000000000 Binary files a/src/mainboard/starlabs/starbook/variants/mtl/data_native_res.vbt and /dev/null differ diff --git a/src/mainboard/starlabs/starfighter/cfr.c b/src/mainboard/starlabs/starfighter/cfr.c index 6cdd98b189..2d3c6c3967 100644 --- a/src/mainboard/starlabs/starfighter/cfr.c +++ b/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 diff --git a/src/mainboard/starlabs/starfighter/variants/mtl/Makefile.mk b/src/mainboard/starlabs/starfighter/variants/mtl/Makefile.mk index c32caa48e9..93240a1307 100644 --- a/src/mainboard/starlabs/starfighter/variants/mtl/Makefile.mk +++ b/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) diff --git a/src/mainboard/starlabs/starfighter/variants/mtl/data.vbt b/src/mainboard/starlabs/starfighter/variants/mtl/data.vbt index af525583dd..cd70aad5d9 100644 Binary files a/src/mainboard/starlabs/starfighter/variants/mtl/data.vbt and b/src/mainboard/starlabs/starfighter/variants/mtl/data.vbt differ diff --git a/src/mainboard/starlabs/starfighter/variants/mtl/data_native_res.vbt b/src/mainboard/starlabs/starfighter/variants/mtl/data_native_res.vbt deleted file mode 100644 index cd70aad5d9..0000000000 Binary files a/src/mainboard/starlabs/starfighter/variants/mtl/data_native_res.vbt and /dev/null differ diff --git a/src/mainboard/starlabs/starfighter/variants/mtl/ramstage.c b/src/mainboard/starlabs/starfighter/variants/mtl/ramstage.c index b58fda0204..269878c746 100644 --- a/src/mainboard/starlabs/starfighter/variants/mtl/ramstage.c +++ b/src/mainboard/starlabs/starfighter/variants/mtl/ramstage.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include #include #include #include @@ -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"; diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/Makefile.mk b/src/mainboard/starlabs/starfighter/variants/rpl/Makefile.mk index bfea7ef255..9abc069b38 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/Makefile.mk +++ b/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) diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/data.vbt b/src/mainboard/starlabs/starfighter/variants/rpl/data.vbt index 9377482170..b0222677f6 100644 Binary files a/src/mainboard/starlabs/starfighter/variants/rpl/data.vbt and b/src/mainboard/starlabs/starfighter/variants/rpl/data.vbt differ diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/data_native_res.vbt b/src/mainboard/starlabs/starfighter/variants/rpl/data_native_res.vbt deleted file mode 100644 index b0222677f6..0000000000 Binary files a/src/mainboard/starlabs/starfighter/variants/rpl/data_native_res.vbt and /dev/null differ diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c b/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c index d17549ec3a..6e4471589e 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c +++ b/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"; }