Remove the useless code to fix build failure caused by error depend on IntelFramework...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18120 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c b/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c
index a5bd796194d4819b3c5d4f0ead91b3c3b20ced19..1ad93bf6cf502b5709f67e32bbf5e3321fe42ab9 100644 (file)
--- a/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c
+++ b/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c
@@ -238,13 +238,8 @@ BOpt_FindFileSystem (
   UINT16                    *TempStr;\r
   UINTN                     OptionNumber;\r
   VOID                      *Buffer;\r
-  EFI_LEGACY_BIOS_PROTOCOL  *LegacyBios;\r
-  UINT16                    DeviceType;\r
-  BBS_BBS_DEVICE_PATH       BbsDevicePathNode;\r
-  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
   BOOLEAN                   RemovableMedia;\r
 \r
-\r
   NoSimpleFsHandles = 0;\r
   NoLoadFileHandles = 0;\r
   OptionNumber      = 0;\r
@@ -443,59 +438,6 @@ BOpt_FindFileSystem (
     FreePool (LoadFileHandle);\r
   }\r
 \r
-  //\r
-  // Add Legacy Boot Option Support Here\r
-  //\r
-  Status = gBS->LocateProtocol (\r
-                  &gEfiLegacyBiosProtocolGuid,\r
-                  NULL,\r
-                  (VOID **) &LegacyBios\r
-                  );\r
-  if (!EFI_ERROR (Status)) {\r
-\r
-    for (Index = BBS_TYPE_FLOPPY; Index <= BBS_TYPE_EMBEDDED_NETWORK; Index++) {\r
-      MenuEntry = BOpt_CreateMenuEntry (BM_FILE_CONTEXT_SELECT);\r
-      if (NULL == MenuEntry) {\r
-        return EFI_OUT_OF_RESOURCES;\r
-      }\r
-\r
-      FileContext                       = (BM_FILE_CONTEXT *) MenuEntry->VariableContext;\r
-\r
-      FileContext->IsRemovableMedia     = FALSE;\r
-      FileContext->IsLoadFile           = TRUE;\r
-      FileContext->IsBootLegacy         = TRUE;\r
-      DeviceType                        = (UINT16) Index;\r
-      BbsDevicePathNode.Header.Type     = BBS_DEVICE_PATH;\r
-      BbsDevicePathNode.Header.SubType  = BBS_BBS_DP;\r
-      SetDevicePathNodeLength (\r
-        &BbsDevicePathNode.Header,\r
-        sizeof (BBS_BBS_DEVICE_PATH)\r
-        );\r
-      BbsDevicePathNode.DeviceType  = DeviceType;\r
-      BbsDevicePathNode.StatusFlag  = 0;\r
-      BbsDevicePathNode.String[0]   = 0;\r
-      DevicePath = AppendDevicePathNode (\r
-                    EndDevicePath,\r
-                    (EFI_DEVICE_PATH_PROTOCOL *) &BbsDevicePathNode\r
-                    );\r
-\r
-      FileContext->DevicePath   = DevicePath;\r
-      MenuEntry->HelpString     = UiDevicePathToStr (FileContext->DevicePath);\r
-\r
-      TempStr                   = MenuEntry->HelpString;\r
-      MenuEntry->DisplayString  = AllocateZeroPool (MAX_CHAR);\r
-      ASSERT (MenuEntry->DisplayString != NULL);\r
-      UnicodeSPrint (\r
-        MenuEntry->DisplayString,\r
-        MAX_CHAR,\r
-        L"Boot Legacy [%s]",\r
-        TempStr\r
-        );\r
-      MenuEntry->OptionNumber = OptionNumber;\r
-      OptionNumber++;\r
-      InsertTailList (&FsOptionMenu.Head, &MenuEntry->Link);\r
-    }\r
-  }\r
   //\r
   // Remember how many file system options are here\r
   //\r

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c b/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
index ea96d132e562e4a0807af8f3a137e22a06027036..938912bfbea2dd12e0ac2f5854d95f01272ca996 100644 (file)
--- a/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
+++ b/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
@@ -232,35 +232,6 @@ UpdateConCOMPage (
   UpdatePageEnd (CallbackData);\r
 }\r
 \r
-/**\r
-\r
-  IsShellNodeDevicePath checks for the Shell device path. \r
-  If it's the shell device path then return TRUE otherwise \r
-  return FALSE.\r
-\r
-  @param DevicePath    The DevicePath to check\r
-\r
-  @retval  TRUE        DevicePath is Shell\r
-  @retval  FALSE       DevicePath is not Shell\r
-\r
-**/\r
-BOOLEAN\r
-IsShellNodeDevicePath(\r
-  IN  EFI_DEVICE_PATH_PROTOCOL          *FilePath\r
-  )\r
-{\r
-\r
-  EFI_DEVICE_PATH_PROTOCOL              *Node;\r
-\r
-  for (Node = FilePath; !IsDevicePathEnd(Node); Node = NextDevicePathNode(Node)) \r
-  {\r
-    if ((DevicePathType (Node) == MEDIA_DEVICE_PATH) && (DevicePathSubType (Node) == MEDIA_PIWG_FW_FILE_DP)) {\r
-      if (!CompareMem(PcdGetPtr(PcdShellFile), &(((MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)Node)->FvFileName), sizeof(EFI_GUID)))\r
-         return TRUE;\r
-    }\r
-  }\r
-  return FALSE;\r
-}\r
 \r
 /**\r
   Create a list of boot option from global BootOptionMenu. It\r

diff --git a/MdeModulePkg/Application/UiApp/Ui.h b/MdeModulePkg/Application/UiApp/Ui.h
index 6075b642ff81c779022c0aaad0f72a8ff9725cf5..7ce7d476e9a69ee1b5ddf39ed3038da5cfc5c5c3 100644 (file)
--- a/MdeModulePkg/Application/UiApp/Ui.h
+++ b/MdeModulePkg/Application/UiApp/Ui.h
@@ -27,7 +27,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/CapsuleVendor.h>\r
 #include <Guid/StatusCodeDataTypeId.h>\r
 #include <Guid/FileInfo.h>\r
-//#include <Guid/HiiSetupEnter.h>\r
 #include <Guid/HiiBootMaintenanceFormset.h>\r
 \r
 #include <Protocol/LoadFile.h>\r
@@ -44,7 +43,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/HiiDatabase.h>\r
 #include <Protocol/HiiString.h>\r
 #include <Protocol/SerialIo.h>\r
-#include <Protocol/LegacyBios.h>\r
 #include <Protocol/SimpleTextInEx.h>\r
 #include <Protocol/DriverHealth.h>\r
 #include <Protocol/DevicePathToText.h>\r

diff --git a/MdeModulePkg/Application/UiApp/UiApp.inf b/MdeModulePkg/Application/UiApp/UiApp.inf
index ba2b7b1edcf15ebea40fb099af4f675ddb7d401d..626f5580976f7a9404fe3433ceab57de1306b438 100644 (file)
--- a/MdeModulePkg/Application/UiApp/UiApp.inf
+++ b/MdeModulePkg/Application/UiApp/UiApp.inf
@@ -63,8 +63,6 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r
 [LibraryClasses]\r
   DevicePathLib\r
@@ -112,7 +110,6 @@
   gEfiLoadFileProtocolGuid                      ## PROTOCOL CONSUMES\r
   gEfiSmbiosProtocolGuid                        ## PROTOCOL CONSUMES\r
   gEfiGenericMemTestProtocolGuid                ## PROTOCOL CONSUMES\r
-  gEfiLegacyBiosProtocolGuid                    ## PROTOCOL CONSUMES\r
   gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport ## PROTOCOL SOMETIMES_CONSUMES\r
   gEfiBlockIoProtocolGuid                       ## PROTOCOL CONSUMES\r
   gEfiGraphicsOutputProtocolGuid                ## PROTOCOL SOMETIMES_CONSUMES\r
@@ -133,7 +130,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn\r