diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-06-12 17:18:58 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-17 06:54:48 +0000 |
| commit | ded3370fb298adc5d640007057add1a58c40a842 (patch) | |
| tree | 997112a2b0d45182cbe7b7372fe2540bedfc27d1 | |
| parent | 720aef7804159721a6015a309335a32ce9d702a3 (diff) | |
| download | vboot-factory-endeavour-13295.B.tar.gz | |
vboot: rename USB_BOOT_ON_DEV to BOOT_EXTERNAL_ON_DEVfactory-endeavour-13295.B
BRANCH=none
BUG=none
TEST=make runtests
TEST=emerge-puff depthcharge
Cq-Depend: chromium:2241263
Change-Id: I4ebfadda3a41c09662f241f04c251784716784e3
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2241418
Reviewed-by: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | firmware/2lib/2misc.c | 2 | ||||
| -rw-r--r-- | tests/vb2_misc_tests.c | 2 | ||||
| -rw-r--r-- | tests/vboot_ui_legacy_clamshell_tests.c | 2 |
4 files changed, 7 insertions, 7 deletions
@@ -166,11 +166,11 @@ ifneq (${TPM2_MODE},) CFLAGS += -DTPM2_MODE endif -# Enable USB boot when switching to dev mode -ifneq ($(filter-out 0,${USB_BOOT_ON_DEV}),) -CFLAGS += -DUSB_BOOT_ON_DEV=1 +# Enable boot from external disk when switching to dev mode +ifneq ($(filter-out 0,${BOOT_EXTERNAL_ON_DEV}),) +CFLAGS += -DBOOT_EXTERNAL_ON_DEV=1 else -CFLAGS += -DUSB_BOOT_ON_DEV=0 +CFLAGS += -DBOOT_EXTERNAL_ON_DEV=0 endif # Enable EC early firmware selection. diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c index 71631617..eaab89d9 100644 --- a/firmware/2lib/2misc.c +++ b/firmware/2lib/2misc.c @@ -386,7 +386,7 @@ void vb2_enable_developer_mode(struct vb2_context *ctx) flags |= VB2_SECDATA_FIRMWARE_FLAG_DEV_MODE; vb2_secdata_firmware_set(ctx, VB2_SECDATA_FIRMWARE_FLAGS, flags); - if (USB_BOOT_ON_DEV) + if (BOOT_EXTERNAL_ON_DEV) vb2_nv_set(ctx, VB2_NV_DEV_BOOT_EXTERNAL, 1); VB2_DEBUG("Mode change will take effect on next reboot\n"); diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index c076b1a3..b82076f4 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -644,7 +644,7 @@ static void enable_dev_tests(void) TEST_NEQ(vb2_secdata_firmware_get(ctx, VB2_SECDATA_FIRMWARE_FLAGS) & VB2_SECDATA_FIRMWARE_FLAG_DEV_MODE, 0, "dev mode flag set"); - TEST_EQ(vb2_nv_get(ctx, VB2_NV_DEV_BOOT_EXTERNAL), USB_BOOT_ON_DEV, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DEV_BOOT_EXTERNAL), BOOT_EXTERNAL_ON_DEV, "NV_DEV_BOOT_EXTERNAL set according to compile-time flag"); /* secdata_firmware not initialized, aborts */ diff --git a/tests/vboot_ui_legacy_clamshell_tests.c b/tests/vboot_ui_legacy_clamshell_tests.c index 3b9727d8..d33cb71e 100644 --- a/tests/vboot_ui_legacy_clamshell_tests.c +++ b/tests/vboot_ui_legacy_clamshell_tests.c @@ -1149,7 +1149,7 @@ static void VbBootRecTestGpio(uint32_t first, uint32_t second, uint32_t third, VB2_REQUEST_REBOOT_EC_TO_RO, msg); TEST_EQ(virtdev_set, 1, " virtual dev mode on"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DEV_BOOT_EXTERNAL), - !!USB_BOOT_ON_DEV, + !!BOOT_EXTERNAL_ON_DEV, " NV_DEV_BOOT_EXTERNAL enabled"); } else { TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), |