diff options
author | Joel Kitching <kitching@google.com> | 2021-01-20 17:54:15 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-02-27 07:45:46 +0000 |
commit | 5b1e2e75b48db4f056dc952616c9a9fecf3535c1 (patch) | |
tree | d289d09b20c48aeb214a2bd428e056c1351c7615 /utility | |
parent | 6466c58b87e0d6c944bc8aa7dbac3f9f54690b71 (diff) | |
download | vboot-5b1e2e75b48db4f056dc952616c9a9fecf3535c1.tar.gz |
vboot: standardize legacy boot and altfw terminology
Standardize on the term "altfw" (short form) and
"alternate bootloader" (long form) in both code and
documentation.
Remove the VbAltFwIndex_t enum, and replace with a
simple uint32_t.
Rename VbExLegacy to vb2ex_run_altfw, and move
to vboot2 namespace.
Rename crossystem param dev_boot_legacy to
dev_boot_altfw, but leave an alias.
Rename crossystem param dev_default_boot value
from legacy to altfw, but leave an alias.
BUG=b:179458327
TEST=make clean && make runtests
TEST=emerge vboot_reference and check output for:
crossystem dev_boot_legacy=0
crossystem dev_boot_altfw=0
crossystem dev_default_boot=legacy
crossystem dev_default_boot=altfw
BRANCH=none
Cq-Depend: chromium:2641196
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: I289df63d992a3d9ae3845c59779ecbd115b18ee2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2641346
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Yu-Ping Wu <yupingso@chromium.org>
Diffstat (limited to 'utility')
-rw-r--r-- | utility/crossystem.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/utility/crossystem.c b/utility/crossystem.c index 384c6717..8fdce980 100644 --- a/utility/crossystem.c +++ b/utility/crossystem.c @@ -37,13 +37,13 @@ const Param sys_param_list[] = { {"cros_debug", 0, "OS should allow debug features"}, {"dbg_reset", CAN_WRITE, "Debug reset mode request"}, {"debug_build", 0, "OS image built for debug features"}, - {"dev_boot_legacy", CAN_WRITE, "Enable developer mode boot Legacy OSes"}, + {"dev_boot_altfw", CAN_WRITE, "Enable developer mode alternate bootloader"}, {"dev_boot_signed_only", CAN_WRITE, "Enable developer mode boot only from official kernels"}, {"dev_boot_usb", CAN_WRITE, "Enable developer mode boot from external disk (USB/SD)"}, {"dev_default_boot", IS_STRING|CAN_WRITE, - "Default boot from disk, legacy or usb"}, + "Default boot from disk, altfw or usb"}, {"dev_enable_udc", CAN_WRITE, "Enable USB Device Controller"}, {"devsw_boot", 0, "Developer switch position at boot"}, {"devsw_cur", 0, "Developer switch current position"}, @@ -135,6 +135,14 @@ static const Param* FindParam(const char* name) { const Param* p; if (!name) return NULL; + /* "legacy" term deprecated in favour of "altfw" (see: b/179458327) */ + if (!strcasecmp(name, "dev_boot_legacy")) { + fprintf(stderr, + "!!!\n" + "!!! PLEASE USE 'dev_boot_altfw' INSTEAD OF 'dev_boot_legacy'\n" + "!!!\n"); + name = "dev_boot_altfw"; + } for (p = sys_param_list; p->name; p++) { if (!strcasecmp(p->name, name)) return p; @@ -308,13 +316,13 @@ int main(int argc, char* argv[]) { case PARAM_SUCCESS: break; case PARAM_ERROR_READ_ONLY: - fprintf(stderr, "Parameter %s is read-only\n", name); + fprintf(stderr, "Parameter %s is read-only\n", p->name); break; case PARAM_ERROR_INVALID_INT: fprintf(stderr, "Value %s is not a valid integer\n", value); break; default: - fprintf(stderr, "Failed to set parameter %s\n", name); + fprintf(stderr, "Failed to set parameter %s\n", p->name); break; } } else if (has_expect) |