coreboot-gerrit February 2025

coreboot-gerrit@coreboot.org

1 participants
2886 discussions

[L] Change in coreboot[main]: {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory
by Matt DeVillier (Code Review) 07 Feb '25

07 Feb '25

Attention is currently required from: Matt DeVillier, Sean Rhodes. Hello Sean Rhodes, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/86318?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+2 by Sean Rhodes Change subject: {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory ...................................................................... {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory Move all of the EC-related CFR options into a header in the ec directory, so it can be reused across multiple boards. TEST=build/boot starlabs/starbook_mtl,starlite_adl and verify CFR options work properly. Change-Id: I831559184de917b32e4993e8e34ffbc7b7e883e4 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- A src/ec/starlabs/merlin/cfr.h M src/mainboard/starlabs/lite/cfr.c M src/mainboard/starlabs/starbook/cfr.c M src/mainboard/starlabs/starfighter/cfr.c M src/mainboard/starlabs/starlite_adl/cfr.c 5 files changed, 118 insertions(+), 227 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/86318/4 -- To view, visit https://review.coreboot.org/c/coreboot/+/86318?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I831559184de917b32e4993e8e34ffbc7b7e883e4 Gerrit-Change-Number: 86318 Gerrit-PatchSet: 4 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com>

1 0

[XS] Change in coreboot[main]: soc/intel/meteorlake: Add missing USB port definitions
by Sean Rhodes (Code Review) 07 Feb '25

07 Feb '25

Attention is currently required from: Dinesh Gehlot, Eran Mitrani, Intel coreboot Reviewers, Jakub "Kuba" Czapiga, Kapil Porwal, Matt DeVillier, Subrata Banik, Tarun. Sean Rhodes has posted comments on this change by Matt DeVillier. ( https://review.coreboot.org/c/coreboot/+/86319?usp=email ) Change subject: soc/intel/meteorlake: Add missing USB port definitions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/86319?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I5dc97f150ff064d55e7969f10c1cea8ba72d6bfb Gerrit-Change-Number: 86319 Gerrit-PatchSet: 1 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Eran Mitrani <mitrani(a)google.com> Gerrit-Reviewer: Intel coreboot Reviewers <intel_coreboot_reviewers(a)intel.com> Gerrit-Reviewer: Jakub "Kuba" Czapiga <czapiga(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun <tstuli(a)gmail.com> Gerrit-Attention: Intel coreboot Reviewers <intel_coreboot_reviewers(a)intel.com> Gerrit-Attention: Eran Mitrani <mitrani(a)google.com> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Jakub "Kuba" Czapiga <czapiga(a)google.com> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Attention: Tarun <tstuli(a)gmail.com> Gerrit-Comment-Date: Fri, 07 Feb 2025 20:26:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in coreboot[main]: mb/starlabs/starbook_mtl: Fix USB port assignments/descriptions
by Sean Rhodes (Code Review) 07 Feb '25

07 Feb '25

Attention is currently required from: Matt DeVillier. Sean Rhodes has posted comments on this change by Matt DeVillier. ( https://review.coreboot.org/c/coreboot/+/86320?usp=email ) Change subject: mb/starlabs/starbook_mtl: Fix USB port assignments/descriptions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/86320?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ifb5ac4cf95c8f10706404479dea48ba20a90e286 Gerrit-Change-Number: 86320 Gerrit-PatchSet: 1 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Comment-Date: Fri, 07 Feb 2025 20:25:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in coreboot[main]: mb/starlabs/starbook_mtl: Fix USB port assignments/descriptions
by Matt DeVillier (Code Review) 07 Feb '25

07 Feb '25

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86320?usp=email ) Change subject: mb/starlabs/starbook_mtl: Fix USB port assignments/descriptions ...................................................................... mb/starlabs/starbook_mtl: Fix USB port assignments/descriptions Fix USB port assignments/descriptions to match actual topology. TEST=build/boot Win11 on starlabs/starbook_mtl. Verify ports match assignmented in devicetree using USBTreeview. Change-Id: Ifb5ac4cf95c8f10706404479dea48ba20a90e286 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- M src/mainboard/starlabs/starbook/variants/mtl/devicetree.cb 1 file changed, 22 insertions(+), 22 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/86320/1 diff --git a/src/mainboard/starlabs/starbook/variants/mtl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/mtl/devicetree.cb index a138438..d9d8dee 100644 --- a/src/mainboard/starlabs/starbook/variants/mtl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/mtl/devicetree.cb @@ -34,32 +34,32 @@ chip drivers/usb/acpi device ref tcss_root_hub on chip drivers/usb/acpi - register "desc" = ""Front USB Type-C"" - register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" - register "group" = "ACPI_PLD_GROUP(0, 0)" - device ref tcss_usb3_port1 on end - end - chip drivers/usb/acpi register "desc" = ""Back USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" + device ref tcss_usb3_port0 on end + end + chip drivers/usb/acpi + register "desc" = ""Front USB Type-C"" + register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "group" = "ACPI_PLD_GROUP(0, 1)" - device ref tcss_usb3_port2 on end + device ref tcss_usb3_port1 on end end end end end device ref gna on end device ref xhci on - # Motherboard USB 3.0 Type-C Front 9557 mil + # Motherboard USB 3.0 Type-C Back 7893 mil register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" register "tcss_ports[0]" = "TCSS_PORT_DEFAULT(OC_SKIP)" - # Motherboard USB 3.0 Type-C Back 7893 mil - register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC_SKIP)" + # Motherboard USB 3.0 Type-C Front 9557 mil + register "usb2_ports[2]" = "USB2_PORT_TYPE_C(OC_SKIP)" register "tcss_ports[1]" = "TCSS_PORT_DEFAULT(OC_SKIP)" # Motherboard USB 3.0 Type-A 8916 mil - register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" + register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)" register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Daughterboard USB 3.0 Type-A 2229 mil @@ -78,22 +78,22 @@ chip drivers/usb/acpi device ref xhci_root_hub on chip drivers/usb/acpi - register "desc" = ""Front USB Type-C"" + register "desc" = ""Back USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "group" = "ACPI_PLD_GROUP(0, 0)" device ref usb2_port1 on end end chip drivers/usb/acpi - register "desc" = ""Back USB Type-C"" + register "desc" = ""Front USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "group" = "ACPI_PLD_GROUP(0, 1)" - device ref usb2_port2 on end + device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(0, 2)" - device ref usb2_port3 on end + device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" @@ -102,13 +102,13 @@ device ref usb3_port1 on end end chip drivers/usb/acpi - register "desc" = ""Right USB Type-A"" + register "desc" = ""Right Rear USB Type-A"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(0, 3)" device ref usb2_port7 on end end chip drivers/usb/acpi - register "desc" = ""Right USB Type-A"" + register "desc" = ""Right Rear USB Type-A"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(0, 3)" device ref usb3_port2 on end @@ -120,8 +120,8 @@ device ref usb2_port5 on end end chip drivers/usb/acpi - register "desc" = ""MicroSD Card Reader"" - register "type" = "UPC_TYPE_INTERNAL" + register "desc" = ""USB 2.0 Hub"" + register "type" = "UPC_TYPE_HUB" register "group" = "ACPI_PLD_GROUP(0, 5)" device ref usb2_port8 on end end @@ -236,12 +236,12 @@ device generic 0 on chip drivers/intel/pmc_mux/conn use usb2_port1 as usb2_port - use tcss_usb3_port1 as usb3_port + use tcss_usb3_port0 as usb3_port device generic 0 alias conn0 on end end chip drivers/intel/pmc_mux/conn - use usb2_port2 as usb2_port - use tcss_usb3_port2 as usb3_port + use usb2_port3 as usb2_port + use tcss_usb3_port1 as usb3_port device generic 1 alias conn1 on end end end -- To view, visit https://review.coreboot.org/c/coreboot/+/86320?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ifb5ac4cf95c8f10706404479dea48ba20a90e286 Gerrit-Change-Number: 86320 Gerrit-PatchSet: 1 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>

1 0

[XS] Change in coreboot[main]: soc/intel/meteorlake: Add missing USB port definitions
by Matt DeVillier (Code Review) 07 Feb '25

07 Feb '25

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86319?usp=email ) Change subject: soc/intel/meteorlake: Add missing USB port definitions ...................................................................... soc/intel/meteorlake: Add missing USB port definitions The TCSS_XHCI controller has a single USB2 port followed by 4 USB3 ports; the XHCI controller has 12 USB2 ports followed by 2 USB3 ports. The topology was queried from the root hub on each controller and returned via the descriptor. Add the 2 missing USB2 ports to the XHCI controller and the one to the TSS_HSCI controller. TEST=build/boot Win11, Linux 6.x on starlabs/starbook_mtl. Change-Id: I5dc97f150ff064d55e7969f10c1cea8ba72d6bfb Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- M src/soc/intel/meteorlake/chipset.cb 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/86319/1 diff --git a/src/soc/intel/meteorlake/chipset.cb b/src/soc/intel/meteorlake/chipset.cb index 9087dd8..7b26670 100644 --- a/src/soc/intel/meteorlake/chipset.cb +++ b/src/soc/intel/meteorlake/chipset.cb @@ -70,6 +70,9 @@ register "type" = "UPC_TYPE_HUB" device usb 0.0 alias tcss_root_hub off chip drivers/usb/acpi + device usb 2.0 alias tcss_usb2_port1 off end + end + chip drivers/usb/acpi device usb 3.0 alias tcss_usb3_port0 off end end chip drivers/usb/acpi @@ -132,6 +135,12 @@ device usb 2.9 alias usb2_port10 off end end chip drivers/usb/acpi + device usb 2.a alias usb2_port11 off end + end + chip drivers/usb/acpi + device usb 2.b alias usb2_port12 off end + end + chip drivers/usb/acpi device usb 3.0 alias usb3_port1 off end end chip drivers/usb/acpi -- To view, visit https://review.coreboot.org/c/coreboot/+/86319?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I5dc97f150ff064d55e7969f10c1cea8ba72d6bfb Gerrit-Change-Number: 86319 Gerrit-PatchSet: 1 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>

1 0

[L] Change in coreboot[main]: {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory
by Sean Rhodes (Code Review) 07 Feb '25

07 Feb '25

Attention is currently required from: Matt DeVillier. Sean Rhodes has posted comments on this change by Matt DeVillier. ( https://review.coreboot.org/c/coreboot/+/86318?usp=email ) Change subject: {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/86318?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I831559184de917b32e4993e8e34ffbc7b7e883e4 Gerrit-Change-Number: 86318 Gerrit-PatchSet: 3 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Comment-Date: Fri, 07 Feb 2025 20:05:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in coreboot[main]: {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory
by Matt DeVillier (Code Review) 07 Feb '25

07 Feb '25

Attention is currently required from: Sean Rhodes. Hello Sean Rhodes, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/86318?usp=email to look at the new patch set (#3). Change subject: {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory ...................................................................... {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory Move all of the EC-related CFR options into a header in the ec directory, so it can be reused across multiple boards. TEST=build/boot starlabs/starbook_mtl,starlite_adl and verify CFR options work properly. Change-Id: I831559184de917b32e4993e8e34ffbc7b7e883e4 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- A src/ec/starlabs/merlin/cfr.h M src/mainboard/starlabs/lite/cfr.c M src/mainboard/starlabs/starbook/cfr.c M src/mainboard/starlabs/starfighter/cfr.c M src/mainboard/starlabs/starlite_adl/cfr.c 5 files changed, 117 insertions(+), 227 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/86318/3 -- To view, visit https://review.coreboot.org/c/coreboot/+/86318?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I831559184de917b32e4993e8e34ffbc7b7e883e4 Gerrit-Change-Number: 86318 Gerrit-PatchSet: 3 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Sean Rhodes <sean(a)starlabs.systems>

1 0

[L] Change in coreboot[main]: {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory
by Matt DeVillier (Code Review) 07 Feb '25

07 Feb '25

Attention is currently required from: Sean Rhodes. Hello Sean Rhodes, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/86318?usp=email to look at the new patch set (#2). Change subject: {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory ...................................................................... {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory Move all of the EC-related CFR options into a header in the ec directory, so it can be reused across multiple boards. TEST=build/boot starlabs/starbook_mtl,starlite_adl and verify CFR options work properly. Change-Id: I831559184de917b32e4993e8e34ffbc7b7e883e4 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- A src/ec/starlabs/merlin/cfr.h M src/mainboard/starlabs/lite/cfr.c M src/mainboard/starlabs/starbook/cfr.c M src/mainboard/starlabs/starfighter/cfr.c M src/mainboard/starlabs/starlite_adl/cfr.c 5 files changed, 117 insertions(+), 227 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/86318/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/86318?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I831559184de917b32e4993e8e34ffbc7b7e883e4 Gerrit-Change-Number: 86318 Gerrit-PatchSet: 2 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Sean Rhodes <sean(a)starlabs.systems>

1 0

[L] Change in coreboot[main]: {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory
by Matt DeVillier (Code Review) 07 Feb '25

07 Feb '25

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86318?usp=email ) Change subject: {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory ...................................................................... {ec,mb}/starlabs: Consolidate EC-related CFR options in ec directory Move all of the EC-related CFR options into a header in the ec directory, so it can be reused across multiple boards. TEST=build/boot starlabs/starbook_mtl,starlite_adl and verify CFR options work properly. Change-Id: I831559184de917b32e4993e8e34ffbc7b7e883e4 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- A src/ec/starlabs/merlin/cfr.h M src/mainboard/starlabs/lite/cfr.c M src/mainboard/starlabs/starbook/cfr.c M src/mainboard/starlabs/starfighter/cfr.c M src/mainboard/starlabs/starlite_adl/cfr.c 5 files changed, 117 insertions(+), 227 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/86318/1 diff --git a/src/ec/starlabs/merlin/cfr.h b/src/ec/starlabs/merlin/cfr.h new file mode 100644 index 0000000..b56e7d2 --- /dev/null +++ b/src/ec/starlabs/merlin/cfr.h @@ -0,0 +1,114 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* + * CFR enums and structs which are used to control EC settings. + */ + +#include <drivers/option/cfr_frontend.h> +#include "ec.h" + +/* + * Keyboard Backlight Timeout + */ +static const struct sm_object kbl_timeout = SM_DECLARE_ENUM({ + .opt_name = "kbl_timeout", + .ui_name = "Keyboard Backlight Timeout", + .ui_helptext = "Set the amount of time before the keyboard backlight turns off" + " when un-used", + .default_value = 0, + .values = (struct sm_enum_value[]) { + { "30 seconds", 0 }, + { "1 minute", 1 }, + { "3 minutes", 2 }, + { "5 minutes", 3 }, + { "Never", 4 }, + SM_ENUM_VALUE_END }, +}); + + +/* + * Function-Control Swap + */ +static const struct sm_object fn_ctrl_swap = SM_DECLARE_BOOL({ + .opt_name = "fn_ctrl_swap", + .ui_name = "Fn Ctrl Reverse", + .ui_helptext = "Swap the functions of the [Fn] and [Ctrl] keys", + .default_value = false, +}); + +/* + * Maximum Battery Charge Level + */ +static const struct sm_object max_charge = SM_DECLARE_ENUM({ + .opt_name = "max_charge", + .ui_name = "Maximum Charge Level", + .ui_helptext = "Set the maximum level the battery will charge to.", + .default_value = 0, + .values = (const struct sm_enum_value[]) { + { "100%", 0 }, + { "80%", 1 }, + { "60%", 2 }, + SM_ENUM_VALUE_END }, +}); + +/* + * Fan Mode + */ +static const struct sm_object fan_mode = SM_DECLARE_ENUM({ + .opt_name = "fan_mode", + .ui_name = "Fan Mode", + .ui_helptext = "Adjust the fan curve to prioritize performance or noise levels.", + .default_value = 0, + .values = (const struct sm_enum_value[]) { + { "Normal", 0 }, + { "Aggressive", 1 }, + { "Quiet", 2 }, + { "Disabled", 3 }, + SM_ENUM_VALUE_END }, +}); + +/* + * Charging Speed + */ +static const struct sm_object charging_speed = SM_DECLARE_ENUM({ + .opt_name = "charging_speed", + .ui_name = "Charging Speed", + .ui_helptext = "Set the maximum speed to charge the battery. Charging faster" + " will increase heat and battery wear.", + .default_value = 1, + .values = (const struct sm_enum_value[]) { + { "1.0C", 0 }, + { "0.5C", 1 }, + { "0.2C", 2 }, + SM_ENUM_VALUE_END }, +}); + +/* + * Lid Switch + */ +static const struct sm_object lid_switch = SM_DECLARE_ENUM({ + .opt_name = "lid_switch", + .ui_name = "Lid Switch", + .ui_helptext = "Configure what opening or closing the lid will do.", + .default_value = 0, + .values = (const struct sm_enum_value[]) { + { "Normal", 0 }, + { "Sleep Only", 1 }, + { "Disabled", 2 }, + SM_ENUM_VALUE_END }, +}); + +/* + * Power LED Brightness + */ +static const struct sm_object power_led = SM_DECLARE_ENUM({ + .opt_name = "power_led", + .ui_name = "Power LED Brightness", + .ui_helptext = "Control the maximum brightness of the power LED", + .default_value = 0, + .values = (const struct sm_enum_value[]) { + { "Normal", 0 }, + { "Reduced", 1 }, + SM_ENUM_VALUE_END, + }, +}); diff --git a/src/mainboard/starlabs/lite/cfr.c b/src/mainboard/starlabs/lite/cfr.c index e0d22e6..251f55c 100644 --- a/src/mainboard/starlabs/lite/cfr.c +++ b/src/mainboard/starlabs/lite/cfr.c @@ -3,6 +3,7 @@ #include <boot/coreboot_tables.h> #include <commonlib/coreboot_tables.h> #include <drivers/option/cfr_frontend.h> +#include <ec/starlabs/merlin/cfr.h> #include <inttypes.h> #include <intelblocks/pcie_rp.h> #include <string.h> @@ -54,28 +55,6 @@ }); #endif -static const struct sm_object fn_ctrl_swap = SM_DECLARE_BOOL({ - .opt_name = "fn_ctrl_swap", - .ui_name = "Fn Ctrl Reverse", - .ui_helptext = "Swap the functions of the [Fn] and [Ctrl] keys", - .default_value = false, -}); - -static const struct sm_object kbl_timeout = SM_DECLARE_ENUM({ - .opt_name = "kbl_timeout", - .ui_name = "Keyboard Backlight Timeout", - .ui_helptext = "Set the amount of time before the keyboard backlight turns off" - " when un-used", - .default_value = 0, - .values = (struct sm_enum_value[]) { - { "30 seconds", 0 }, - { "1 minute", 1 }, - { "3 minutes", 2 }, - { "5 minutes", 3 }, - { "Never", 4 }, - SM_ENUM_VALUE_END }, -}); - static const struct sm_object power_on_after_fail = SM_DECLARE_BOOL({ .opt_name = "power_on_after_fail", .ui_name = "Power on after failure", diff --git a/src/mainboard/starlabs/starbook/cfr.c b/src/mainboard/starlabs/starbook/cfr.c index bf0e4b0..1e08ba1 100644 --- a/src/mainboard/starlabs/starbook/cfr.c +++ b/src/mainboard/starlabs/starbook/cfr.c @@ -3,6 +3,7 @@ #include <boot/coreboot_tables.h> #include <commonlib/coreboot_tables.h> #include <drivers/option/cfr_frontend.h> +#include <ec/starlabs/merlin/cfr.h> #include <inttypes.h> #include <intelblocks/pcie_rp.h> #include <string.h> @@ -27,21 +28,6 @@ .default_value = true, }); -#if CONFIG(EC_STARLABS_CHARGING_SPEED) -static const struct sm_object charging_speed = SM_DECLARE_ENUM({ - .opt_name = "charging_speed", - .ui_name = "Charging Speed", - .ui_helptext = "Set the maximum speed to charge the battery. Charging faster" - " will increase heat and battery wear.", - .default_value = 1, - .values = (const struct sm_enum_value[]) { - { "1.0C", 0 }, - { "0.5C", 1 }, - { "0.2C", 2 }, - SM_ENUM_VALUE_END }, -}); -#endif - static const struct sm_object debug_level = SM_DECLARE_ENUM({ .opt_name = "debug_level", .ui_name = "Debug Level", @@ -60,19 +46,6 @@ SM_ENUM_VALUE_END }, }); -static const struct sm_object fan_mode = SM_DECLARE_ENUM({ - .opt_name = "fan_mode", - .ui_name = "Fan Mode", - .ui_helptext = "Adjust the fan curve to prioritize performance or noise levels.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Normal", 0 }, - { "Aggressive", 1 }, - { "Quiet", 2 }, - { "Disabled", 3 }, - SM_ENUM_VALUE_END }, -}); - #if CONFIG(BOARD_STARLABS_STARBOOK_ADL) || CONFIG(BOARD_STARLABS_STARBOOK_RPL) static const struct sm_object fingerprint_reader = SM_DECLARE_BOOL({ .opt_name = "fingerprint_reader", @@ -82,13 +55,6 @@ }); #endif -static const struct sm_object fn_ctrl_swap = SM_DECLARE_BOOL({ - .opt_name = "fn_ctrl_swap", - .ui_name = "Fn Ctrl Reverse", - .ui_helptext = "Swap the functions of the [Fn] and [Ctrl] keys", - .default_value = false, -}); - #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", @@ -107,47 +73,6 @@ }); #endif -static const struct sm_object kbl_timeout = SM_DECLARE_ENUM({ - .opt_name = "kbl_timeout", - .ui_name = "Keyboard Backlight Timeout", - .ui_helptext = "Set the amount of time before the keyboard backlight turns off" - " when un-used", - .default_value = 0, - .values = (struct sm_enum_value[]) { - { "30 seconds", 0 }, - { "1 minute", 1 }, - { "3 minutes", 2 }, - { "5 minutes", 3 }, - { "Never", 4 }, - SM_ENUM_VALUE_END }, -}); - -#if CONFIG(EC_STARLABS_LID_SWITCH) -static const struct sm_object lid_switch = SM_DECLARE_ENUM({ - .opt_name = "lid_switch", - .ui_name = "Lid Switch", - .ui_helptext = "Configure what opening or closing the lid will do.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Normal", 0 }, - { "Sleep Only", 1 }, - { "Disabled", 2 }, - SM_ENUM_VALUE_END }, -}); -#endif - -static const struct sm_object max_charge = SM_DECLARE_ENUM({ - .opt_name = "max_charge", - .ui_name = "Maximum Charge Level", - .ui_helptext = "Set the maximum level the battery will charge to.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "100%", 0 }, - { "80%", 1 }, - { "60%", 2 }, - SM_ENUM_VALUE_END }, -}); - static const struct sm_object me_state = SM_DECLARE_ENUM({ .opt_name = "me_state", .ui_name = "Intel Management Engine", diff --git a/src/mainboard/starlabs/starfighter/cfr.c b/src/mainboard/starlabs/starfighter/cfr.c index f310f86..7e040cc 100644 --- a/src/mainboard/starlabs/starfighter/cfr.c +++ b/src/mainboard/starlabs/starfighter/cfr.c @@ -3,6 +3,7 @@ #include <boot/coreboot_tables.h> #include <commonlib/coreboot_tables.h> #include <drivers/option/cfr_frontend.h> +#include <ec/starlabs/merlin/cfr.h> #include <inttypes.h> #include <intelblocks/pcie_rp.h> #include <string.h> @@ -20,21 +21,6 @@ SM_ENUM_VALUE_END }, }); -#if CONFIG(EC_STARLABS_CHARGING_SPEED) -static const struct sm_object charging_speed = SM_DECLARE_ENUM({ - .opt_name = "charging_speed", - .ui_name = "Charging Speed", - .ui_helptext = "Set the maximum speed to charge the battery. Charging faster" - " will increase heat and battery wear.", - .default_value = 1, - .values = (const struct sm_enum_value[]) { - { "1.0C", 0 }, - { "0.5C", 1 }, - { "0.2C", 2 }, - SM_ENUM_VALUE_END }, -}); -#endif - static const struct sm_object debug_level = SM_DECLARE_ENUM({ .opt_name = "debug_level", .ui_name = "Debug Level", @@ -53,26 +39,6 @@ SM_ENUM_VALUE_END }, }); -static const struct sm_object fan_mode = SM_DECLARE_ENUM({ - .opt_name = "fan_mode", - .ui_name = "Fan Mode", - .ui_helptext = "Adjust the fan curve to prioritize performance or noise levels.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Normal", 0 }, - { "Aggressive", 1 }, - { "Quiet", 2 }, - { "Disabled", 3 }, - SM_ENUM_VALUE_END }, -}); - -static const struct sm_object fn_ctrl_swap = SM_DECLARE_BOOL({ - .opt_name = "fn_ctrl_swap", - .ui_name = "Fn Ctrl Reverse", - .ui_helptext = "Swap the functions of the [Fn] and [Ctrl] keys", - .default_value = false, -}); - #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", @@ -89,47 +55,6 @@ .default_value = true, }); -static const struct sm_object kbl_timeout = SM_DECLARE_ENUM({ - .opt_name = "kbl_timeout", - .ui_name = "Keyboard Backlight Timeout", - .ui_helptext = "Set the amount of time before the keyboard backlight turns off" - " when un-used", - .default_value = 0, - .values = (struct sm_enum_value[]) { - { "30 seconds", 0 }, - { "1 minute", 1 }, - { "3 minutes", 2 }, - { "5 minutes", 3 }, - { "Never", 4 }, - SM_ENUM_VALUE_END }, -}); - -#if CONFIG(EC_STARLABS_LID_SWITCH) -static const struct sm_object lid_switch = SM_DECLARE_ENUM({ - .opt_name = "lid_switch", - .ui_name = "Lid Switch", - .ui_helptext = "Configure what opening or closing the lid will do.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Normal", 0 }, - { "Sleep Only", 1 }, - { "Disabled", 2 }, - SM_ENUM_VALUE_END }, -}); -#endif - -static const struct sm_object max_charge = SM_DECLARE_ENUM({ - .opt_name = "max_charge", - .ui_name = "Maximum Charge Level", - .ui_helptext = "Set the maximum level the battery will charge to.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "100%", 0 }, - { "80%", 1 }, - { "60%", 2 }, - SM_ENUM_VALUE_END }, -}); - static const struct sm_object me_state = SM_DECLARE_ENUM({ .opt_name = "me_state", .ui_name = "Intel Management Engine", diff --git a/src/mainboard/starlabs/starlite_adl/cfr.c b/src/mainboard/starlabs/starlite_adl/cfr.c index a8e44fa..dc1ed5e 100644 --- a/src/mainboard/starlabs/starlite_adl/cfr.c +++ b/src/mainboard/starlabs/starlite_adl/cfr.c @@ -27,21 +27,6 @@ SM_ENUM_VALUE_END }, }); -#if CONFIG(EC_STARLABS_CHARGING_SPEED) -static const struct sm_object charging_speed = SM_DECLARE_ENUM({ - .opt_name = "charging_speed", - .ui_name = "Charging Speed", - .ui_helptext = "Set the maximum speed to charge the battery. Charging faster" - " will increase heat and battery wear.", - .default_value = 1, - .values = (const struct sm_enum_value[]) { - { "1.0C", 0 }, - { "0.5C", 1 }, - { "0.2C", 2 }, - SM_ENUM_VALUE_END }, -}); -#endif - static const struct sm_object debug_level = SM_DECLARE_ENUM({ .opt_name = "debug_level", .ui_name = "Debug Level", @@ -69,32 +54,6 @@ }); #endif -#if CONFIG(EC_STARLABS_LID_SWITCH) -static const struct sm_object lid_switch = SM_DECLARE_ENUM({ - .opt_name = "lid_switch", - .ui_name = "Lid Switch", - .ui_helptext = "Configure what opening or closing the lid will do.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Normal", 0 }, - { "Sleep Only", 1 }, - { "Disabled", 2 }, - SM_ENUM_VALUE_END }, -}); -#endif - -static const struct sm_object max_charge = SM_DECLARE_ENUM({ - .opt_name = "max_charge", - .ui_name = "Maximum Charge Level", - .ui_helptext = "Set the maximum level the battery will charge to.", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "100%", 0 }, - { "80%", 1 }, - { "60%", 2 }, - SM_ENUM_VALUE_END }, -}); - static const struct sm_object me_state = SM_DECLARE_ENUM({ .opt_name = "me_state", .ui_name = "Intel Management Engine", @@ -194,18 +153,6 @@ }); #endif -static const struct sm_object power_led = SM_DECLARE_ENUM({ - .opt_name = "power_led", - .ui_name = "Power LED Brightness", - .ui_helptext = "Control the maximum brightness of the power LED", - .default_value = 0, - .values = (const struct sm_enum_value[]) { - { "Normal", 0 }, - { "Reduced", 1 }, - SM_ENUM_VALUE_END, - }, -}); - static const struct sm_object reboot_counter = SM_DECLARE_NUMBER({ .opt_name = "reboot_counter", .ui_name = "Reboot Counter", -- To view, visit https://review.coreboot.org/c/coreboot/+/86318?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I831559184de917b32e4993e8e34ffbc7b7e883e4 Gerrit-Change-Number: 86318 Gerrit-PatchSet: 1 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>

1 0

[S] Change in coreboot[main]: ec/starlabs/merlin: Remove unused name objects
by Matt DeVillier (Code Review) 07 Feb '25

07 Feb '25

Attention is currently required from: Sean Rhodes. Matt DeVillier has posted comments on this change by Sean Rhodes. ( https://review.coreboot.org/c/coreboot/+/86317?usp=email ) Change subject: ec/starlabs/merlin: Remove unused name objects ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/86317?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ieb66099dcb9e13b26e6a7a752584537c060c8c18 Gerrit-Change-Number: 86317 Gerrit-PatchSet: 1 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Attention: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Comment-Date: Fri, 07 Feb 2025 20:02:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2025