Revision: 18120
http://sourceforge.net/p/edk2/code/18120
Author: ydong10
Date: 2015-07-31 02:12:54 +0000 (Fri, 31 Jul 2015)
Log Message:
-----------
Remove the useless code to fix build failure caused by error depend on
IntelFrameworkModulePkg.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c
trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
trunk/edk2/MdeModulePkg/Application/UiApp/Ui.h
trunk/edk2/MdeModulePkg/Application/UiApp/UiApp.inf
Modified: trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c
===================================================================
--- trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c
2015-07-31 01:21:50 UTC (rev 18119)
+++ trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c
2015-07-31 02:12:54 UTC (rev 18120)
@@ -238,13 +238,8 @@
UINT16 *TempStr;
UINTN OptionNumber;
VOID *Buffer;
- EFI_LEGACY_BIOS_PROTOCOL *LegacyBios;
- UINT16 DeviceType;
- BBS_BBS_DEVICE_PATH BbsDevicePathNode;
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;
BOOLEAN RemovableMedia;
-
NoSimpleFsHandles = 0;
NoLoadFileHandles = 0;
OptionNumber = 0;
@@ -444,59 +439,6 @@
}
//
- // Add Legacy Boot Option Support Here
- //
- Status = gBS->LocateProtocol (
- &gEfiLegacyBiosProtocolGuid,
- NULL,
- (VOID **) &LegacyBios
- );
- if (!EFI_ERROR (Status)) {
-
- for (Index = BBS_TYPE_FLOPPY; Index <= BBS_TYPE_EMBEDDED_NETWORK; Index++)
{
- MenuEntry = BOpt_CreateMenuEntry (BM_FILE_CONTEXT_SELECT);
- if (NULL == MenuEntry) {
- return EFI_OUT_OF_RESOURCES;
- }
-
- FileContext = (BM_FILE_CONTEXT *)
MenuEntry->VariableContext;
-
- FileContext->IsRemovableMedia = FALSE;
- FileContext->IsLoadFile = TRUE;
- FileContext->IsBootLegacy = TRUE;
- DeviceType = (UINT16) Index;
- BbsDevicePathNode.Header.Type = BBS_DEVICE_PATH;
- BbsDevicePathNode.Header.SubType = BBS_BBS_DP;
- SetDevicePathNodeLength (
- &BbsDevicePathNode.Header,
- sizeof (BBS_BBS_DEVICE_PATH)
- );
- BbsDevicePathNode.DeviceType = DeviceType;
- BbsDevicePathNode.StatusFlag = 0;
- BbsDevicePathNode.String[0] = 0;
- DevicePath = AppendDevicePathNode (
- EndDevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *) &BbsDevicePathNode
- );
-
- FileContext->DevicePath = DevicePath;
- MenuEntry->HelpString = UiDevicePathToStr (FileContext->DevicePath);
-
- TempStr = MenuEntry->HelpString;
- MenuEntry->DisplayString = AllocateZeroPool (MAX_CHAR);
- ASSERT (MenuEntry->DisplayString != NULL);
- UnicodeSPrint (
- MenuEntry->DisplayString,
- MAX_CHAR,
- L"Boot Legacy [%s]",
- TempStr
- );
- MenuEntry->OptionNumber = OptionNumber;
- OptionNumber++;
- InsertTailList (&FsOptionMenu.Head, &MenuEntry->Link);
- }
- }
- //
// Remember how many file system options are here
//
FsOptionMenu.MenuNumber = OptionNumber;
Modified: trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
===================================================================
--- trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
2015-07-31 01:21:50 UTC (rev 18119)
+++ trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
2015-07-31 02:12:54 UTC (rev 18120)
@@ -232,36 +232,7 @@
UpdatePageEnd (CallbackData);
}
-/**
- IsShellNodeDevicePath checks for the Shell device path.
- If it's the shell device path then return TRUE otherwise
- return FALSE.
-
- @param DevicePath The DevicePath to check
-
- @retval TRUE DevicePath is Shell
- @retval FALSE DevicePath is not Shell
-
-**/
-BOOLEAN
-IsShellNodeDevicePath(
- IN EFI_DEVICE_PATH_PROTOCOL *FilePath
- )
-{
-
- EFI_DEVICE_PATH_PROTOCOL *Node;
-
- for (Node = FilePath; !IsDevicePathEnd(Node); Node =
NextDevicePathNode(Node))
- {
- if ((DevicePathType (Node) == MEDIA_DEVICE_PATH) && (DevicePathSubType
(Node) == MEDIA_PIWG_FW_FILE_DP)) {
- if (!CompareMem(PcdGetPtr(PcdShellFile),
&(((MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)Node)->FvFileName), sizeof(EFI_GUID)))
- return TRUE;
- }
- }
- return FALSE;
-}
-
/**
Create a list of boot option from global BootOptionMenu. It
allow user to delete the boot option.
Modified: trunk/edk2/MdeModulePkg/Application/UiApp/Ui.h
===================================================================
--- trunk/edk2/MdeModulePkg/Application/UiApp/Ui.h 2015-07-31 01:21:50 UTC
(rev 18119)
+++ trunk/edk2/MdeModulePkg/Application/UiApp/Ui.h 2015-07-31 02:12:54 UTC
(rev 18120)
@@ -27,7 +27,6 @@
#include <Guid/CapsuleVendor.h>
#include <Guid/StatusCodeDataTypeId.h>
#include <Guid/FileInfo.h>
-//#include <Guid/HiiSetupEnter.h>
#include <Guid/HiiBootMaintenanceFormset.h>
#include <Protocol/LoadFile.h>
@@ -44,7 +43,6 @@
#include <Protocol/HiiDatabase.h>
#include <Protocol/HiiString.h>
#include <Protocol/SerialIo.h>
-#include <Protocol/LegacyBios.h>
#include <Protocol/SimpleTextInEx.h>
#include <Protocol/DriverHealth.h>
#include <Protocol/DevicePathToText.h>
Modified: trunk/edk2/MdeModulePkg/Application/UiApp/UiApp.inf
===================================================================
--- trunk/edk2/MdeModulePkg/Application/UiApp/UiApp.inf 2015-07-31 01:21:50 UTC
(rev 18119)
+++ trunk/edk2/MdeModulePkg/Application/UiApp/UiApp.inf 2015-07-31 02:12:54 UTC
(rev 18120)
@@ -63,8 +63,6 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- IntelFrameworkPkg/IntelFrameworkPkg.dec
- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
[LibraryClasses]
DevicePathLib
@@ -112,7 +110,6 @@
gEfiLoadFileProtocolGuid ## PROTOCOL CONSUMES
gEfiSmbiosProtocolGuid ## PROTOCOL CONSUMES
gEfiGenericMemTestProtocolGuid ## PROTOCOL CONSUMES
- gEfiLegacyBiosProtocolGuid ## PROTOCOL CONSUMES
gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport ## PROTOCOL SOMETIMES_CONSUMES
gEfiBlockIoProtocolGuid ## PROTOCOL CONSUMES
gEfiGraphicsOutputProtocolGuid ## PROTOCOL SOMETIMES_CONSUMES
@@ -133,7 +130,6 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution
gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
