vboot: publicize vb2_get_dev_boot_target()
Publicize vb2_get_dev_boot_target() as
vb2api_get_dev_default_boot_target(), and move enum vb2_dev_default_boot
to 2api.h as enum vb2_dev_default_boot_target.
BRANCH=none
BUG=b:146399181, b:157871585
TEST=make runtests
TEST=emerge-puff depthcharge
Change-Id: I8336e63cc273c32a41e6b1f2aad886c3940a6aef
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2234788
Reviewed-by: Joel Kitching <kitching@chromium.org>
diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c
index b5788e3..feee132 100644
--- a/firmware/2lib/2misc.c
+++ b/firmware/2lib/2misc.c
@@ -506,27 +506,27 @@
VB2_SECDATA_KERNEL_FLAG_PHONE_RECOVERY_DISABLED);
}
-enum vb2_dev_default_boot vb2_get_dev_boot_target(
+enum vb2_dev_default_boot_target vb2api_get_dev_default_boot_target(
struct vb2_context *ctx)
{
struct vb2_gbb_header *gbb = vb2_get_gbb(ctx);
if (gbb->flags & VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY)
- return VB2_DEV_DEFAULT_BOOT_LEGACY;
+ return VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY;
switch (vb2_nv_get(ctx, VB2_NV_DEV_DEFAULT_BOOT)) {
- case VB2_DEV_DEFAULT_BOOT_USB:
+ case VB2_DEV_DEFAULT_BOOT_TARGET_USB:
if (vb2_dev_boot_usb_allowed(ctx))
- return VB2_DEV_DEFAULT_BOOT_USB;
+ return VB2_DEV_DEFAULT_BOOT_TARGET_USB;
break;
- case VB2_DEV_DEFAULT_BOOT_LEGACY:
+ case VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY:
if (vb2_dev_boot_legacy_allowed(ctx))
- return VB2_DEV_DEFAULT_BOOT_LEGACY;
+ return VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY;
break;
}
- return VB2_DEV_DEFAULT_BOOT_DISK;
+ return VB2_DEV_DEFAULT_BOOT_TARGET_DISK;
}
int vb2_dev_boot_allowed(struct vb2_context *ctx)
diff --git a/firmware/2lib/2nvstorage.c b/firmware/2lib/2nvstorage.c
index 7af8376..590c6e1 100644
--- a/firmware/2lib/2nvstorage.c
+++ b/firmware/2lib/2nvstorage.c
@@ -343,7 +343,7 @@
/* Map out of range values to disk */
if (value > (VB2_NV_DEV_FLAG_DEFAULT_BOOT >>
VB2_NV_DEV_DEFAULT_BOOT_SHIFT))
- value = VB2_DEV_DEFAULT_BOOT_DISK;
+ value = VB2_DEV_DEFAULT_BOOT_TARGET_DISK;
p[VB2_NV_OFFS_DEV] &= ~VB2_NV_DEV_FLAG_DEFAULT_BOOT;
p[VB2_NV_OFFS_DEV] |=
diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c
index 01cd65a..7423d39 100644
--- a/firmware/2lib/2ui_screens.c
+++ b/firmware/2lib/2ui_screens.c
@@ -413,8 +413,8 @@
vb2_error_t developer_mode_init(struct vb2_ui_context *ui)
{
- enum vb2_dev_default_boot default_boot =
- vb2_get_dev_boot_target(ui->ctx);
+ enum vb2_dev_default_boot_target default_boot =
+ vb2api_get_dev_default_boot_target(ui->ctx);
/* Get me outta here! */
if (!vb2_dev_boot_allowed(ui->ctx))
@@ -432,7 +432,7 @@
/* Choose the default selection. */
switch (default_boot) {
- case VB2_DEV_DEFAULT_BOOT_USB:
+ case VB2_DEV_DEFAULT_BOOT_TARGET_USB:
ui->state.selected_item = DEVELOPER_MODE_ITEM_BOOT_EXTERNAL;
break;
default:
diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h
index 3b5c731..5b3542b 100644
--- a/firmware/2lib/include/2api.h
+++ b/firmware/2lib/include/2api.h
@@ -861,6 +861,27 @@
*/
int vb2api_phone_recovery_enabled(struct vb2_context *ctx);
+/* Default boot target in developer mode. */
+enum vb2_dev_default_boot_target {
+ /* Default to boot from disk. */
+ VB2_DEV_DEFAULT_BOOT_TARGET_DISK = 0,
+
+ /* Default to boot from USB. */
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB = 1,
+
+ /* Default to boot legacy OS. */
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY = 2,
+};
+
+/**
+ * Get the default boot target in developer mode.
+ *
+ * @param ctx Vboot context
+ * @return The developer mode default boot target.
+ */
+enum vb2_dev_default_boot_target vb2api_get_dev_default_boot_target(
+ struct vb2_context *ctx);
+
/*****************************************************************************/
/* APIs provided by the caller to verified boot */
diff --git a/firmware/2lib/include/2misc.h b/firmware/2lib/include/2misc.h
index ccdd832..2916b23 100644
--- a/firmware/2lib/include/2misc.h
+++ b/firmware/2lib/include/2misc.h
@@ -210,15 +210,6 @@
void vb2_clear_recovery(struct vb2_context *ctx);
/**
- * Return the developer mode default boot option; see vb2_dev_default_boot.
- *
- * @param ctx Vboot context
- * @return The developer mode default boot option, or
- * VB2_DEV_DEFAULT_BOOT_DISK if not specified.
- */
-enum vb2_dev_default_boot vb2_get_dev_boot_target(struct vb2_context *ctx);
-
-/**
* Determine if developer mode is allowed.
*
* Developer boot is not allowed if and only if FWMP_DEV_DISABLE_BOOT is set and
diff --git a/firmware/2lib/include/2nvstorage.h b/firmware/2lib/include/2nvstorage.h
index 82d4375..32a9b0a 100644
--- a/firmware/2lib/include/2nvstorage.h
+++ b/firmware/2lib/include/2nvstorage.h
@@ -57,7 +57,7 @@
* 0=no, 1=yes. Deprecated; see chromium:995172.
*/
VB2_NV_DEPRECATED_DEV_BOOT_FASTBOOT_FULL_CAP,
- /* Set default boot mode (see vb2_dev_default_boot) */
+ /* Set default boot mode (see vb2_dev_default_boot_target) */
VB2_NV_DEV_DEFAULT_BOOT,
/* Enable USB Device Controller */
VB2_NV_DEV_ENABLE_UDC,
@@ -127,19 +127,6 @@
VB2_NV_DIAG_REQUEST,
};
-/* Set default boot in developer mode */
-enum vb2_dev_default_boot {
- /* Default to boot from disk*/
- VB2_DEV_DEFAULT_BOOT_DISK = 0,
-
- /* Default to boot from USB */
- VB2_DEV_DEFAULT_BOOT_USB = 1,
-
- /* Default to boot legacy OS */
- VB2_DEV_DEFAULT_BOOT_LEGACY = 2,
-
-};
-
/* Firmware result codes for VB2_NV_FW_RESULT and VB2_NV_FW_PREV_RESULT */
enum vb2_fw_result {
/* Unknown */
diff --git a/firmware/lib/vboot_ui_legacy_clamshell.c b/firmware/lib/vboot_ui_legacy_clamshell.c
index 8054227..002ee18 100644
--- a/firmware/lib/vboot_ui_legacy_clamshell.c
+++ b/firmware/lib/vboot_ui_legacy_clamshell.c
@@ -210,9 +210,9 @@
/* Check if the default is to boot using disk, usb, or legacy */
uint32_t default_boot = vb2_nv_get(ctx, VB2_NV_DEV_DEFAULT_BOOT);
- if (default_boot == VB2_DEV_DEFAULT_BOOT_USB)
+ if (default_boot == VB2_DEV_DEFAULT_BOOT_TARGET_USB)
use_usb = 1;
- if (default_boot == VB2_DEV_DEFAULT_BOOT_LEGACY)
+ if (default_boot == VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY)
use_legacy = 1;
/* Handle GBB flag override */
diff --git a/firmware/lib/vboot_ui_legacy_menu.c b/firmware/lib/vboot_ui_legacy_menu.c
index e9e9b4e..5faa464 100644
--- a/firmware/lib/vboot_ui_legacy_menu.c
+++ b/firmware/lib/vboot_ui_legacy_menu.c
@@ -241,13 +241,13 @@
int menu_idx;
switch(default_boot) {
default:
- case VB2_DEV_DEFAULT_BOOT_DISK:
+ case VB2_DEV_DEFAULT_BOOT_TARGET_DISK:
menu_idx = VB_DEV_DISK;
break;
- case VB2_DEV_DEFAULT_BOOT_USB:
+ case VB2_DEV_DEFAULT_BOOT_TARGET_USB:
menu_idx = VB_DEV_USB;
break;
- case VB2_DEV_DEFAULT_BOOT_LEGACY:
+ case VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY:
menu_idx = VB_DEV_LEGACY;
break;
}
@@ -769,7 +769,7 @@
/* Check if the default is to boot using disk, usb, or legacy */
default_boot = vb2_nv_get(ctx, VB2_NV_DEV_DEFAULT_BOOT);
if (gbb->flags & VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY)
- default_boot = VB2_DEV_DEFAULT_BOOT_LEGACY;
+ default_boot = VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY;
/* Check if developer mode is disabled by FWMP */
disable_dev_boot = 0;
@@ -842,10 +842,10 @@
/* If dev mode was disabled, loop forever (never timeout) */
} while (disable_dev_boot ? 1 : vb2_audio_looping());
- if (default_boot == VB2_DEV_DEFAULT_BOOT_LEGACY)
+ if (default_boot == VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY)
boot_legacy_action(ctx); /* Doesn't return on success. */
- if (default_boot == VB2_DEV_DEFAULT_BOOT_USB)
+ if (default_boot == VB2_DEV_DEFAULT_BOOT_TARGET_USB)
if (VB2_SUCCESS == boot_usb_action(ctx))
return VB2_SUCCESS;
diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c
index aabe0ee..eaf7869 100644
--- a/tests/vb2_misc_tests.c
+++ b/tests/vb2_misc_tests.c
@@ -854,57 +854,74 @@
{
/* No default boot */
reset_common_data();
- TEST_EQ(vb2_get_dev_boot_target(ctx), VB2_DEV_DEFAULT_BOOT_DISK,
+ TEST_EQ(vb2api_get_dev_default_boot_target(ctx),
+ VB2_DEV_DEFAULT_BOOT_TARGET_DISK,
"no default boot, boot disk");
/* Set boot legacy by GBB */
reset_common_data();
gbb.flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY;
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB);
- TEST_EQ(vb2_get_dev_boot_target(ctx), VB2_DEV_DEFAULT_BOOT_LEGACY,
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
+ TEST_EQ(vb2api_get_dev_default_boot_target(ctx),
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY,
"GBB set default boot legacy");
/* Boot from disk */
reset_common_data();
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_DISK);
- TEST_EQ(vb2_get_dev_boot_target(ctx), VB2_DEV_DEFAULT_BOOT_DISK,
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_DISK);
+ TEST_EQ(vb2api_get_dev_default_boot_target(ctx),
+ VB2_DEV_DEFAULT_BOOT_TARGET_DISK,
"set default boot disk");
/* Boot from usb */
reset_common_data();
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1);
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB);
- TEST_EQ(vb2_get_dev_boot_target(ctx),
- VB2_DEV_DEFAULT_BOOT_USB, "set default boot usb");
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
+ TEST_EQ(vb2api_get_dev_default_boot_target(ctx),
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB,
+ "set default boot usb");
/* Boot from usb not allowed */
reset_common_data();
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB);
- TEST_EQ(vb2_get_dev_boot_target(ctx),
- VB2_DEV_DEFAULT_BOOT_DISK, "default boot usb not allowed");
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
+ TEST_EQ(vb2api_get_dev_default_boot_target(ctx),
+ VB2_DEV_DEFAULT_BOOT_TARGET_DISK,
+ "default boot usb not allowed");
reset_common_data();
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1);
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB);
- TEST_EQ(vb2_get_dev_boot_target(ctx),
- VB2_DEV_DEFAULT_BOOT_DISK, "default boot usb not allowed");
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
+ TEST_EQ(vb2api_get_dev_default_boot_target(ctx),
+ VB2_DEV_DEFAULT_BOOT_TARGET_DISK,
+ "default boot usb not allowed");
/* Boot legacy */
reset_common_data();
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1);
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY);
- TEST_EQ(vb2_get_dev_boot_target(ctx),
- VB2_DEV_DEFAULT_BOOT_LEGACY, "set default boot legacy");
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY);
+ TEST_EQ(vb2api_get_dev_default_boot_target(ctx),
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY,
+ "set default boot legacy");
/* Boot legacy not allowed */
reset_common_data();
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY);
- TEST_EQ(vb2_get_dev_boot_target(ctx),
- VB2_DEV_DEFAULT_BOOT_DISK, "default boot legacy not allowed");
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY);
+ TEST_EQ(vb2api_get_dev_default_boot_target(ctx),
+ VB2_DEV_DEFAULT_BOOT_TARGET_DISK,
+ "default boot legacy not allowed");
reset_common_data();
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1);
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY);
- TEST_EQ(vb2_get_dev_boot_target(ctx),
- VB2_DEV_DEFAULT_BOOT_DISK, "default boot legacy not allowed");
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY);
+ TEST_EQ(vb2api_get_dev_default_boot_target(ctx),
+ VB2_DEV_DEFAULT_BOOT_TARGET_DISK,
+ "default boot legacy not allowed");
}
static void dev_boot_allowed_tests(void)
diff --git a/tests/vb2_nvstorage_tests.c b/tests/vb2_nvstorage_tests.c
index b5941f8..a39109c 100644
--- a/tests/vb2_nvstorage_tests.c
+++ b/tests/vb2_nvstorage_tests.c
@@ -260,9 +260,10 @@
VB2_FW_RESULT_UNKNOWN, "Fw prev result out of range");
vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
- VB2_DEV_DEFAULT_BOOT_DISK + 100);
+ VB2_DEV_DEFAULT_BOOT_TARGET_DISK + 100);
TEST_EQ(vb2_nv_get(ctx, VB2_NV_DEV_DEFAULT_BOOT),
- VB2_DEV_DEFAULT_BOOT_DISK, "default to booting from disk");
+ VB2_DEV_DEFAULT_BOOT_TARGET_DISK,
+ "default to booting from disk");
}
int main(int argc, char* argv[])
diff --git a/tests/vb2_ui_tests.c b/tests/vb2_ui_tests.c
index d4b8faa..57c5db5 100644
--- a/tests/vb2_ui_tests.c
+++ b/tests/vb2_ui_tests.c
@@ -56,7 +56,7 @@
static const uint32_t mock_time_start = 31ULL * VB2_MSEC_PER_SEC;
static int mock_vbexbeep_called;
-static enum vb2_dev_default_boot mock_default_boot;
+static enum vb2_dev_default_boot_target mock_default_boot;
static int mock_dev_boot_allowed;
static int mock_dev_boot_legacy_allowed;
static int mock_dev_boot_usb_allowed;
@@ -250,7 +250,7 @@
mock_vbexbeep_called = 0;
/* For dev_boot* in 2misc.h */
- mock_default_boot = VB2_DEV_DEFAULT_BOOT_DISK;
+ mock_default_boot = VB2_DEV_DEFAULT_BOOT_TARGET_DISK;
mock_dev_boot_allowed = 1;
mock_dev_boot_legacy_allowed = 0;
mock_dev_boot_usb_allowed = 0;
@@ -376,7 +376,8 @@
mock_vbexbeep_called++;
}
-enum vb2_dev_default_boot vb2_get_dev_boot_target(struct vb2_context *c)
+enum vb2_dev_default_boot_target vb2api_get_dev_default_boot_target(
+ struct vb2_context *c)
{
return mock_default_boot;
}
@@ -454,7 +455,7 @@
/* Proceed to USB after timeout */
reset_common_data(FOR_DEVELOPER);
add_mock_vbtlk(VB2_SUCCESS, VB_DISK_FLAG_REMOVABLE);
- mock_default_boot = VB2_DEV_DEFAULT_BOOT_USB;
+ mock_default_boot = VB2_DEV_DEFAULT_BOOT_TARGET_USB;
mock_dev_boot_usb_allowed = 1;
TEST_EQ(vb2_developer_menu(ctx), VB2_SUCCESS,
"proceed to USB after timeout");
@@ -465,7 +466,7 @@
/* Default boot USB not allowed, don't boot */
reset_common_data(FOR_DEVELOPER);
- mock_default_boot = VB2_DEV_DEFAULT_BOOT_USB;
+ mock_default_boot = VB2_DEV_DEFAULT_BOOT_TARGET_USB;
TEST_EQ(vb2_developer_menu(ctx), VB2_REQUEST_SHUTDOWN,
"default USB not allowed, don't boot");
TEST_TRUE(mock_get_timer_last - mock_time_start >=
diff --git a/tests/vboot_ui_legacy_clamshell_tests.c b/tests/vboot_ui_legacy_clamshell_tests.c
index b7bc6d5..6f9b084 100644
--- a/tests/vboot_ui_legacy_clamshell_tests.c
+++ b/tests/vboot_ui_legacy_clamshell_tests.c
@@ -521,7 +521,7 @@
legacy are set */
ResetMocks();
vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
- VB2_DEV_DEFAULT_BOOT_LEGACY);
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY);
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1);
vbtlk_expect_fixed = 1;
TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Timeout");
@@ -531,7 +531,7 @@
/* Proceed to legacy boot mode only if enabled */
ResetMocks();
vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
- VB2_DEV_DEFAULT_BOOT_LEGACY);
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY);
vbtlk_expect_fixed = 1;
TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Timeout");
TEST_EQ(vbexlegacy_called, 0, " not legacy");
@@ -540,7 +540,7 @@
USB are set */
ResetMocks();
vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
- VB2_DEV_DEFAULT_BOOT_USB);
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1);
vbtlk_retval = VB2_SUCCESS;
vbtlk_expect_removable = 1;
@@ -549,7 +549,7 @@
/* Proceed to USB boot mode only if enabled */
ResetMocks();
vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
- VB2_DEV_DEFAULT_BOOT_USB);
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
vbtlk_expect_fixed = 1;
TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Timeout");
@@ -557,7 +557,7 @@
ResetMocks();
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1);
vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
- VB2_DEV_DEFAULT_BOOT_USB);
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
vbtlk_expect_fixed = 1;
vbtlk_expect_removable = 1;
TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK,
diff --git a/tests/vboot_ui_legacy_menu_tests.c b/tests/vboot_ui_legacy_menu_tests.c
index 324c6b4..56f8f3e 100644
--- a/tests/vboot_ui_legacy_menu_tests.c
+++ b/tests/vboot_ui_legacy_menu_tests.c
@@ -273,7 +273,8 @@
/* Proceed to legacy after timeout if boot legacy and default boot
* legacy are set */
ResetMocksForDeveloper();
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY);
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY);
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1);
TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed,
"default legacy NV");
@@ -292,7 +293,8 @@
/* Proceed to legacy boot mode only if enabled */
ResetMocksForDeveloper();
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY);
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY);
TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed,
"default legacy not enabled");
TEST_EQ(vbexlegacy_called, 0, " not legacy");
@@ -312,7 +314,8 @@
/* Proceed to usb after timeout if boot usb and default boot
* usb are set */
ResetMocksForDeveloper();
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB);
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1);
vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
TEST_EQ(VbBootDeveloperLegacyMenu(ctx), 0, "Ctrl+U USB");
@@ -325,7 +328,8 @@
/* Proceed to usb boot mode only if enabled */
ResetMocksForDeveloper();
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB);
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed,
"default USB not enabled");
TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery");
@@ -344,7 +348,8 @@
/* If no USB tries fixed disk */
ResetMocksForDeveloper();
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1);
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB);
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed,
"default USB with no disk");
TEST_EQ(vbexlegacy_called, 0, " not legacy");
@@ -792,7 +797,8 @@
/* If default USB, the option is preselected */
ResetMocksForDeveloper();
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB);
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_USB);
i = 0;
mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Enable OS Verif
mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Show Debug Info
@@ -903,7 +909,8 @@
mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // Select first option
mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // and again
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1);
- vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY);
+ vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT,
+ VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY);
TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed,
"Menu selected legacy boot");
TEST_EQ(debug_info_displayed, 0, " no debug info");
