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 /firmware/include | |
| 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 'firmware/include')
| -rw-r--r-- | firmware/include/vboot_api.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index 739019ad..43752e4a 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -355,33 +355,6 @@ uint32_t VbExIsShutdownRequested(void); /* Shutdown requested due to a power button being pressed. */ #define VB_SHUTDOWN_REQUEST_POWER_BUTTON 0x00000004 -enum VbAltFwIndex_t { - VB_ALTFW_DIAGNOSTIC = -1, - VB_ALTFW_DEFAULT = 0, - VB_ALTFW_FIRST = 1, - VB_ALTFW_SECOND, - VB_ALTFW_THIRD, - VB_ALTFW_FOURTH, - VB_ALTFW_FIFTH, - VB_ALTFW_SIXTH, - VB_ALTFW_SEVENTH, - VB_ALTFW_EIGHTH, - VB_ALTFW_NINTH, -}; - -/** - * Execute legacy boot option. - * - * @param altfw_num Bootloader sequence number to execute. Use - * 0 to boot the default payload, if any - * >0 (i.e., positive #) run a payload by # based in altfw/list file - * <0 (i.e., negative #) run a specific payload by name without using - * the altfw/list file. Typically payloads in this category will be - * verified before they are run. Currently these #s are defined: - * -1 diagnostic payload - */ -vb2_error_t VbExLegacy(enum VbAltFwIndex_t altfw_num); - #ifdef __cplusplus } #endif /* __cplusplus */ |