erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mb/starlabs/*/cfr: Use global console CFR object

Browse source 
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 <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/87558
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
This commit is contained in:
Matt DeVillier 2025-05-01 09:31:58 -05:00
commit 452e179727
6 changed files with 5 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/mainboard/starlabs/byte_adl/cfr.c
View file

@ -2,6 +2,7 @@
#include <boot/coreboot_tables.h>
#include <commonlib/coreboot_tables.h>
#include <console/cfr.h>
#include <drivers/option/cfr_frontend.h>
#include <inttypes.h>
#include <intelblocks/pcie_rp.h>
@ -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",

19
src/mainboard/starlabs/lite/cfr.c
View file

@ -2,6 +2,7 @@
#include <boot/coreboot_tables.h>
#include <commonlib/coreboot_tables.h>
#include <console/cfr.h>
#include <drivers/option/cfr_frontend.h>
#include <ec/starlabs/merlin/cfr.h>
#include <inttypes.h>
@ -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",

1
src/mainboard/starlabs/starbook/cfr.c
View file

@ -2,6 +2,7 @@
#include <boot/coreboot_tables.h>
#include <commonlib/coreboot_tables.h>
#include <console/cfr.h>
#include <drivers/option/cfr_frontend.h>
#include <ec/starlabs/merlin/cfr.h>
#include <inttypes.h>

18
src/mainboard/starlabs/starbook/cfr.h
View file

@ -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",

19
src/mainboard/starlabs/starfighter/cfr.c
View file

@ -2,6 +2,7 @@
#include <boot/coreboot_tables.h>
#include <commonlib/coreboot_tables.h>
#include <console/cfr.h>
#include <drivers/option/cfr_frontend.h>
#include <ec/starlabs/merlin/cfr.h>
#include <inttypes.h>
@ -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",

19
src/mainboard/starlabs/starlite_adl/cfr.c
View file

@ -2,6 +2,7 @@
#include <boot/coreboot_tables.h>
#include <commonlib/coreboot_tables.h>
#include <console/cfr.h>
#include <drivers/option/cfr_frontend.h>
#include <ec/starlabs/merlin/cfr.h>
#include <inttypes.h>
@ -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",