From 249883d5bf851ae36f1729a67c2af9a97d8026ad Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 17 Oct 2025 11:14:27 -0500 Subject: [PATCH] mb/starlabs/starlite_adl: Squash SB and non-SB board variants Originally, there were separate EC firmware builds for the smart battery (SB) and non-SB versions of the starlite_adl board, but those have long since been unified. Squash the board variants into a single board which supports both SB and non-SB boards. Adjust the board description to reflect that it will support both the existing N200 and upcoming N355 flavors. TEST=build/boot starlite_adl on both SB and non-SB boards, verify battery and all other features function normally. Change-Id: I2461a094f2455ce333132ffa9f2f83967ae0e927 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/89627 Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes --- src/mainboard/starlabs/starlite_adl/Kconfig | 5 ----- src/mainboard/starlabs/starlite_adl/Kconfig.name | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/mainboard/starlabs/starlite_adl/Kconfig b/src/mainboard/starlabs/starlite_adl/Kconfig index 36b61a71f5..ae86ef63dc 100644 --- a/src/mainboard/starlabs/starlite_adl/Kconfig +++ b/src/mainboard/starlabs/starlite_adl/Kconfig @@ -39,9 +39,6 @@ config BOARD_STARLABS_STARLITE_SERIES config BOARD_STARLABS_LITE_ADL select BOARD_STARLABS_STARLITE_SERIES -config BOARD_STARLABS_LITE_ADL_SB - select BOARD_STARLABS_STARLITE_SERIES - if BOARD_STARLABS_STARLITE_SERIES config CCD_PORT @@ -75,7 +72,6 @@ config EC_STARLABS_BATTERY_OEM config EC_STARLABS_ITE_BIN_PATH string depends on EC_STARLABS_NEED_ITE_BIN - default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/mk_v_sb/ec.bin" if BOARD_STARLABS_LITE_ADL_SB default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/ec.bin" config EC_VARIANT_DIR @@ -94,7 +90,6 @@ config MAINBOARD_DIR config MAINBOARD_FAMILY string - default "I5-SB" if BOARD_STARLABS_LITE_ADL_SB default "I5" config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/starlabs/starlite_adl/Kconfig.name b/src/mainboard/starlabs/starlite_adl/Kconfig.name index 5d66e61934..071490084b 100644 --- a/src/mainboard/starlabs/starlite_adl/Kconfig.name +++ b/src/mainboard/starlabs/starlite_adl/Kconfig.name @@ -1,7 +1,4 @@ comment "Star Labs StarLite Series" config BOARD_STARLABS_LITE_ADL - bool "Star Labs Lite Mk V (N200)" - -config BOARD_STARLABS_LITE_ADL_SB - bool "Star Labs Lite Mk V Smart Battery (N200)" + bool "Star Labs Lite Mk V (N200/N355)"