From 6c921c8f062874a92aa4e99104a52b509fa882d2 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Fri, 6 May 2022 10:01:33 +0100 Subject: [PATCH] ec/starlabs/merlin: Remove offset for Max Charge when not supported Set the MAX_CHARGE offset to dead_code_t for boards that don't support the function. The avoids erroneous values being written to the EC. Signed-off-by: Sean Rhodes Change-Id: I306c8a60818b780ef3bfb842e7fcc4d8500d6b03 Reviewed-on: https://review.coreboot.org/c/coreboot/+/64092 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Paul Menzel --- src/ec/starlabs/merlin/variants/apl/ecdefs.h | 2 +- src/ec/starlabs/merlin/variants/glk/ecdefs.h | 2 +- src/ec/starlabs/merlin/variants/kbl/ecdefs.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ec/starlabs/merlin/variants/apl/ecdefs.h b/src/ec/starlabs/merlin/variants/apl/ecdefs.h index 1057da83ff..bb791bc9dc 100644 --- a/src/ec/starlabs/merlin/variants/apl/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/apl/ecdefs.h @@ -20,7 +20,7 @@ #define ECRAM_KBL_TIMEOUT 0x1a #define ECRAM_FN_LOCK_STATE 0x2c #define ECRAM_FN_CTRL_REVERSE 0x2d -#define ECRAM_MAX_CHARGE 0x46 +#define ECRAM_MAX_CHARGE dead_code_t(uint8_t) #define ECRAM_FAN_MODE dead_code_t(uint8_t) #endif diff --git a/src/ec/starlabs/merlin/variants/glk/ecdefs.h b/src/ec/starlabs/merlin/variants/glk/ecdefs.h index b09ffc76f0..7407267041 100644 --- a/src/ec/starlabs/merlin/variants/glk/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/glk/ecdefs.h @@ -20,7 +20,7 @@ #define ECRAM_KBL_TIMEOUT 0x1a #define ECRAM_FN_LOCK_STATE 0x2c #define ECRAM_FN_CTRL_REVERSE 0x2d -#define ECRAM_MAX_CHARGE 0x46 +#define ECRAM_MAX_CHARGE dead_code_t(uint8_t) #define ECRAM_FAN_MODE dead_code_t(uint8_t) #endif diff --git a/src/ec/starlabs/merlin/variants/kbl/ecdefs.h b/src/ec/starlabs/merlin/variants/kbl/ecdefs.h index 36cd0207ab..af771c4613 100644 --- a/src/ec/starlabs/merlin/variants/kbl/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/kbl/ecdefs.h @@ -18,6 +18,6 @@ #define ECRAM_FN_LOCK_STATE 0x2c #define ECRAM_FAN_MODE 0x42 #define ECRAM_FN_CTRL_REVERSE 0x43 -#define ECRAM_MAX_CHARGE 0xff /* TODO: Add */ +#define ECRAM_MAX_CHARGE dead_code_t(uint8_t) #endif