summaryrefslogtreecommitdiffstats
path: root/src/mainboard
diff options
context:
space:
mode:
authorSean Rhodes <sean@starlabs.systems>2023-07-05 15:17:18 +0100
committerFelix Held <felix-coreboot@felixheld.de>2023-08-10 14:02:44 +0000
commit257881e797977da6c9f1115ed5ed98571ad07286 (patch)
tree6434aae8c4fbef310171a85209451638bd21ba20 /src/mainboard
parenta2ed56011145b679051c10a03cb8362734729c26 (diff)
downloadcoreboot-257881e797977da6c9f1115ed5ed98571ad07286.tar.gz
coreboot-257881e797977da6c9f1115ed5ed98571ad07286.tar.bz2
coreboot-257881e797977da6c9f1115ed5ed98571ad07286.zip
mb/starlabs/starbook/adl: Use the merlin ec code
Switch the ADL variant to use the "merlin" EC variant, and delete the no longer needed "ADL" EC variant. This is not a functional change. Signed-off-by: Sean Rhodes <sean@starlabs.systems> Change-Id: I61e56cc95a26be60d7f10c89d26bce2d857ae81a Reviewed-on: https://review.coreboot.org/c/coreboot/+/76313 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/starlabs/starbook/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mainboard/starlabs/starbook/Kconfig b/src/mainboard/starlabs/starbook/Kconfig
index 0f2a71997317..e0a01f5942eb 100644
--- a/src/mainboard/starlabs/starbook/Kconfig
+++ b/src/mainboard/starlabs/starbook/Kconfig
@@ -58,6 +58,7 @@ config BOARD_STARLABS_STARBOOK_ADL
select DRIVERS_INTEL_PMC
select EC_STARLABS_KBL_LEVELS
select EC_STARLABS_MAX_CHARGE
+ select EC_STARLABS_MERLIN
select EC_STARLABS_NEED_ITE_BIN
select MEMORY_MAPPED_TPM
select SOC_INTEL_ALDERLAKE
@@ -110,7 +111,7 @@ 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 "tgl" if !EC_STARLABS_MERLIN && BOARD_STARLABS_STARBOOK_TGL
- default "adl" if !EC_STARLABS_MERLIN && BOARD_STARLABS_STARBOOK_ADL
+ default "merlin"
config FMDFILE
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/variants/\$(CONFIG_VARIANT_DIR)/board.fmd"