GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chromeec: Sync ec_commands.h for CBI tags 

This patch syncs ec_commands.h with the one in chromeec.

BUG=b:70294260
BRANCH=none
TEST=Verify SKU_ID and OEM_ID are correctly recognized on Fizz.

Change-Id: I451ec9f6f9d7257915b7d4cb1e5adbee82d107de
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://review.coreboot.org/23788
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Daisuke Nojiri 2018-02-15 12:38:15 -08:00 committed by Aaron Durbin
parent c205ae0c6e
commit f984a05cc7
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ec/google/chromeec/ec.c
View File

@ -585,12 +585,12 @@ static int cbi_get_uint32(uint32_t *id, uint32_t type)
int google_chromeec_cbi_get_sku_id(uint32_t *id) int google_chromeec_cbi_get_sku_id(uint32_t *id)
{ {
return cbi_get_uint32(id, CBI_DATA_SKU_ID); return cbi_get_uint32(id, CBI_TAG_SKU_ID);
} }
int google_chromeec_cbi_get_oem_id(uint32_t *id) int google_chromeec_cbi_get_oem_id(uint32_t *id)
{ {
return cbi_get_uint32(id, CBI_DATA_OEM_ID); return cbi_get_uint32(id, CBI_TAG_OEM_ID);
} }
#ifndef __SMM__ #ifndef __SMM__

21
src/ec/google/chromeec/ec_commands.h
View File

@ -4382,14 +4382,11 @@ struct __ec_align1 ec_params_efs_verify {
*/ */
#define EC_CMD_SET_CROS_BOARD_INFO 0x0120 #define EC_CMD_SET_CROS_BOARD_INFO 0x0120
enum cbi_data_type { enum cbi_data_tag {
/* integer types */ CBI_TAG_BOARD_VERSION = 0, /* uint16_t or uint8_t[] = {minor,major} */
CBI_DATA_BOARD_VERSION = 0, CBI_TAG_OEM_ID = 1, /* uint8_t */
CBI_DATA_OEM_ID = 1, CBI_TAG_SKU_ID = 2, /* uint8_t */
CBI_DATA_SKU_ID = 2, CBI_TAG_COUNT,
/* string types */
CBI_FIRST_STRING_PARAM = 0x1000,
CBI_DATA_COUNT,
}; };
/* /*
@ -4401,7 +4398,7 @@ enum cbi_data_type {
#define CBI_GET_RELOAD (1 << 0) #define CBI_GET_RELOAD (1 << 0)
struct __ec_align4 ec_params_get_cbi { struct __ec_align4 ec_params_get_cbi {
uint32_t type; /* enum cbi_data_type */ uint32_t type; /* enum cbi_data_tag */
uint32_t flag; /* CBI_GET_* */ uint32_t flag; /* CBI_GET_* */
}; };
@ -4417,10 +4414,10 @@ struct __ec_align4 ec_params_get_cbi {
#define CBI_SET_INIT (1 << 1) #define CBI_SET_INIT (1 << 1)
struct __ec_align1 ec_params_set_cbi { struct __ec_align1 ec_params_set_cbi {
uint32_t type; /* enum cbi_data_type */ uint32_t tag; /* enum cbi_data_tag */
uint32_t flag; /* CBI_SET_* */ uint32_t flag; /* CBI_SET_* */
uint32_t data; /* For numeric value */ uint32_t size; /* Data size */
uint8_t raw[]; /* For string and raw data */ uint8_t data[]; /* For string and raw data */
}; };
/*****************************************************************************/ /*****************************************************************************/