From 0cbf022c03e4c57a00c00c38d33a1aa02ccb6ef9 Mon Sep 17 00:00:00 2001 From: Jakub Czapiga Date: Wed, 17 Nov 2021 13:07:01 +0000 Subject: firmware/2lib: Remove BOOT_EXTERNAL_ON_DEV BOOT_EXTERNAL_ON_DEV was not used anymore, so it was removed from the Makefile and source code. BUG=b:206031372 BRANCH=none TEST=make runtests TEST=emerge-guybrush depthcharge Signed-off-by: Jakub Czapiga Change-Id: I463a77f2de8f59954704495708025321ca1571d8 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3289345 Reviewed-by: Julius Werner Reviewed-by: Yu-Ping Wu Tested-by: Jakub Czapiga Commit-Queue: Jakub Czapiga --- Makefile | 7 ------- firmware/2lib/2misc.c | 3 --- tests/vb2_misc_tests.c | 2 -- 3 files changed, 12 deletions(-) diff --git a/Makefile b/Makefile index 0435936c..96f1dd0c 100644 --- a/Makefile +++ b/Makefile @@ -195,13 +195,6 @@ ifneq (${GPT_SPI_NOR},) CFLAGS += -DGPT_SPI_NOR endif -# 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 += -DBOOT_EXTERNAL_ON_DEV=0 -endif - # Enable EC early firmware selection. ifneq ($(filter-out 0,${EC_EFS}),) CFLAGS += -DEC_EFS=1 diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c index efa33a8a..265db317 100644 --- a/firmware/2lib/2misc.c +++ b/firmware/2lib/2misc.c @@ -391,9 +391,6 @@ vb2_error_t vb2api_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 (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"); return VB2_SUCCESS; diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index c4b3ce44..d7afeb68 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -654,8 +654,6 @@ 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), BOOT_EXTERNAL_ON_DEV, - " NV_DEV_BOOT_EXTERNAL set according to compile-time flag"); /* secdata_firmware not initialized, aborts */ reset_common_data(); -- cgit v1.2.1