Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31796
Change subject: vboot: rename two constants ......................................................................
vboot: rename two constants
VB2_DISABLE_DEVELOPER_MODE -> VB2_CONTEXT_DISABLE_DEVELOPER_MODE VB2_SD_DEV_MODE_ENABLED -> VB2_SD_FLAG_DEV_MODE_ENABLED
BUG=b:124141368 TEST=Build locally TEST=util/lint/checkpatch.pl -g origin/master..HEAD TEST=util/abuild/abuild -B -e -y -c 50 -p none -x TEST=make clean && make test-abuild BRANCH=none
Change-Id: I485fcaa7d4b43602cf5f56390c71c7b6fcded4c3 Signed-off-by: Joel Kitching kitching@google.com --- M src/security/vboot/vboot_handoff.c M src/security/vboot/vboot_logic.c 2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/31796/1
diff --git a/src/security/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c index 684b495..884879e 100644 --- a/src/security/vboot/vboot_handoff.c +++ b/src/security/vboot/vboot_handoff.c @@ -71,7 +71,7 @@ *oflags |= VB_INIT_OUT_ENABLE_DISPLAY; *oflags |= VB_INIT_OUT_ENABLE_USB_STORAGE; } - if (vb2_sd->flags & VB2_SD_DEV_MODE_ENABLED) { + if (vb2_sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED) { *oflags |= VB_INIT_OUT_ENABLE_DEVELOPER; *oflags |= VB_INIT_OUT_CLEAR_RAM; *oflags |= VB_INIT_OUT_ENABLE_DISPLAY; diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c index 8c3ba80..7ab9824 100644 --- a/src/security/vboot/vboot_logic.c +++ b/src/security/vboot/vboot_logic.c @@ -331,7 +331,7 @@ if (get_recovery_mode_switch()) { ctx.flags |= VB2_CONTEXT_FORCE_RECOVERY_MODE; if (IS_ENABLED(CONFIG_VBOOT_DISABLE_DEV_ON_RECOVERY)) - ctx.flags |= VB2_DISABLE_DEVELOPER_MODE; + ctx.flags |= VB2_CONTEXT_DISABLE_DEVELOPER_MODE; }
if (IS_ENABLED(CONFIG_VBOOT_WIPEOUT_SUPPORTED) &&