Removal of SecureBoot options from ConfApp

SetupDataPkg/ConfApp/ConfApp.c

@@ -7,7 +7,6 @@
 **/
 
 #include <Uefi.h>
-#include <UefiSecureBoot.h>
 #include <Guid/MuVarPolicyFoundationDxe.h>
 
 #include <Library/DebugLib.h>
@@ -19,13 +18,12 @@
 #include <Library/ResetSystemLib.h>
 #include <Library/UefiLib.h>
 #include <Library/UefiBootManagerLib.h>
-#include <Library/SecureBootKeyStoreLib.h>
 #include <Library/PerformanceLib.h>
 #include <Library/ConfigSystemModeLib.h>
 
 #include "ConfApp.h"
 
-#define MAIN_STATE_OPTIONS  6
+#define MAIN_STATE_OPTIONS  5
 
 CONST ConfAppKeyOptions  MainStateOptions[MAIN_STATE_OPTIONS] = {
   {
@@ -40,27 +38,18 @@ CONST ConfAppKeyOptions  MainStateOptions[MAIN_STATE_OPTIONS] = {
   {
     .KeyName             = L"2",
     .KeyNameTextAttr     = EFI_TEXT_ATTR (EFI_YELLOW, EFI_BLACK),
-    .Description         = L"Configure Secure Boot.",
-    .DescriptionTextAttr = EFI_TEXT_ATTR (EFI_WHITE, EFI_BLACK),
-    .UnicodeChar         = '2',
-    .ScanCode            = SCAN_NULL,
-    .EndState            = SecureBoot
-  },
-  {
-    .KeyName             = L"3",
-    .KeyNameTextAttr     = EFI_TEXT_ATTR (EFI_YELLOW, EFI_BLACK),
     .Description         = L"Boot Options.",
     .DescriptionTextAttr = EFI_TEXT_ATTR (EFI_WHITE, EFI_BLACK),
-    .UnicodeChar         = '3',
+    .UnicodeChar         = '2',
     .ScanCode            = SCAN_NULL,
     .EndState            = BootOption
   },
   {
-    .KeyName             = L"4",
+    .KeyName             = L"3",
     .KeyNameTextAttr     = EFI_TEXT_ATTR (EFI_YELLOW, EFI_BLACK),
     .Description         = L"Update Setup Configuration.\n",
     .DescriptionTextAttr = EFI_TEXT_ATTR (EFI_WHITE, EFI_BLACK),
-    .UnicodeChar         = '4',
+    .UnicodeChar         = '3',
     .ScanCode            = SCAN_NULL,
     .EndState            = SetupConf
   },
@@ -86,8 +75,6 @@ CONST ConfAppKeyOptions  MainStateOptions[MAIN_STATE_OPTIONS] = {
 
 ConfState_t                        mConfState       = MainInit;
 EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *mSimpleTextInEx = NULL;
-SECURE_BOOT_PAYLOAD_INFO           *mSecureBootKeys;
-UINT8                              mSecureBootKeysCount;
 
 /**
   Quick helper function to see if ReadyToBoot has already been signalled.
@@ -363,12 +350,6 @@ ConfAppEntry (
     DEBUG ((DEBUG_ERROR, "Unable to reset SimpleTextIn on ConIn. Code = %r.\n", Status));
   }
 
-  Status = GetPlatformKeyStore (&mSecureBootKeys, &mSecureBootKeysCount);
-  if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "Failed to get platform secure boot keys. Code = %r.\n", Status));
-    goto Exit;
-  }
-
   // Force-connect all controllers.
   //
   EfiBootManagerConnectAll ();
@@ -413,9 +394,6 @@ ConfAppEntry (
       case SystemInfo:
         Status = SysInfoMgr ();
         break;
-      case SecureBoot:
-        Status = SecureBootMgr ();
-        break;
       case BootOption:
         Status = BootOptionMgr ();
         break;

SetupDataPkg/ConfApp/ConfApp.inf

@@ -19,7 +19,6 @@
   BootOptions.c
   ConfApp.c
   ConfApp.h
-  SecureBoot.c
   SetupConf.c
   SystemInfo.c
   SvdUsb/SvdUsb.c
@@ -44,8 +43,6 @@
   UefiLib
   ResetSystemLib
   UefiBootManagerLib
-  MuSecureBootKeySelectorLib
-  SecureBootKeyStoreLib
   JsonLiteParserLib
   FileHandleLib
   XmlTreeLib