diff options
| author | Jakub Czapiga <jacz@semihalf.com> | 2021-11-17 13:07:01 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-25 10:59:12 +0000 |
| commit | 0cbf022c03e4c57a00c00c38d33a1aa02ccb6ef9 (patch) | |
| tree | 2b984f0af0a3966248521ec6e36068fc8303ed21 | |
| parent | 0cd8ad2c330ee40beb54c2ce3def4ba6ea84fa3c (diff) | |
| download | vboot-0cbf022c03e4c57a00c00c38d33a1aa02ccb6ef9.tar.gz | |
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 <jacz@semihalf.com>
Change-Id: I463a77f2de8f59954704495708025321ca1571d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3289345
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Tested-by: Jakub Czapiga <czapiga@google.com>
Commit-Queue: Jakub Czapiga <czapiga@google.com>
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | firmware/2lib/2misc.c | 3 | ||||
| -rw-r--r-- | tests/vb2_misc_tests.c | 2 |
3 files changed, 0 insertions, 12 deletions
@@ -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(); |