From 452e17972707dde39ef550b66d9c1310c00c7539 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Thu, 1 May 2025 09:31:58 -0500 Subject: [PATCH] mb/starlabs/*/cfr: Use global console CFR object Now that a global CFR object exists to set the console output level, use it instead of duplicating the object for each mainboard. TEST=build lite_adl_sb Change-Id: Ie39e77e8345381a018e3df80aebe3126616fc556 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/87558 Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes --- src/mainboard/starlabs/byte_adl/cfr.c | 19 +------------------ src/mainboard/starlabs/lite/cfr.c | 19 +------------------ src/mainboard/starlabs/starbook/cfr.c | 1 + src/mainboard/starlabs/starbook/cfr.h | 18 ------------------ src/mainboard/starlabs/starfighter/cfr.c | 19 +------------------ src/mainboard/starlabs/starlite_adl/cfr.c | 19 +------------------ 6 files changed, 5 insertions(+), 90 deletions(-) diff --git a/src/mainboard/starlabs/byte_adl/cfr.c b/src/mainboard/starlabs/byte_adl/cfr.c index e360e3b419..71c2d40941 100644 --- a/src/mainboard/starlabs/byte_adl/cfr.c +++ b/src/mainboard/starlabs/byte_adl/cfr.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -20,24 +21,6 @@ static const struct sm_object boot_option = SM_DECLARE_ENUM({ SM_ENUM_VALUE_END }, }); -static const struct sm_object debug_level = SM_DECLARE_ENUM({ - .opt_name = "debug_level", - .ui_name = "Debug Level", - .ui_helptext = "Set the verbosity of the debug output.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Emergency", 0 }, - { "Alert", 1 }, - { "Critical", 2 }, - { "Error", 3 }, - { "Warning", 4 }, - { "Notice", 5 }, - { "Info", 6 }, - { "Debug", 7 }, - { "Spew", 8 }, - SM_ENUM_VALUE_END }, -}); - static const struct sm_object gna = SM_DECLARE_BOOL({ .opt_name = "gna", .ui_name = "Gaussian & Neural Accelerator", diff --git a/src/mainboard/starlabs/lite/cfr.c b/src/mainboard/starlabs/lite/cfr.c index 251f55c339..c12d31da3d 100644 --- a/src/mainboard/starlabs/lite/cfr.c +++ b/src/mainboard/starlabs/lite/cfr.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -28,24 +29,6 @@ static const struct sm_object card_reader = SM_DECLARE_BOOL({ .default_value = true, }); -static const struct sm_object debug_level = SM_DECLARE_ENUM({ - .opt_name = "debug_level", - .ui_name = "Debug Level", - .ui_helptext = "Set the verbosity of the debug output.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Emergency", 0 }, - { "Alert", 1 }, - { "Critical", 2 }, - { "Error", 3 }, - { "Warning", 4 }, - { "Notice", 5 }, - { "Info", 6 }, - { "Debug", 7 }, - { "Spew", 8 }, - SM_ENUM_VALUE_END }, -}); - #if CONFIG(EC_STARLABS_FAST_CHARGE) static const struct sm_object fast_charge = SM_DECLARE_BOOL({ .opt_name = "fast_charge", diff --git a/src/mainboard/starlabs/starbook/cfr.c b/src/mainboard/starlabs/starbook/cfr.c index 5acb1a2d8d..2af7cddc67 100644 --- a/src/mainboard/starlabs/starbook/cfr.c +++ b/src/mainboard/starlabs/starbook/cfr.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include diff --git a/src/mainboard/starlabs/starbook/cfr.h b/src/mainboard/starlabs/starbook/cfr.h index 6270e7a50f..622356ac00 100644 --- a/src/mainboard/starlabs/starbook/cfr.h +++ b/src/mainboard/starlabs/starbook/cfr.h @@ -26,24 +26,6 @@ static const struct sm_object card_reader = SM_DECLARE_BOOL({ .default_value = true, }); -static const struct sm_object debug_level = SM_DECLARE_ENUM({ - .opt_name = "debug_level", - .ui_name = "Debug Level", - .ui_helptext = "Set the verbosity of the debug output.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Emergency", 0 }, - { "Alert", 1 }, - { "Critical", 2 }, - { "Error", 3 }, - { "Warning", 4 }, - { "Notice", 5 }, - { "Info", 6 }, - { "Debug", 7 }, - { "Spew", 8 }, - SM_ENUM_VALUE_END }, -}); - static const struct sm_object fingerprint_reader = SM_DECLARE_BOOL({ .opt_name = "fingerprint_reader", .ui_name = "Fingerprint Reader", diff --git a/src/mainboard/starlabs/starfighter/cfr.c b/src/mainboard/starlabs/starfighter/cfr.c index bbef3a7c26..c988148afc 100644 --- a/src/mainboard/starlabs/starfighter/cfr.c +++ b/src/mainboard/starlabs/starfighter/cfr.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -21,24 +22,6 @@ static const struct sm_object boot_option = SM_DECLARE_ENUM({ SM_ENUM_VALUE_END }, }); -static const struct sm_object debug_level = SM_DECLARE_ENUM({ - .opt_name = "debug_level", - .ui_name = "Debug Level", - .ui_helptext = "Set the verbosity of the debug output.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Emergency", 0 }, - { "Alert", 1 }, - { "Critical", 2 }, - { "Error", 3 }, - { "Warning", 4 }, - { "Notice", 5 }, - { "Info", 6 }, - { "Debug", 7 }, - { "Spew", 8 }, - 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", diff --git a/src/mainboard/starlabs/starlite_adl/cfr.c b/src/mainboard/starlabs/starlite_adl/cfr.c index cd58641e1a..53e6a9f134 100644 --- a/src/mainboard/starlabs/starlite_adl/cfr.c +++ b/src/mainboard/starlabs/starlite_adl/cfr.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -28,24 +29,6 @@ static const struct sm_object boot_option = SM_DECLARE_ENUM({ SM_ENUM_VALUE_END }, }); -static const struct sm_object debug_level = SM_DECLARE_ENUM({ - .opt_name = "debug_level", - .ui_name = "Debug Level", - .ui_helptext = "Set the verbosity of the debug output.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Emergency", 0 }, - { "Alert", 1 }, - { "Critical", 2 }, - { "Error", 3 }, - { "Warning", 4 }, - { "Notice", 5 }, - { "Info", 6 }, - { "Debug", 7 }, - { "Spew", 8 }, - 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",