Change in coreboot[master]: chromeec: Sync ec_commands.h for CBI tags

[Daisuke Nojiri (Code Review)]

Daisuke Nojiri has uploaded this change for review. ( https://review.coreboot.org/23788

Change subject: chromeec: Sync ec_commands.h for CBI tags
......................................................................

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 
---
M src/ec/google/chromeec/ec.c
M src/ec/google/chromeec/ec_commands.h
2 files changed, 11 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/23788/1

diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index e8c50aa..a290f61 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -585,12 +585,12 @@

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)
 {
-	return cbi_get_uint32(id, CBI_DATA_OEM_ID);
+	return cbi_get_uint32(id, CBI_TAG_OEM_ID);
 }

#ifndef __SMM__
diff --git a/src/ec/google/chromeec/ec_commands.h b/src/ec/google/chromeec/ec_commands.h
index b333dde..cfd62e6 100644
--- a/src/ec/google/chromeec/ec_commands.h
+++ b/src/ec/google/chromeec/ec_commands.h
@@ -4383,14 +4383,11 @@
  */
 #define EC_CMD_SET_CROS_BOARD_INFO	0x0120

-enum cbi_data_type {
-	/* integer types */
-	CBI_DATA_BOARD_VERSION = 0,
-	CBI_DATA_OEM_ID = 1,
-	CBI_DATA_SKU_ID = 2,
-	/* string types */
-	CBI_FIRST_STRING_PARAM = 0x1000,
-	CBI_DATA_COUNT,
+enum cbi_data_tag {
+	CBI_TAG_BOARD_VERSION = 0,
+	CBI_TAG_OEM_ID = 1,
+	CBI_TAG_SKU_ID = 2,
+	CBI_TAG_COUNT,
 };

/*
@@ -4402,7 +4399,7 @@
 #define CBI_GET_RELOAD		(1 << 0)

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_* */
 };

@@ -4418,10 +4415,10 @@
 #define CBI_SET_INIT		(1 << 1)

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 data;		/* For numeric value */
-	uint8_t raw[];		/* For string and raw data */
+	uint32_t size;		/* Data size */
+	uint8_t data[];		/* For string and raw data */
 };

/*****************************************************************************/