From d4cb553986be17687df7cf3a081153e59d226e3d Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 2 May 2025 11:43:03 -0500 Subject: [PATCH] mb/starlabs/*/cfr: Remove `boot_option` CFR option This option isn't hooked up to anything currently, so remove it. Change-Id: I1777ee1910bb635181a348c55642aca1ff711b02 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/87559 Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes --- src/mainboard/starlabs/byte_adl/cfr.c | 12 ------------ src/mainboard/starlabs/lite/cfr.c | 12 ------------ src/mainboard/starlabs/starbook/cfr.c | 1 - src/mainboard/starlabs/starbook/cfr.h | 11 ----------- src/mainboard/starlabs/starfighter/cfr.c | 12 ------------ src/mainboard/starlabs/starlite_adl/cfr.c | 12 ------------ 6 files changed, 60 deletions(-) diff --git a/src/mainboard/starlabs/byte_adl/cfr.c b/src/mainboard/starlabs/byte_adl/cfr.c index 71c2d40941..08e6e4e0a2 100644 --- a/src/mainboard/starlabs/byte_adl/cfr.c +++ b/src/mainboard/starlabs/byte_adl/cfr.c @@ -10,17 +10,6 @@ #include #include -static const struct sm_object boot_option = SM_DECLARE_ENUM({ - .opt_name = "boot_option", - .ui_name = "Boot Option", - .ui_helptext = "Change the boot device in the event of a failed boot", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Fallback", 0 }, - { "Normal", 1 }, - SM_ENUM_VALUE_END }, -}); - static const struct sm_object gna = SM_DECLARE_BOOL({ .opt_name = "gna", .ui_name = "Gaussian & Neural Accelerator", @@ -175,7 +164,6 @@ static struct sm_obj_form pci = { static struct sm_obj_form coreboot = { .ui_name = "coreboot", .obj_list = (const struct sm_object *[]) { - &boot_option, &debug_level, &reboot_counter, NULL diff --git a/src/mainboard/starlabs/lite/cfr.c b/src/mainboard/starlabs/lite/cfr.c index c12d31da3d..b35b29609e 100644 --- a/src/mainboard/starlabs/lite/cfr.c +++ b/src/mainboard/starlabs/lite/cfr.c @@ -11,17 +11,6 @@ #include #include -static const struct sm_object boot_option = SM_DECLARE_ENUM({ - .opt_name = "boot_option", - .ui_name = "Boot Option", - .ui_helptext = "Change the boot device in the event of a failed boot", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Fallback", 0 }, - { "Normal", 1 }, - SM_ENUM_VALUE_END }, -}); - static const struct sm_object card_reader = SM_DECLARE_BOOL({ .opt_name = "card_reader", .ui_name = "Card Reader", @@ -154,7 +143,6 @@ static struct sm_obj_form pci = { static struct sm_obj_form coreboot = { .ui_name = "coreboot", .obj_list = (const struct sm_object *[]) { - &boot_option, &debug_level, &reboot_counter, NULL diff --git a/src/mainboard/starlabs/starbook/cfr.c b/src/mainboard/starlabs/starbook/cfr.c index 2af7cddc67..f549a18920 100644 --- a/src/mainboard/starlabs/starbook/cfr.c +++ b/src/mainboard/starlabs/starbook/cfr.c @@ -101,7 +101,6 @@ static struct sm_obj_form pci = { static struct sm_obj_form coreboot = { .ui_name = "coreboot", .obj_list = (const struct sm_object *[]) { - &boot_option, &debug_level, &reboot_counter, NULL diff --git a/src/mainboard/starlabs/starbook/cfr.h b/src/mainboard/starlabs/starbook/cfr.h index 622356ac00..cd247b9d83 100644 --- a/src/mainboard/starlabs/starbook/cfr.h +++ b/src/mainboard/starlabs/starbook/cfr.h @@ -8,17 +8,6 @@ #include #include -static const struct sm_object boot_option = SM_DECLARE_ENUM({ - .opt_name = "boot_option", - .ui_name = "Boot Option", - .ui_helptext = "Change the boot device in the event of a failed boot", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Fallback", 0 }, - { "Normal", 1 }, - SM_ENUM_VALUE_END }, -}); - static const struct sm_object card_reader = SM_DECLARE_BOOL({ .opt_name = "card_reader", .ui_name = "Card Reader", diff --git a/src/mainboard/starlabs/starfighter/cfr.c b/src/mainboard/starlabs/starfighter/cfr.c index c988148afc..9f2f1dd295 100644 --- a/src/mainboard/starlabs/starfighter/cfr.c +++ b/src/mainboard/starlabs/starfighter/cfr.c @@ -11,17 +11,6 @@ #include #include -static const struct sm_object boot_option = SM_DECLARE_ENUM({ - .opt_name = "boot_option", - .ui_name = "Boot Option", - .ui_helptext = "Change the boot device in the event of a failed boot", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Fallback", 0 }, - { "Normal", 1 }, - SM_ENUM_VALUE_END }, -}); - #if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_ALDERLAKE) || CONFIG(SOC_INTEL_RAPTORLAKE) static const struct sm_object gna = SM_DECLARE_BOOL({ .opt_name = "gna", @@ -230,7 +219,6 @@ static struct sm_obj_form pci = { static struct sm_obj_form coreboot = { .ui_name = "coreboot", .obj_list = (const struct sm_object *[]) { - &boot_option, &debug_level, &reboot_counter, NULL diff --git a/src/mainboard/starlabs/starlite_adl/cfr.c b/src/mainboard/starlabs/starlite_adl/cfr.c index 53e6a9f134..8455d3c592 100644 --- a/src/mainboard/starlabs/starlite_adl/cfr.c +++ b/src/mainboard/starlabs/starlite_adl/cfr.c @@ -18,17 +18,6 @@ static const struct sm_object accelerometer = SM_DECLARE_BOOL({ .default_value = true, }); -static const struct sm_object boot_option = SM_DECLARE_ENUM({ - .opt_name = "boot_option", - .ui_name = "Boot Option", - .ui_helptext = "Change the boot device in the event of a failed boot", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Fallback", 0 }, - { "Normal", 1 }, - SM_ENUM_VALUE_END }, -}); - #if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_ALDERLAKE) || CONFIG(SOC_INTEL_RAPTORLAKE) static const struct sm_object gna = SM_DECLARE_BOOL({ .opt_name = "gna", @@ -255,7 +244,6 @@ static struct sm_obj_form pci = { static struct sm_obj_form coreboot = { .ui_name = "coreboot", .obj_list = (const struct sm_object *[]) { - &boot_option, &debug_level, &reboot_counter, NULL