diff options
author | Abe Levkoy <alevkoy@chromium.org> | 2020-03-11 09:14:32 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-09-01 12:20:33 +0000 |
commit | 89ddbd468ea95a8552ac05352a1e7aa88f9c63b3 (patch) | |
tree | 625d92b468e414424519a98fc86e02b9fbe54bc3 /util | |
parent | 5c532b1d4fe9b92134b428cacee2a2fa9b4090f0 (diff) | |
download | chrome-ec-89ddbd468ea95a8552ac05352a1e7aa88f9c63b3.tar.gz |
cbi: Support PCB supplier field
Add support for PCB_SUPPLIER, to distinguish boards of the same type
with different PCB suppliers.
BUG=b:140244489
TEST=ectool cbi set 7 0 1 0; ectool cbi get 7
TEST=cbi on EC console after writing with ectool
TEST=/usr/share/userfeedback/scripts/cbi_info after writing with ectool
TEST=cbi-util create --pcb_supplier 1 ...; cbi-util show ...
BRANCH=none
Change-Id: Ieadba91694f4775cc86c2c4b09cdf0874b9ad444
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2108710
Reviewed-by: Jett Rink <jettrink@chromium.org>
Tested-by: George Engelbrecht <engeg@google.com>
Commit-Queue: George Engelbrecht <engeg@google.com>
(cherry picked from commit f28e4caa00393a2bf16f37c929d7b5a95e654e90)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2387685
Reviewed-by: Zhuohao Lee <zhuohao@chromium.org>
Commit-Queue: Marco Chen <marcochen@chromium.org>
Tested-by: Marco Chen <marcochen@chromium.org>
Diffstat (limited to 'util')
-rw-r--r-- | util/cbi-util.c | 12 | ||||
-rw-r--r-- | util/ectool.c | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/util/cbi-util.c b/util/cbi-util.c index 1dc4ec3cce..328198f4f9 100644 --- a/util/cbi-util.c +++ b/util/cbi-util.c @@ -39,6 +39,7 @@ enum { OPT_OEM_NAME, OPT_MODEL_ID, OPT_FW_CONFIG, + OPT_PCB_SUPPLIER, OPT_SIZE, OPT_ERASE_BYTE, OPT_SHOW_ALL, @@ -54,6 +55,7 @@ static const struct option opts_create[] = { {"oem_name", 1, 0, OPT_OEM_NAME}, {"model_id", 1, 0, OPT_MODEL_ID}, {"fw_config", 1, 0, OPT_FW_CONFIG}, + {"pcb_supplier", 1, 0, OPT_PCB_SUPPLIER}, {"size", 1, 0, OPT_SIZE}, {"erase_byte", 1, 0, OPT_ERASE_BYTE}, {NULL, 0, 0, 0} @@ -74,6 +76,7 @@ static const char *field_name[] = { "OEM_NAME", "MODEL_ID", "FW_CONFIG", + "PCB_SUPPLIER", }; BUILD_ASSERT(ARRAY_SIZE(field_name) == CBI_TAG_COUNT); @@ -96,6 +99,7 @@ const char help_create[] = " --format_version <uint16> Data format version\n" " --model_id <value> Model ID\n" " --fw_config <value> Firmware configuration bit-field\n" + " --pcb_supplier <value> PCB supplier\n" "\n" "<value> must be a positive integer <= 0XFFFFFFFF and field size can\n" " be optionally specified by <value:size> notation: e.g. 0xabcd:4.\n" @@ -254,6 +258,7 @@ static int cmd_create(int argc, char **argv) struct integer_field sku; struct integer_field model; struct integer_field fw_config; + struct integer_field pcb_supplier; const char *dram_part_num; const char *oem_name; } bi; @@ -327,6 +332,10 @@ static int cmd_create(int argc, char **argv) if (parse_integer_field(optarg, &bi.fw_config)) return -1; break; + case OPT_PCB_SUPPLIER: + if (parse_integer_field(optarg, &bi.pcb_supplier)) + return -1; + break; } } @@ -355,6 +364,8 @@ static int cmd_create(int argc, char **argv) p = cbi_set_data(p, CBI_TAG_MODEL_ID, &bi.model.val, bi.model.size); p = cbi_set_data(p, CBI_TAG_FW_CONFIG, &bi.fw_config.val, bi.fw_config.size); + p = cbi_set_data(p, CBI_TAG_PCB_SUPPLIER, &bi.pcb_supplier.val, + bi.pcb_supplier.size); if (bi.dram_part_num != NULL) { p = cbi_set_data(p, CBI_TAG_DRAM_PART_NUM, bi.dram_part_num, strlen(bi.dram_part_num) + 1); @@ -485,6 +496,7 @@ static int cmd_show(int argc, char **argv) print_integer(buf, CBI_TAG_SKU_ID); print_integer(buf, CBI_TAG_MODEL_ID); print_integer(buf, CBI_TAG_FW_CONFIG); + print_integer(buf, CBI_TAG_PCB_SUPPLIER); print_string(buf, CBI_TAG_DRAM_PART_NUM); print_string(buf, CBI_TAG_OEM_NAME); diff --git a/util/ectool.c b/util/ectool.c index 985909e5c2..24144901fd 100644 --- a/util/ectool.c +++ b/util/ectool.c @@ -6961,6 +6961,7 @@ static void cmd_cbi_help(char *cmd) " 4: OEM_NAME (string)\n" " 5: MODEL_ID\n" " 6: FW_CONFIG\n" + " 7: PCB_VENDOR\n" " <size> is the size of the data in byte. It should be zero for\n" " string types.\n" " <value/string> is an integer or a string to be set\n" |