diff options
Diffstat (limited to 'src/vboot')
| -rw-r--r-- | src/vboot/bootmode.c | 3 | ||||
| -rw-r--r-- | src/vboot/vboot_handoff.c | 2 | ||||
| -rw-r--r-- | src/vboot/vboot_logic.c | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/vboot/bootmode.c b/src/vboot/bootmode.c index 46b78e1dad..21922d4ce7 100644 --- a/src/vboot/bootmode.c +++ b/src/vboot/bootmode.c @@ -162,9 +162,6 @@ int vboot_developer_mode_enabled(void) if (!IS_ENABLED(CONFIG_VBOOT)) return 0; - if (get_developer_mode_switch()) - return 1; - if (cbmem_possibly_online() && vboot_handoff_check_developer_flag()) return 1; diff --git a/src/vboot/vboot_handoff.c b/src/vboot/vboot_handoff.c index 2bd5c093f0..85be928ae3 100644 --- a/src/vboot/vboot_handoff.c +++ b/src/vboot/vboot_handoff.c @@ -83,7 +83,7 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff, vb_sd->flags |= VBSD_LF_DEV_SWITCH_ON; } /* TODO: Set these in depthcharge */ - if (IS_ENABLED(CONFIG_VIRTUAL_DEV_SWITCH)) + if (!IS_ENABLED(CONFIG_PHYSICAL_DEV_SWITCH)) vb_sd->flags |= VBSD_HONOR_VIRT_DEV_SWITCH; if (IS_ENABLED(CONFIG_EC_SOFTWARE_SYNC)) vb_sd->flags |= VBSD_EC_SOFTWARE_SYNC; diff --git a/src/vboot/vboot_logic.c b/src/vboot/vboot_logic.c index af7e947911..fbbe3e8be7 100644 --- a/src/vboot/vboot_logic.c +++ b/src/vboot/vboot_logic.c @@ -329,7 +329,7 @@ void verstage_main(void) antirollback_read_space_firmware(&ctx); timestamp_add_now(TS_END_TPMINIT); - if (!IS_ENABLED(CONFIG_VIRTUAL_DEV_SWITCH) && + if (IS_ENABLED(CONFIG_PHYSICAL_DEV_SWITCH) && get_developer_mode_switch()) ctx.flags |= VB2_CONTEXT_FORCE_DEVELOPER_MODE; |