1 files changed, 1 insertions, 24 deletions
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
index 218e0f442c..88cc2a1c4e 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
+++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
@@ -118,38 +118,15 @@ form formid = FORMID_VALUE_MAIN_MENU,
 
     subtitle text = STRING_TOKEN(STR_NULL);
 
-    grayoutif TRUE;
-      text
-          help    = STRING_TOKEN(STR_BLOCKSID_STATUS_HELP),
-          text    = STRING_TOKEN(STR_BLOCKSID_STATUS);
-      text
-          help    = STRING_TOKEN(STR_BLOCKSID_STATUS_HELP),
-          text    = STRING_TOKEN(STR_BLOCKSID_STATUS1);
-      text
-          help    = STRING_TOKEN(STR_BLOCKSID_STATUS_HELP),
-          text    = STRING_TOKEN(STR_BLOCKSID_STATUS2);
-      text
-          help    = STRING_TOKEN(STR_BLOCKSID_STATUS_HELP),
-          text    = STRING_TOKEN(STR_BLOCKSID_STATUS3);
-      subtitle text = STRING_TOKEN(STR_NULL);
-    endif;
-
     oneof varid   = OpalHiiConfig.EnableBlockSid,
       questionid  = 0x8017, // 32791,
       prompt      = STRING_TOKEN(STR_DISK_INFO_ENABLE_BLOCKSID),
       help        = STRING_TOKEN(STR_DISK_INFO_GOTO_ENABLE_BLOCKSID_HELP),
       flags       = INTERACTIVE,
-      option text = STRING_TOKEN(STR_NONE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
+      option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
       option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = RESET_REQUIRED;
-      option text = STRING_TOKEN(STR_DISABLED), value = 2, flags = RESET_REQUIRED;
-      option text = STRING_TOKEN(STR_DISK_INFO_ENABLE_BLOCKSID_TRUE), value = 3, flags = RESET_REQUIRED;
-      option text = STRING_TOKEN(STR_DISK_INFO_ENABLE_BLOCKSID_FALSE), value = 4, flags = RESET_REQUIRED;
-      option text = STRING_TOKEN(STR_DISK_INFO_DISABLE_BLOCKSID_TRUE), value = 5, flags = RESET_REQUIRED;
-      option text = STRING_TOKEN(STR_DISK_INFO_DISABLE_BLOCKSID_FALSE), value = 6, flags = RESET_REQUIRED;
     endoneof;
 
-
-
 endform;  // MAIN MENU FORM
 
 //