cbi-util: Remove OEM_ID from required fields
BRANCH=none
TEST=successfully create a cbi image w/o OEM_ID set
Tested-by: Philip Chen
#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;
