diff options
| author | Philip Chen <philipchen@google.com> | 2019-08-02 14:13:58 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-12 23:37:48 +0000 |
| commit | f21845b628b79c3ecbe460d900670757449225ab (patch) | |
| tree | 5a7f8039edbd5ef8b0a05f9c9a7e7c1544d639d4 | |
| parent | f4f6504e1f6ea524e4703519c1c0c891a96ed0f7 (diff) | |
| download | chrome-ec-f21845b628b79c3ecbe460d900670757449225ab.tar.gz | |
cbi-util: Remove OEM_ID from required fields
BUG=b:138663009
BRANCH=none
TEST=successfully create a cbi image w/o OEM_ID set
Change-Id: Ic2b96f6d6f02a433de4f2ddc0777035369fd9c4a
Signed-off-by: Philip Chen <philipchen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1734007
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
| -rw-r--r-- | util/cbi-util.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/util/cbi-util.c b/util/cbi-util.c index 1027c820cc..ad050f36c5 100644 --- a/util/cbi-util.c +++ b/util/cbi-util.c @@ -22,9 +22,8 @@ #define ARGS_MASK_BOARD_VERSION BIT(0) #define ARGS_MASK_FILENAME BIT(1) -#define ARGS_MASK_OEM_ID BIT(2) -#define ARGS_MASK_SIZE BIT(3) -#define ARGS_MASK_SKU_ID BIT(4) +#define ARGS_MASK_SIZE BIT(2) +#define ARGS_MASK_SKU_ID BIT(3) /* TODO: Set it by macro */ const char cmd_name[] = "cbi-util"; @@ -80,7 +79,6 @@ const char help_create[] = "Required ARGS are:\n" " --file <file> Path to output file\n" " --board_version <value> Board version\n" - " --oem_id <value> OEM ID\n" " --sku_id <value> SKU ID\n" " --size <size> Size of output file in bytes\n" "<value> must be a positive integer <= 0XFFFFFFFF and field size can\n" @@ -88,6 +86,7 @@ const char help_create[] = "<size> must be a positive integer <= 0XFFFF.\n" "Optional ARGS are:\n" " --dram_part_num <string> DRAM PART NUM\n" + " --oem_id <value> OEM ID\n" " --oem_name <string> OEM NAME\n" " --erase_byte <uint8> Byte used for empty space. Default:0xff\n" " --format_version <uint16> Data format version\n" @@ -288,7 +287,6 @@ static int cmd_create(int argc, char **argv) case OPT_OEM_ID: if (parse_integer_field(optarg, &bi.oem)) return -1; - set_mask |= ARGS_MASK_OEM_ID; break; case OPT_SIZE: val = strtoul(optarg, &e, 0); @@ -318,7 +316,7 @@ static int cmd_create(int argc, char **argv) } if (set_mask != (ARGS_MASK_BOARD_VERSION | ARGS_MASK_FILENAME | - ARGS_MASK_OEM_ID | ARGS_MASK_SIZE | ARGS_MASK_SKU_ID)) { + ARGS_MASK_SIZE | ARGS_MASK_SKU_ID)) { fprintf(stderr, "Missing required arguments\n"); print_help_create(); return -1; |