From 66f40a86de21a0470f78c69ac6e01051673eb55d Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Thu, 23 Oct 2025 20:36:01 +0100 Subject: [PATCH] ec/starlabs/merlin: Move version offsets to ECDEFs This is a more suitable place for these definitions as it contains all other ECRAM offsets. Change-Id: I12f52b7b27b24c49b6dfc3d4b8fa0718605d2d5f Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/89695 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- src/ec/starlabs/merlin/ec.h | 4 ---- src/ec/starlabs/merlin/variants/glk/ecdefs.h | 2 ++ src/ec/starlabs/merlin/variants/glkr/ecdefs.h | 2 ++ src/ec/starlabs/merlin/variants/kbl/ecdefs.h | 2 ++ src/ec/starlabs/merlin/variants/merlin/ecdefs.h | 2 ++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ec/starlabs/merlin/ec.h b/src/ec/starlabs/merlin/ec.h index b22b27917a..39c805cb48 100644 --- a/src/ec/starlabs/merlin/ec.h +++ b/src/ec/starlabs/merlin/ec.h @@ -47,10 +47,6 @@ #define ITE_CHIPID2 0x21 /* Device ID register 2 */ #define NUVOTON_CHIPID 0x27 /* Device ID register */ -/* EC RAM common offsets */ -#define ECRAM_MAJOR_VERSION 0x00 -#define ECRAM_MINOR_VERSION 0x01 - /* * CMOS Settings */ diff --git a/src/ec/starlabs/merlin/variants/glk/ecdefs.h b/src/ec/starlabs/merlin/variants/glk/ecdefs.h index a9b3025148..ecdff4a5aa 100644 --- a/src/ec/starlabs/merlin/variants/glk/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/glk/ecdefs.h @@ -11,6 +11,8 @@ #define _EC_STARLABS_GLK_EC_DEFS_H /* EC RAM offsets. */ +#define ECRAM_MAJOR_VERSION 0x00 +#define ECRAM_MINOR_VERSION 0x01 #define ECRAM_TRACKPAD_STATE 0x14 #define ECRAM_KBL_STATE 0x19 #define ECRAM_KBL_BRIGHTNESS 0x18 diff --git a/src/ec/starlabs/merlin/variants/glkr/ecdefs.h b/src/ec/starlabs/merlin/variants/glkr/ecdefs.h index 028dd5f047..e6dbc2f25e 100644 --- a/src/ec/starlabs/merlin/variants/glkr/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/glkr/ecdefs.h @@ -14,6 +14,8 @@ #define NUVOTON_CHIPID_VAL 0x0004 /* EC RAM offsets. */ +#define ECRAM_MAJOR_VERSION 0x00 +#define ECRAM_MINOR_VERSION 0x01 #define ECRAM_TRACKPAD_STATE 0x14 #define ECRAM_KBL_STATE 0x16 #define ECRAM_KBL_BRIGHTNESS 0x17 diff --git a/src/ec/starlabs/merlin/variants/kbl/ecdefs.h b/src/ec/starlabs/merlin/variants/kbl/ecdefs.h index 75b83c9bf5..d5dd307eb3 100644 --- a/src/ec/starlabs/merlin/variants/kbl/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/kbl/ecdefs.h @@ -11,6 +11,8 @@ #define _EC_STARLABS_KBL_EC_DEFS_H /* EC RAM offsets */ +#define ECRAM_MAJOR_VERSION 0x00 +#define ECRAM_MINOR_VERSION 0x01 #define ECRAM_TRACKPAD_STATE 0x14 #define ECRAM_KBL_STATE 0x18 #define ECRAM_KBL_BRIGHTNESS 0x19 diff --git a/src/ec/starlabs/merlin/variants/merlin/ecdefs.h b/src/ec/starlabs/merlin/variants/merlin/ecdefs.h index b712baaf6a..75c2c62ce3 100644 --- a/src/ec/starlabs/merlin/variants/merlin/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/merlin/ecdefs.h @@ -11,6 +11,8 @@ #define _EC_STARLABS_MERLIN_EC_DEFS_H /* EC RAM offsets */ +#define ECRAM_MAJOR_VERSION 0x00 +#define ECRAM_MINOR_VERSION 0x01 #define ECRAM_KBL_BRIGHTNESS 0x09 #define ECRAM_KBL_TIMEOUT 0x10 #define ECRAM_KBL_STATE 0x0a