aboot: mdtp: disable dual UI during mdtp locking.
This change fixes the duplication of both mdtp lock screen UI and the LK UI
in case the device is locked by mdtp.
Change-Id: Ifd5faaa5b3ecaed1ef08e821713cde9bb715311c
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index cbe9dff..e12754b 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -1178,20 +1178,6 @@
aboot_save_boot_hash_mmc((uint32_t) image_addr, imagesize_actual);
#endif /* TZ_SAVE_KERNEL_HASH */
-#if VERIFIED_BOOT
- if(boot_verify_get_state() == ORANGE)
- {
-#if FBCON_DISPLAY_MSG
- display_bootverify_menu(DISPLAY_MENU_ORANGE);
- wait_for_users_action();
-#else
- dprintf(CRITICAL,
- "Your device has been unlocked and can't be trusted.\nWait for 5 seconds before proceeding\n");
- mdelay(5000);
-#endif
- }
-#endif
-
#ifdef MDTP_SUPPORT
{
/* Verify MDTP lock.
@@ -1211,6 +1197,20 @@
}
#if VERIFIED_BOOT
+ if(boot_verify_get_state() == ORANGE)
+ {
+#if FBCON_DISPLAY_MSG
+ display_bootverify_menu(DISPLAY_MENU_ORANGE);
+ wait_for_users_action();
+#else
+ dprintf(CRITICAL,
+ "Your device has been unlocked and can't be trusted.\nWait for 5 seconds before proceeding\n");
+ mdelay(5000);
+#endif
+ }
+#endif
+
+#if VERIFIED_BOOT
#if !VBOOT_MOTA
// send root of trust
if(!send_rot_command((uint32_t)device.is_unlocked))