From 39f0d38bcd104fd4d1ffbcc6aa3a754566c97070 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Thu, 6 Apr 2023 08:36:52 +1000 Subject: futility/updater: Fix legacy bios image naming Clean up many other instances of 'bios.bin' littered everywhere over time. BUG=b:65745723 BRANCH=none TEST=`cros_run_unit_tests --host --packages vboot_reference`. Change-Id: Ie5916d003ba0a5873ce04ec96f48cd45c8253aab Signed-off-by: Edward O'Callaghan Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4402371 Tested-by: Edward O'Callaghan Auto-Submit: Edward O'Callaghan Commit-Queue: Edward O'Callaghan Commit-Queue: Hung-Te Lin Reviewed-by: Hung-Te Lin --- futility/cmd_gbb_utility.c | 8 ++++---- futility/cmd_load_fmap.c | 2 +- futility/cmd_show.c | 2 +- futility/cmd_sign.c | 4 ++-- futility/updater_manifest.c | 2 +- tests/vb20_verify_fw.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/futility/cmd_gbb_utility.c b/futility/cmd_gbb_utility.c index 8cd02de0..00762380 100644 --- a/futility/cmd_gbb_utility.c +++ b/futility/cmd_gbb_utility.c @@ -39,10 +39,10 @@ static void print_help(int argc, char *argv[]) { printf("\n" "Usage: " MYNAME " %s [-g|-s|-c] [OPTIONS] " - "[bios_file] [output_file]\n" + "[image_file] [output_file]\n" "\n" "GET MODE:\n" - "-g, --get (default)\tGet (read) from bios_file or flash, " + "-g, --get (default)\tGet (read) from image_file or flash, " "with following options:\n" FLASH_ARG_HELP " --hwid \tReport hardware id (default).\n" @@ -70,9 +70,9 @@ static void print_help(int argc, char *argv[]) " \tCreate a GBB blob by given size list.\n\n" FLASH_MORE_HELP "SAMPLE:\n" - " %s -g bios.bin\n" + " %s -g image.bin\n" " %s --set --hwid='New Model' -k key.bin" - " bios.bin newbios.bin\n" + " image.bin newimage.bin\n" " %s -c 0x100,0x1000,0x03DE80,0x1000 gbb.blob\n\n" "GBB Flags:\n" " To get a developer-friendly device, try 0x18 (dev_mode boot_usb).\n" diff --git a/futility/cmd_load_fmap.c b/futility/cmd_load_fmap.c index 5e75d655..9aaebb78 100644 --- a/futility/cmd_load_fmap.c +++ b/futility/cmd_load_fmap.c @@ -35,7 +35,7 @@ static const char usage[] = "\n" "\n" " This will clear the RO_VPD area, and scramble VBLOCK_B:\n" "\n" - " " MYNAME " %s bios.bin RO_VPD:/dev/zero VBLOCK_B:/dev/urandom\n" + " " MYNAME " %s image.bin RO_VPD:/dev/zero VBLOCK_B:/dev/urandom\n" "\n"; static void print_help(int argc, char *argv[]) diff --git a/futility/cmd_show.c b/futility/cmd_show.c index cedd45de..66ce52b0 100644 --- a/futility/cmd_show.c +++ b/futility/cmd_show.c @@ -504,7 +504,7 @@ static const char usage[] = "\n" " a boot descriptor block (BDB)\n" " a keyblock (.keyblock)\n" " a firmware preamble signature (VBLOCK_A/B)\n" - " a firmware image (bios.bin)\n" + " a firmware image (image.bin)\n" " a kernel partition (/dev/sda2, /dev/mmcblk0p2)\n" " keys in various formats (.vbpubk, .vbprivk, .pem)\n" " several other file types related to verified boot\n" diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c index e5a4bcc2..ce6d0f19 100644 --- a/futility/cmd_sign.c +++ b/futility/cmd_sign.c @@ -449,7 +449,7 @@ static void print_help_raw_firmware(int argc, char *argv[]) } static const char usage_bios[] = "\n" - "To sign a complete firmware image (bios.bin):\n" + "To sign a complete firmware image (image.bin):\n" "\n" "Required PARAMS:\n" " [--infile] INFILE Input firmware image (modified\n" @@ -674,7 +674,7 @@ static const char usage_default[] = "\n" " INFILE OUTFILE\n" " public key (.vbpubk) keyblock\n" " raw firmware blob (FW_MAIN_A/B) firmware preamble (VBLOCK_A/B)\n" - " full firmware image (bios.bin) same, or signed in-place\n" + " full firmware image (image.bin) same, or signed in-place\n" " raw linux kernel (vmlinuz) kernel partition image\n" " kernel partition (/dev/sda2) same, or signed in-place\n" " usbpd1 firmware image same, or signed in-place\n" diff --git a/futility/updater_manifest.c b/futility/updater_manifest.c index 96faa6c4..22ce2262 100644 --- a/futility/updater_manifest.c +++ b/futility/updater_manifest.c @@ -20,7 +20,7 @@ * * A package for a single board (i.e., not Unified Build) will have all the * image files in the top folder: - * - host: 'image.bin' (or 'bios.bin' as legacy name before CL:1318712) + * - host: 'image.bin' * - ec: 'ec.bin' * - pd: 'pd.bin' * diff --git a/tests/vb20_verify_fw.c b/tests/vb20_verify_fw.c index 8088b934..4d337424 100644 --- a/tests/vb20_verify_fw.c +++ b/tests/vb20_verify_fw.c @@ -19,7 +19,7 @@ const char *body_fname; /** * Local implementation which reads resources from individual files. Could be - * more elegant and read from bios.bin, if we understood the fmap. + * more elegant and read from image.bin, if we understood the fmap. */ vb2_error_t vb2ex_read_resource(struct vb2_context *c, enum vb2_resource_index index, uint32_t offset, -- cgit v1.2.1