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

ec/starlabs/merlin: Optimise Kconfig defaults

Browse source 
The featureset of Merlin is common, so adjust the Kconfig options
to avoid having the boards select all of them.

This is not a functional change.

Change-Id: Ie8d7afed750055274cdfde3f2f4f9b70fa47a8b1
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/89910
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
This commit is contained in:
Sean Rhodes 2025-11-04 20:54:26 +00:00
commit 696344ac01
5 changed files with 40 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/ec/starlabs/merlin/Kconfig
View file

@ -8,6 +8,7 @@ config EC_STARLABS_NUVOTON
config EC_STARLABS_ITE
bool
default y if EC_STARLABS_MERLIN
select EC_ACPI
help
Interface to ITE embedded controller principally in Star Labs notebooks.
@ -30,6 +31,11 @@ config EC_STARLABS_ITE_BIN_PATH
string "Star Labs EC binary file path"
depends on EC_STARLABS_ADD_ITE_BIN
config EC_STARLABS_FAN
bool
help
Select if the mainboard has a fan.
config EC_STARLABS_KBL_LEVELS
bool
default n
@ -37,46 +43,6 @@ config EC_STARLABS_KBL_LEVELS
help
Select if the mainboard supports multiple levels of brightness for the keyboard.
config EC_STARLABS_FAN
bool
default n
depends on EC_STARLABS_ITE
help
Select if the mainboard has a fan.
config EC_STARLABS_MAX_CHARGE
bool
default n
depends on EC_STARLABS_ITE
help
Select if the mainboard supports limiting the maximum charge of the battery.
config EC_STARLABS_CHARGING_SPEED
bool "Enable setting the charging speed"
depends on EC_STARLABS_MERLIN
help
Select if the mainboard supports configuring the charging speed.
config EC_STARLABS_LID_SWITCH
bool "Enable disabling the lid switch"
depends on EC_STARLABS_ITE
help
Select if the mainboard supports disabling the lid switch
config EC_STARLABS_POWER_LED
bool "Enable lowering the brightess of the Power LED"
depends on EC_STARLABS_ITE
help
Select the in the mainboard supports reducing the LED brightness
config EC_STARLABS_MERLIN
bool "Use open-source Merlin EC Firmware"
default n
depends on EC_STARLABS_ITE
help
Use open source embedded controller firmware. Both firmwares have the
same features but differ in licensing and compilers.
config EC_VARIANT_DIR
string
default "merlin" if EC_STARLABS_MERLIN
@ -96,3 +62,38 @@ config EC_STARLABS_BATTERY_TYPE
config EC_STARLABS_BATTERY_OEM
string
default "Unknown"
config EC_STARLABS_MERLIN
bool "Use open-source Merlin EC Firmware"
default n
help
Use open source embedded controller firmware. Both firmwares have the
same features but differ in licensing and compilers.
if EC_STARLABS_MERLIN
config EC_STARLABS_MAX_CHARGE
bool
default y
help
Select if the mainboard supports limiting the maximum charge of the battery.
config EC_STARLABS_CHARGING_SPEED
bool "Enable setting the charging speed"
default y
help
Select if the mainboard supports configuring the charging speed.
config EC_STARLABS_LID_SWITCH
bool "Enable disabling the lid switch"
default y
help
Select if the mainboard supports disabling the lid switch
config EC_STARLABS_POWER_LED
bool "Enable lowering the brightess of the Power LED"
default y
help
Select the in the mainboard supports reducing the LED brightness
endif

5
src/mainboard/starlabs/byte_adl/Kconfig
View file

@ -8,7 +8,7 @@ config BOARD_STARLABS_BYTE_SERIES
select DRIVERS_INTEL_PMC
select DRIVERS_OPTION_CFR_ENABLED
select DRIVERS_PCIE_GENERIC
select EC_STARLABS_ITE
select EC_STARLABS_FAN
select EC_STARLABS_MERLIN
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
@ -59,9 +59,6 @@ config EC_STARLABS_ITE_BIN_PATH
string
default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/ec.bin"
config EC_VARIANT_DIR
default "merlin"
config FMDFILE
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/variants/\$(CONFIG_VARIANT_DIR)/vboot.fmd" if VBOOT
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/variants/\$(CONFIG_VARIANT_DIR)/board.fmd"

21
src/mainboard/starlabs/starbook/Kconfig
View file

@ -7,7 +7,6 @@ config BOARD_STARLABS_STARBOOK_SERIES
select DRIVERS_EFI_VARIABLE_STORE
select DRIVERS_OPTION_CFR_ENABLED
select DRIVERS_I2C_HID
select EC_STARLABS_ITE
select EC_STARLABS_FAN
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
@ -26,6 +25,8 @@ config BOARD_STARLABS_LABTOP_KBL
select BOARD_ROMSIZE_KB_8192
select BOARD_STARLABS_STARBOOK_SERIES
select CRB_TPM
select EC_STARLABS_ITE
select EC_STARLABS_FAN
select HAVE_INTEL_PTT
select HAVE_SPD_IN_CBFS
select SOC_INTEL_KABYLAKE
@ -35,10 +36,6 @@ config BOARD_STARLABS_LABTOP_KBL
config BOARD_STARLABS_LABTOP_CML
select BOARD_ROMSIZE_KB_16384
select BOARD_STARLABS_STARBOOK_SERIES
select EC_STARLABS_CHARGING_SPEED
select EC_STARLABS_KBL_LEVELS
select EC_STARLABS_LID_SWITCH
select EC_STARLABS_MAX_CHARGE
select EC_STARLABS_MERLIN
select HAVE_INTEL_PTT
select HAVE_SPD_IN_CBFS
@ -52,10 +49,6 @@ config BOARD_STARLABS_STARBOOK_TGL
select BOARD_STARLABS_STARBOOK_SERIES
select DRIVERS_INTEL_PMC
select DRIVERS_INTEL_USB4_RETIMER
select EC_STARLABS_CHARGING_SPEED
select EC_STARLABS_KBL_LEVELS
select EC_STARLABS_LID_SWITCH
select EC_STARLABS_MAX_CHARGE
select EC_STARLABS_MERLIN
select MAINBOARD_HAS_TPM2
select MEMORY_MAPPED_TPM
@ -69,10 +62,6 @@ config BOARD_STARLABS_STARBOOK_ADL_COMMON
def_bool n
select BOARD_STARLABS_STARBOOK_SERIES
select DRIVERS_INTEL_PMC
select EC_STARLABS_CHARGING_SPEED
select EC_STARLABS_KBL_LEVELS
select EC_STARLABS_LID_SWITCH
select EC_STARLABS_MAX_CHARGE
select EC_STARLABS_MERLIN
select DRIVERS_GFX_GENERIC
select MAINBOARD_HAS_TPM2
@ -107,10 +96,6 @@ config BOARD_STARLABS_STARBOOK_MTL
select BOARD_STARLABS_STARBOOK_SERIES
select DRIVERS_GFX_GENERIC
select DRIVERS_INTEL_PMC
select EC_STARLABS_CHARGING_SPEED
select EC_STARLABS_KBL_LEVELS
select EC_STARLABS_LID_SWITCH
select EC_STARLABS_MAX_CHARGE
select EC_STARLABS_MERLIN
select MAINBOARD_HAS_TPM2
select MEMORY_MAPPED_TPM
@ -166,8 +151,6 @@ config EC_STARLABS_ITE_BIN_PATH
config EC_VARIANT_DIR
default "kbl" if !EC_STARLABS_MERLIN && BOARD_STARLABS_LABTOP_KBL
default "cml" if !EC_STARLABS_MERLIN && BOARD_STARLABS_LABTOP_CML
default "merlin"
config EDK2_BOOTSPLASH_FILE
string

8
src/mainboard/starlabs/starfighter/Kconfig
View file

@ -12,11 +12,6 @@ config BOARD_STARLABS_STARFIGHTER_SERIES
select DRIVERS_INTEL_USB4_RETIMER
select DRIVERS_I2C_HID
select EC_STARLABS_FAN
select EC_STARLABS_ITE
select EC_STARLABS_CHARGING_SPEED
select EC_STARLABS_KBL_LEVELS
select EC_STARLABS_LID_SWITCH
select EC_STARLABS_MAX_CHARGE
select EC_STARLABS_MERLIN
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
@ -80,9 +75,6 @@ config EC_STARLABS_ITE_BIN_PATH
string
default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/ec.bin"
config EC_VARIANT_DIR
default "merlin"
config EDK2_BOOTSPLASH_FILE
string
default "3rdparty/blobs/mainboard/starlabs/Logo.bmp"

8
src/mainboard/starlabs/starlite_adl/Kconfig
View file

@ -9,12 +9,7 @@ config BOARD_STARLABS_STARLITE_SERIES
select DRIVERS_I2C_HID
select DRIVERS_INTEL_PMC
select DRIVERS_OPTION_CFR_ENABLED
select EC_STARLABS_CHARGING_SPEED
select EC_STARLABS_ITE
select EC_STARLABS_LID_SWITCH
select EC_STARLABS_MAX_CHARGE
select EC_STARLABS_MERLIN
select EC_STARLABS_POWER_LED
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select HAVE_HDA_DMIC
@ -73,9 +68,6 @@ config EC_STARLABS_ITE_BIN_PATH
string
default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/ec.bin"
config EC_VARIANT_DIR
default "merlin"
config FMDFILE
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/variants/\$(CONFIG_VARIANT_DIR)/vboot.fmd" if VBOOT
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/variants/\$(CONFIG_VARIANT_DIR)/board.fmd"