diff options
Diffstat (limited to 'src/ec/starlabs')
-rw-r--r-- | src/ec/starlabs/merlin/Kconfig | 7 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/ec.h | 4 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/ite.c | 20 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/variants/adl/ecdefs.h | 2 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/variants/apl/ecdefs.h | 1 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/variants/cezanne/ecdefs.h | 1 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/variants/cml/ecdefs.h | 1 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/variants/glk/ecdefs.h | 1 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/variants/glkr/ecdefs.h | 1 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/variants/kbl/ecdefs.h | 1 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/variants/merlin/ecdefs.h | 1 | ||||
-rw-r--r-- | src/ec/starlabs/merlin/variants/tgl/ecdefs.h | 1 |
12 files changed, 1 insertions, 40 deletions
diff --git a/src/ec/starlabs/merlin/Kconfig b/src/ec/starlabs/merlin/Kconfig index 203fd4884b..6ccd21791c 100644 --- a/src/ec/starlabs/merlin/Kconfig +++ b/src/ec/starlabs/merlin/Kconfig @@ -64,13 +64,6 @@ config EC_STARLABS_MAX_CHARGE help Select if the mainboard supports limiting the maximum charge of the battery. -config EC_STARLABS_MIRROR_FLAG - bool - default n - depends on EC_STARLABS_ITE - help - Select if the EC should mirror the EC firmware contained in the coreboot ROM. - config EC_STARLABS_MERLIN bool "Use open-source Merlin EC Firmware" default n diff --git a/src/ec/starlabs/merlin/ec.h b/src/ec/starlabs/merlin/ec.h index ff01c89679..ca1d081f0c 100644 --- a/src/ec/starlabs/merlin/ec.h +++ b/src/ec/starlabs/merlin/ec.h @@ -98,10 +98,6 @@ #define KBL_DISABLED 0x00 #define KBL_ENABLED 0xdd -/* Mirror Flag */ -#define MIRROR_DISABLED 0x00 -#define MIRROR_ENABLED 0x01 - uint16_t ec_get_version(void); #endif diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c index d2d7c454d3..357c67cda5 100644 --- a/src/ec/starlabs/merlin/ite.c +++ b/src/ec/starlabs/merlin/ite.c @@ -70,7 +70,6 @@ static void merlin_init(struct device *dev) * trackpad_state * kbl_brightness * kbl_state - * mirror_flag */ /* @@ -248,25 +247,6 @@ static void merlin_init(struct device *dev) 1, kbl_state, ARRAY_SIZE(kbl_state))); - - /* - * Mirror Flag - * - * Setting: mirror_flag - * - * Values: Off, On - * Default: On - */ - const uint8_t mirror_flag[] = { - MIRROR_DISABLED, - MIRROR_ENABLED - }; - if (CONFIG(EC_STARLABS_MIRROR_FLAG)) - ec_write(ECRAM_MIRROR_FLAG, - get_ec_value_from_option("mirror_flag", - 1, - mirror_flag, - ARRAY_SIZE(mirror_flag))); } static struct device_operations ops = { diff --git a/src/ec/starlabs/merlin/variants/adl/ecdefs.h b/src/ec/starlabs/merlin/variants/adl/ecdefs.h index 18480e2a9d..28f7e4b84f 100644 --- a/src/ec/starlabs/merlin/variants/adl/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/adl/ecdefs.h @@ -23,5 +23,5 @@ #define ECRAM_MAX_CHARGE 0x1a #define ECRAM_FAN_MODE 0x1b #define ECRAM_FAST_CHARGE dead_code_t(uint8_t) -#define ECRAM_MIRROR_FLAG 0x05 + #endif diff --git a/src/ec/starlabs/merlin/variants/apl/ecdefs.h b/src/ec/starlabs/merlin/variants/apl/ecdefs.h index 5cbe14e36d..fa7e79b148 100644 --- a/src/ec/starlabs/merlin/variants/apl/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/apl/ecdefs.h @@ -23,6 +23,5 @@ #define ECRAM_MAX_CHARGE dead_code_t(uint8_t) #define ECRAM_FAN_MODE dead_code_t(uint8_t) #define ECRAM_FAST_CHARGE dead_code_t(uint8_t) -#define ECRAM_MIRROR_FLAG 0x04 #endif diff --git a/src/ec/starlabs/merlin/variants/cezanne/ecdefs.h b/src/ec/starlabs/merlin/variants/cezanne/ecdefs.h index 0c522cc845..6942c391a3 100644 --- a/src/ec/starlabs/merlin/variants/cezanne/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/cezanne/ecdefs.h @@ -23,6 +23,5 @@ #define ECRAM_KBL_BRIGHTNESS 0x36 #define ECRAM_FN_LOCK_STATE 0x70 #define ECRAM_FAST_CHARGE dead_code_t(uint8_t) -#define ECRAM_MIRROR_FLAG 0x05 #endif diff --git a/src/ec/starlabs/merlin/variants/cml/ecdefs.h b/src/ec/starlabs/merlin/variants/cml/ecdefs.h index 0a2654bf8f..6a24bc4deb 100644 --- a/src/ec/starlabs/merlin/variants/cml/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/cml/ecdefs.h @@ -23,6 +23,5 @@ #define ECRAM_KBL_BRIGHTNESS 0x19 #define ECRAM_FN_LOCK_STATE 0x2c #define ECRAM_FAST_CHARGE dead_code_t(uint8_t) -#define ECRAM_MIRROR_FLAG 0x04 #endif diff --git a/src/ec/starlabs/merlin/variants/glk/ecdefs.h b/src/ec/starlabs/merlin/variants/glk/ecdefs.h index b2e2f2f8ab..fefdd141c9 100644 --- a/src/ec/starlabs/merlin/variants/glk/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/glk/ecdefs.h @@ -23,6 +23,5 @@ #define ECRAM_MAX_CHARGE dead_code_t(uint8_t) #define ECRAM_FAN_MODE dead_code_t(uint8_t) #define ECRAM_FAST_CHARGE dead_code_t(uint8_t) -#define ECRAM_MIRROR_FLAG 0x04 #endif diff --git a/src/ec/starlabs/merlin/variants/glkr/ecdefs.h b/src/ec/starlabs/merlin/variants/glkr/ecdefs.h index ecc117c990..038c378fb2 100644 --- a/src/ec/starlabs/merlin/variants/glkr/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/glkr/ecdefs.h @@ -23,6 +23,5 @@ #define ECRAM_MAX_CHARGE dead_code_t(uint8_t) #define ECRAM_FAN_MODE dead_code_t(uint8_t) #define ECRAM_FAST_CHARGE 0x18 -#define ECRAM_MIRROR_FLAG 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 8f3355dd0a..3b693173af 100644 --- a/src/ec/starlabs/merlin/variants/kbl/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/kbl/ecdefs.h @@ -23,6 +23,5 @@ #define ECRAM_FN_CTRL_REVERSE 0x43 #define ECRAM_MAX_CHARGE dead_code_t(uint8_t) #define ECRAM_FAST_CHARGE dead_code_t(uint8_t) -#define ECRAM_MIRROR_FLAG 0x04 #endif diff --git a/src/ec/starlabs/merlin/variants/merlin/ecdefs.h b/src/ec/starlabs/merlin/variants/merlin/ecdefs.h index 08f80cb1f8..f02c73a27c 100644 --- a/src/ec/starlabs/merlin/variants/merlin/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/merlin/ecdefs.h @@ -20,6 +20,5 @@ #define ECRAM_FAN_MODE 0x50 #define ECRAM_MAX_CHARGE 0x51 #define ECRAM_FAST_CHARGE 0x52 -#define ECRAM_MIRROR_FLAG 0x05 #endif diff --git a/src/ec/starlabs/merlin/variants/tgl/ecdefs.h b/src/ec/starlabs/merlin/variants/tgl/ecdefs.h index c17b02542b..cbc7b86e10 100644 --- a/src/ec/starlabs/merlin/variants/tgl/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/tgl/ecdefs.h @@ -23,6 +23,5 @@ #define ECRAM_MAX_CHARGE 0x1a #define ECRAM_FAN_MODE 0x1b #define ECRAM_FAST_CHARGE dead_code_t(uint8_t) -#define ECRAM_MIRROR_FLAG 0x05 #endif |