SecurityPkg OpalPasswordDxe: Change BlockSid position.

[mirror_edk2.git] / SecurityPkg / Tcg / Opal / OpalPasswordDxe / OpalPasswordForm.vfr

diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
index 9c35ec76ab50e661ed5dd82a6885c2d6ee9f96e1..88cc2a1c4e989826ed0a1cabd35618cf7393d144 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
+++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
@@ -116,6 +116,17 @@ form formid = FORMID_VALUE_MAIN_MENU,
             text    = STRING_TOKEN(STR_MAIN_NO_DISKS_PRESENT_LBL);\r
     endif;\r
 \r
+    subtitle text = STRING_TOKEN(STR_NULL);\r
+\r
+    oneof varid   = OpalHiiConfig.EnableBlockSid,\r
+      questionid  = 0x8017, // 32791,\r
+      prompt      = STRING_TOKEN(STR_DISK_INFO_ENABLE_BLOCKSID),\r
+      help        = STRING_TOKEN(STR_DISK_INFO_GOTO_ENABLE_BLOCKSID_HELP),\r
+      flags       = INTERACTIVE,\r
+      option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
+      option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = RESET_REQUIRED;\r
+    endoneof;\r
+\r
 endform;  // MAIN MENU FORM\r
 \r
 //\r
@@ -219,17 +230,6 @@ form formid = FORMID_VALUE_DISK_INFO_FORM_MAIN,
             key     = 0x800A; //32778;\r
     endif;\r
 \r
-    suppressif ( questionref(SelectedDiskAvailableActions) & HII_ACTION_ENABLE_BLOCKSID ) == 0;\r
-      oneof varid   = OpalHiiConfig.EnableBlockSid,\r
-        questionid  = 0x8017, // 32791,\r
-        prompt      = STRING_TOKEN(STR_DISK_INFO_ENABLE_BLOCKSID),\r
-        help        = STRING_TOKEN(STR_DISK_INFO_GOTO_ENABLE_BLOCKSID_HELP),\r
-        flags   = INTERACTIVE,\r
-        option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
-        option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = RESET_REQUIRED;\r
-      endoneof;\r
-    endif;\r
-\r
 endform;  // DISK INFO FORM\r
 \r
 //\r