Some redundant definitions adn comments
have been removed in .c and .h files.

https://bugzilla.tianocore.org/show_bug.cgi?id=1063

Cc: Liming Gao <liming....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zh...@intel.com>
---
 .../Bus/Isa/IsaIoDxe/IsaDriver.h              |   1 -
 .../Bus/Isa/IsaIoDxe/IsaIoDxe.inf             |   1 -
 .../Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c    |  25 ---
 .../Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h      |  13 --
 .../Bus/Pci/IdeBusDxe/Ata.c                   | 119 ------------
 .../Bus/Pci/IdeBusDxe/DriverConfiguration.c   | 163 ----------------
 .../Bus/Pci/IdeBusDxe/Ide.h                   |  24 ---
 .../Csm/BiosThunk/Snp16Dxe/BiosSnp16.h        | 180 ------------------
 .../Csm/BiosThunk/Snp16Dxe/PxeUndi.c          |  92 +--------
 .../Csm/LegacyBiosDxe/LegacyBiosDxe.inf       |   2 -
 .../Csm/LegacyBiosDxe/LegacyBiosInterface.h   |   2 -
 .../Universal/BdsDxe/BootMaint/BmLib.c        |  36 ----
 .../Universal/BdsDxe/BootMaint/BootMaint.h    |  53 ------
 .../Universal/BdsDxe/BootMaint/BootOption.c   |  62 ------
 .../BdsDxe/BootMaint/ConsoleOption.c          |  64 -------
 .../Universal/BdsDxe/BootMaint/Variable.c     |  63 ------
 .../Universal/BdsDxe/FrontPage.c              |  29 ---
 .../Universal/BdsDxe/FrontPage.h              |  17 --
 18 files changed, 1 insertion(+), 945 deletions(-)

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h 
b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h
index 9639d18318..6b1aaeda0e 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h
@@ -24,7 +24,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 #include <Protocol/IsaIo.h>
 #include <Protocol/DevicePath.h>
 #include <Protocol/DriverBinding.h>
-#include <Protocol/GenericMemoryTest.h>
 #include <Guid/StatusCodeDataTypeId.h>
 
 #include <Library/DebugLib.h>
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf 
b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
index 6f02aea7af..247c66151b 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
@@ -62,7 +62,6 @@
   gEfiSioProtocolGuid                           ## TO_START
   gEfiPciIoProtocolGuid                         ## TO_START
   gEfiDevicePathProtocolGuid                    ## TO_START
-  gEfiGenericMemTestProtocolGuid                ## TO_START
 
 [Pcd]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures  ## 
CONSUMES
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c 
b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index 78c4e3b391..202588191e 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
@@ -1848,32 +1848,7 @@ Done:
 
 }
 
-/**
-  Disable the keyboard interface of the 8042 controller.
-
-  @param ConsoleIn   The device instance
-
-  @return status of issuing disable command
-
-**/
-EFI_STATUS
-DisableKeyboard (
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn
-  )
-{
-  EFI_STATUS  Status;
 
-  //
-  // Disable keyboard interface
-  //
-  Status = KeyboardCommand (ConsoleIn, 
KEYBOARD_8042_COMMAND_DISABLE_KEYBOARD_INTERFACE);
-  if (EFI_ERROR (Status)) {
-    KeyboardError (ConsoleIn, L"\n\r");
-    return EFI_DEVICE_ERROR;
-  }
-
-  return Status;
-}
 
 /**
   Check whether there is Ps/2 Keyboard device in system by 0xF4 Keyboard 
Command
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h 
b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
index 613f176401..61c7252bc5 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
@@ -299,19 +299,6 @@ InitKeyboard (
   IN BOOLEAN                     ExtendedVerification
   );
 
-/**
-  Disable the keyboard interface of the 8042 controller.
-
-  @param ConsoleIn   - the device instance
-
-  @return status of issuing disable command
-
-**/
-EFI_STATUS
-DisableKeyboard (
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn
-  );
-
 /**
   Timer event handler: read a series of scancodes from 8042
   and put them into memory scancode buffer.
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c 
b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
index 7819773f38..2ca06806d5 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
@@ -2676,124 +2676,5 @@ AtaNonDataCommandIn (
   return EFI_SUCCESS;
 }
 
-/**
-  Send ATA Ext command into device with NON_DATA protocol
-
-  @param  IdeDev Standard IDE device private data structure
-  @param  AtaCommand The ATA command to be sent
-  @param  Device The value in Device register
-  @param  Feature The value in Feature register
-  @param  SectorCount The value in SectorCount register
-  @param  LbaAddress The LBA address in 48-bit mode
-
-  @retval  EFI_SUCCESS Reading succeed
-  @retval  EFI_ABORTED Command failed
-  @retval  EFI_DEVICE_ERROR Device status error.
-
-**/
-EFI_STATUS
-AtaNonDataCommandInExt (
-  IN  IDE_BLK_IO_DEV  *IdeDev,
-  IN  UINT8           AtaCommand,
-  IN  UINT8           Device,
-  IN  UINT16          Feature,
-  IN  UINT16          SectorCount,
-  IN  EFI_LBA         LbaAddress
-  )
-{
-  EFI_STATUS  Status;
-  UINT8       StatusRegister;
-  UINT8       SectorCount8;
-  UINT8       Feature8;
-  UINT8       LbaLow;
-  UINT8       LbaMid;
-  UINT8       LbaHigh;
-
-  Status = WaitForBSYClear (IdeDev, ATATIMEOUT);
-  if (EFI_ERROR (Status)) {
-    return EFI_DEVICE_ERROR;
-  }
-
-  //
-  // Select device (bit4), set LBA mode(bit6) (use 0xe0 for compatibility)
-  //
-  IDEWritePortB (
-    IdeDev->PciIo,
-    IdeDev->IoPort->Head,
-    (UINT8) ((IdeDev->Device << 4) | 0xe0)
-    );
-
-  //
-  // ATA commands for ATA device must be issued when DRDY is set
-  //
-  Status = DRDYReady (IdeDev, ATATIMEOUT);
-  if (EFI_ERROR (Status)) {
-    return EFI_DEVICE_ERROR;
-  }
-
-  //
-  // Pass parameter into device register block
-  //
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Head, Device);
-
-  //
-  // Fill the feature register, which is a two-byte FIFO. Need write twice.
-  //
-  Feature8 = (UINT8) (Feature >> 8);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, Feature8);
-
-  Feature8 = (UINT8) Feature;
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, Feature8);
-
-  //
-  // Fill the sector count register, which is a two-byte FIFO. Need write 
twice.
-  //
-  SectorCount8 = (UINT8) (SectorCount >> 8);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->SectorCount, SectorCount8);
-
-  SectorCount8 = (UINT8) SectorCount;
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->SectorCount, SectorCount8);
-
-  //
-  // Fill the start LBA registers, which are also two-byte FIFO
-  //
-  LbaLow  = (UINT8) RShiftU64 (LbaAddress, 24);
-  LbaMid  = (UINT8) RShiftU64 (LbaAddress, 32);
-  LbaHigh = (UINT8) RShiftU64 (LbaAddress, 40);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->SectorNumber, LbaLow);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->CylinderLsb, LbaMid);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->CylinderMsb, LbaHigh);
-
-  LbaLow  = (UINT8) LbaAddress;
-  LbaMid  = (UINT8) RShiftU64 (LbaAddress, 8);
-  LbaHigh = (UINT8) RShiftU64 (LbaAddress, 16);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->SectorNumber, LbaLow);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->CylinderLsb, LbaMid);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->CylinderMsb, LbaHigh);
-
-  //
-  // Send command via Command Register
-  //
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Command, AtaCommand);
-
-  //
-  // Wait for command completion
-  //
-  Status = WaitForBSYClear (IdeDev, ATATIMEOUT);
-  if (EFI_ERROR (Status)) {
-    return EFI_DEVICE_ERROR;
-  }
-
-  StatusRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status);
-  if ((StatusRegister & ATA_STSREG_ERR) == ATA_STSREG_ERR) {
-    //
-    // Failed to execute command, abort operation
-    //
-    return EFI_ABORTED;
-  }
-
-  return EFI_SUCCESS;
-}
-
 
 
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c 
b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
index 3a5d3c6f6b..7199c7a496 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
@@ -33,51 +33,7 @@ EFI_DRIVER_CONFIGURATION_PROTOCOL gIDEBusDriverConfiguration 
= {
   "eng"
 };
 
-/**
-  Interprete keyboard input.
-
-  @retval  EFI_ABORTED  Get an 'ESC' key inputed.
-  @retval  EFI_SUCCESS  Get an 'Y' or 'y' inputed.
-  @retval  EFI_NOT_FOUND Get an 'N' or 'n' inputed..
-
-**/
-EFI_STATUS
-GetResponse (
-  VOID
-  )
-{
-  EFI_STATUS    Status;
-  EFI_INPUT_KEY Key;
-
-  while (TRUE) {
-    Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
-    if (!EFI_ERROR (Status)) {
-      if (Key.ScanCode == SCAN_ESC) {
-        return EFI_ABORTED;
-      }
-
-      switch (Key.UnicodeChar) {
 
-      //
-      // fall through
-      //
-      case L'y':
-      case L'Y':
-        gST->ConOut->OutputString (gST->ConOut, L"Y\n");
-        return EFI_SUCCESS;
-
-      //
-      // fall through
-      //
-      case L'n':
-      case L'N':
-        gST->ConOut->OutputString (gST->ConOut, L"N\n");
-        return EFI_NOT_FOUND;
-      }
-
-    }
-  }
-}
 
 /**
   Allows the user to set controller specific options for a controller that a
@@ -113,70 +69,6 @@ GetResponse (
   @retval  EFI_OUT_RESOURCES     There are not enough resources available to 
set the configuration options for the
                                  controller specified by ControllerHandle and 
ChildHandle
 **/
-EFI_STATUS
-EFIAPI
-IDEBusDriverConfigurationSetOptions (
-  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
-  IN  EFI_HANDLE                                             ControllerHandle,
-  IN  EFI_HANDLE                                             ChildHandle  
OPTIONAL,
-  IN  CHAR8                                                  *Language,
-  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired
-  )
-{
-  EFI_STATUS  Status;
-  UINT8       Value;
-  UINT8       NewValue;
-  UINTN       DataSize;
-  UINTN       Index;
-
-  if (ChildHandle != NULL) {
-    return EFI_UNSUPPORTED;
-  }
-
-  *ActionRequired = EfiDriverConfigurationActionNone;
-
-  DataSize        = sizeof (Value);
-  Status = gRT->GetVariable (
-                  L"Configuration",
-                  &gEfiCallerIdGuid,
-                  NULL,
-                  &DataSize,
-                  &Value
-                  );
-
-  gST->ConOut->OutputString (gST->ConOut, L"IDE Bus Driver Configuration\n");
-  gST->ConOut->OutputString (gST->ConOut, 
L"===============================\n");
-
-  NewValue = 0;
-  for (Index = 0; Index < 4; Index++) {
-    gST->ConOut->OutputString (gST->ConOut, OptionString[Index]);
-
-    Status = GetResponse ();
-    if (Status == EFI_ABORTED) {
-      return EFI_SUCCESS;
-    }
-
-    if (!EFI_ERROR (Status)) {
-      NewValue = (UINT8) (NewValue | (1 << Index));
-    }
-  }
-
-  if (EFI_ERROR (Status) || (NewValue != Value)) {
-    gRT->SetVariable (
-          L"Configuration",
-          &gEfiCallerIdGuid,
-          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
-          sizeof (NewValue),
-          &NewValue
-          );
-
-    *ActionRequired = EfiDriverConfigurationActionRestartController;
-  } else {
-    *ActionRequired = EfiDriverConfigurationActionNone;
-  }
-
-  return EFI_SUCCESS;
-}
 
 /**
   Tests to see if a controller's current configuration options are valid.
@@ -201,36 +93,7 @@ IDEBusDriverConfigurationSetOptions (
                                  managed by the driver specified by This has 
an invalid set of configuration
                                  options.
 **/
-EFI_STATUS
-EFIAPI
-IDEBusDriverConfigurationOptionsValid (
-  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,
-  IN  EFI_HANDLE                                      ControllerHandle,
-  IN  EFI_HANDLE                                      ChildHandle  OPTIONAL
-  )
-{
-  EFI_STATUS  Status;
-  UINT8       Value;
-  UINTN       DataSize;
-
-  if (ChildHandle != NULL) {
-    return EFI_UNSUPPORTED;
-  }
 
-  DataSize = sizeof (Value);
-  Status = gRT->GetVariable (
-                  L"Configuration",
-                  &gEfiCallerIdGuid,
-                  NULL,
-                  &DataSize,
-                  &Value
-                  );
-  if (EFI_ERROR (Status) || Value > 0x0f) {
-    return EFI_DEVICE_ERROR;
-  }
-
-  return EFI_SUCCESS;
-}
 /**
   Forces a driver to set the default configuration options for a controller.
 
@@ -263,30 +126,4 @@ IDEBusDriverConfigurationOptionsValid (
   @retval  EFI_OUT_RESOURCES     There are not enough resources available to 
force the default configuration
                                  options on the controller specified by 
ControllerHandle and ChildHandle.
 **/
-EFI_STATUS
-EFIAPI
-IDEBusDriverConfigurationForceDefaults (
-  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
-  IN  EFI_HANDLE                                             ControllerHandle,
-  IN  EFI_HANDLE                                             ChildHandle  
OPTIONAL,
-  IN  UINT32                                                 DefaultType,
-  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired
-  )
-{
-  UINT8 Value;
-
-  if (ChildHandle != NULL) {
-    return EFI_UNSUPPORTED;
-  }
 
-  Value = 0x0f;
-  gRT->SetVariable (
-        L"Configuration",
-        &gEfiCallerIdGuid,
-        EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
-        sizeof (Value),
-        &Value
-        );
-  *ActionRequired = EfiDriverConfigurationActionRestartController;
-  return EFI_SUCCESS;
-}
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h 
b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h
index 0fe6c6d502..5d2bf2cacd 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h
@@ -768,30 +768,6 @@ AtaNonDataCommandIn (
   IN  UINT8           LbaHigh
   );
 
-/**
-  Send ATA Ext command into device with NON_DATA protocol.
-
-  @param  IdeDev Standard IDE device private data structure
-  @param  AtaCommand The ATA command to be sent
-  @param  Device The value in Device register
-  @param  Feature The value in Feature register
-  @param  SectorCount The value in SectorCount register
-  @param  LbaAddress The Lba address in 48-bit mode
-
-  @retval  EFI_SUCCESS Reading succeed
-  @retval  EFI_ABORTED Command failed
-  @retval  EFI_DEVICE_ERROR Device status error.
-
-**/
-EFI_STATUS
-AtaNonDataCommandInExt (
-  IN  IDE_BLK_IO_DEV  *IdeDev,
-  IN  UINT8           AtaCommand,
-  IN  UINT8           Device,
-  IN  UINT16          Feature,
-  IN  UINT16          SectorCount,
-  IN  EFI_LBA         LbaAddress
-  );
 /**
   Enable Long Physical Sector Feature for ATA device.
 
diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.h 
b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.h
index 501e27b9c8..5dcbee68d4 100644
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.h
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.h
@@ -1019,39 +1019,6 @@ PxeUndiTransmit (
   )
 ;
 
-/**
-  PXE
-  UNDI SET MULTICAST ADDRESS
-  Op-Code: PXENV_UNDI_SET_MCAST_ADDRESS (0009h)
-  Input: Far pointer to a PXENV_TFTP_SET_MCAST_ADDRESS_t parameter structure 
that has been
-  initialized by the caller.
-  Output: PXENV_EXIT_SUCCESS or PXENV_EXIT_FAILURE must be returned in AX. The 
status field in
-  the parameter structure must be set to one of the values represented by the 
PXENV_STATUS_xxx
-  constants.
-  Description: This call changes the current list of multicast addresses to 
the input list and resets the network
-  adapter to accept it. If the number of multicast addresses is zero, 
multicast is disabled.
-  typedef struct {
-    PXENV_STATUS Status;
-    PXENV_UNDI_MCAST_ADDRESS_t R_Mcast_Buf;
-  } PXENV_UNDI_SET_MCAST_ADDR_T;
-  Set before calling API service
-  R_Mcast_Buf: See description in the UNDI RESET ADAPTER
-  (0004h) API.
-  Returned from API service
-  Status: See the PXENV_STATUS_xxx constants
-
-  @param  SimpleNetworkDevice   Device instance
-  @param  PxeUndiTable          Point to structure which hold parameter and 
return value
-                                for option ROM call.
-
-  @return Return value of PXE option ROM far call.
-**/
-EFI_STATUS
-PxeUndiSetMcastAddr (
-  IN EFI_SIMPLE_NETWORK_DEV               *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_SET_MCAST_ADDR_T      *PxeUndiTable
-  )
-;
 
 /**
   PXE
@@ -1088,39 +1055,6 @@ PxeUndiSetStationAddr (
   )
 ;
 
-/**
-  PXE
-  UNDI SET PACKET FILTER
-  Op-Code: PXENV_UNDI_SET_PACKET_FILTER (000Bh)
-  Input: Far pointer to a PXENV_UNDI_SET_PACKET_FILTER_T parameter structure 
that has been
-  initialized by the caller.
-  Output: PXENV_EXIT_SUCCESS or PXENV_EXIT_FAILURE must be returned in AX. The 
status field in
-  the parameter structure must be set to one of the values represented by the 
PXENV_STATUS_xxx
-  constants.
-  Description: This call resets the adapter's receive unit to accept a new 
filter, different from the one provided with
-  the open call.
-  typedef struct {
-    PXENV_STATUS Status;
-    UINT8 filter;
-  } PXENV_UNDI_SET_PACKET_FILTER_T;
-  Set before calling API service
-  Filter: See the receive filter values in the UNDI OPEN
-  (0006h) API description.
-  Returned from API service
-  Status: See the PXENV_STATUS_xxx constants.
-
-  @param  SimpleNetworkDevice   Device instance
-  @param  PxeUndiTable          Point to structure which hold parameter and 
return value
-                                for option ROM call.
-
-  @return Return value of PXE option ROM far call.
-**/
-EFI_STATUS
-PxeUndiSetPacketFilter (
-  IN EFI_SIMPLE_NETWORK_DEV               *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_SET_PACKET_FILTER_T   *PxeUndiTable
-  )
-;
 
 /**
   PXE
@@ -1252,73 +1186,6 @@ PxeUndiClearStatistics (
   )
 ;
 
-/**
-  PXE
-  UNDI INITIATE DIAGS
-  Op-Code: PXENV_UNDI_INITIATE_DIAGS (000Fh)
-  Input: Far pointer to a PXENV_UNDI_INITIATE_DIAGS_T parameter.
-  Output: PXENV_EXIT_SUCCESS or PXENV_EXIT_FAILURE must be returned in AX. The 
status field in
-  the parameter structure must be set to one of the values represented by the
-  PXENV_STATUS_xxx constants.
-  Description: This call can be used to initiate the run-time diagnostics. It 
causes the network adapter to run
-  hardware diagnostics and to update its status information.
-  typedef struct {
-    PXENV_STATUS Status;
-  } PXENV_UNDI_INITIATE_DIAGS_T;
-  Set before calling API service
-  N/A
-  Returned from API service
-  Status: See the PXENV_STATUS_xxx constants.
-
-  @param  SimpleNetworkDevice   Device instance
-  @param  PxeUndiTable          Point to structure which hold parameter and 
return value
-                                for option ROM call.
-
-  @return Return value of PXE option ROM far call.
-**/
-EFI_STATUS
-PxeUndiInitiateDiags (
-  IN EFI_SIMPLE_NETWORK_DEV               *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_INITIATE_DIAGS_T      *PxeUndiTable
-  )
-;
-
-/**
-  PXE
-  UNDI FORCE INTERRUPT
-  Op-Code: PXENV_UNDI_FORCE_INTERRUPT (0010h)
-  Input: Far pointer to a PXENV_UNDI_FORCE_INTERRUPT_T parameter structure 
that has been
-  initialized by the caller.
-  Output: PXENV_EXIT_SUCCESS or PXENV_EXIT_FAILURE must be returned in AX. The 
status field in
-  the parameter structure must be set to one of the values represented by the 
PXENV_STATUS_xxx
-  constants.
-  Description: This call forces the network adapter to generate an interrupt. 
When a receive interrupt occurs, the
-  network adapter driver usually queues the packet and calls the application's 
callback receive
-  routine with a pointer to the packet received. Then, the callback routine 
either can copy the packet
-  to its buffer or can decide to delay the copy to a later time. If the packet 
is not immediately copied,
-  the network adapter driver does not remove it from the input queue. When the 
application wants to
-  copy the packet, it can call the PXENV_UNDI_FORCE_INTERRUPT routine to 
simulate the receive
-  interrupt.
-  typedef struct {
-    PXENV_STATUS Status;
-  } PXENV_UNDI_FORCE_INTERRUPT_T;
-  Set before calling API service
-  N/A
-  Returned from API service
-  Status: See the PXENV_STATUS_xxx constants.
-
-  @param  SimpleNetworkDevice   Device instance
-  @param  PxeUndiTable          Point to structure which hold parameter and 
return value
-                                for option ROM call.
-
-  @return Return value of PXE option ROM far call.
-**/
-EFI_STATUS
-PxeUndiForceInterrupt (
-  IN EFI_SIMPLE_NETWORK_DEV               *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_FORCE_INTERRUPT_T     *PxeUndiTable
-  )
-;
 
 /**
   PXE
@@ -1562,53 +1429,6 @@ PxeUndiStop (
   )
 ;
 
-/**
-  PXE
-  UNDI GET STATE
-  Op-Code: PXENV_UNDI_GET_STATE (0015h)
-  Input: Far pointer to a PXENV_UNDI_GET_STATE_T parameter.
-  Output: PXENV_EXIT_SUCCESS or PXENV_EXIT_FAILURE must be returned in AX. The 
status field in
-  the parameter structure must be set to one of the values represented by the 
PXENV_STATUS_xxx
-  constants. The UNDI_STATE field in the parameter structure must be set to 
one of the valid state
-  constants
-  Description: This call can be used to obtain state of the UNDI engine in 
order to avoid issuing adverse call
-  sequences
-  typedef struct {
-    #define PXE_UNDI_GET_STATE_STARTED 1
-    #define PXE_UNDI_GET_STATE_INITIALIZED 2
-    #define PXE_UNDI_GET_STATE_OPENED 3
-    PXENV_STATUS Status;
-    UINT8 UNDIstate;
-  } PXENV_UNDI_GET_STATE_T;
-  Set before calling API service
-  N/A
-  Returned from API service
-  Status: See the PXENV_STATUS_xxx constants.
-  State: See definitions of the state constants.
-  Note. UNDI implementation is responsible for maintaining
-  internal state machine.
-  UNDI ISR
-  Op-Code: PXENV_UNDI_ISR (0014h)
-  Input: Far pointer to a t_PXENV_UNDI_ISR parameter structure that has been 
initialized by the caller.
-  Output: PXENV_EXIT_SUCCESS or PXENV_EXIT_FAILURE must be returned in AX. The 
status field in
-  the parameter structure must be set to one of the values represented by the 
PXENV_STATUS_xxx
-  constants.
-  Description: This API function will be called at different levels of 
processing the interrupt. The FuncFlag field in
-  the parameter block indicates the operation to be performed for the call. 
This field is filled with the
-  status of that operation on return.
-
-  @param  SimpleNetworkDevice   Device instance
-  @param  PxeUndiTable          Point to structure which hold parameter and 
return value
-                                for option ROM call.
-
-  @return Return value of PXE option ROM far call.
-**/
-EFI_STATUS
-PxeUndiGetState (
-  IN EFI_SIMPLE_NETWORK_DEV               *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_GET_STATE_T           *PxeUndiTable
-  )
-;
 
 /**
   Effect the Far Call into the PXE Layer
diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c 
b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c
index d1435798c0..a764e58a99 100644
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c
@@ -564,46 +564,7 @@ PxeUndiTransmit (
   }
 }
 
-/**
-  PXE
-  UNDI SET MULTICAST ADDRESS
-  Op-Code: PXENV_UNDI_SET_MCAST_ADDRESS (0009h)
-  Input: Far pointer to a PXENV_TFTP_SET_MCAST_ADDRESS_t parameter structure 
that has been
-  initialized by the caller.
-  Output: PXENV_EXIT_SUCCESS or PXENV_EXIT_FAILURE must be returned in AX. The 
status field in
-  the parameter structure must be set to one of the values represented by the 
PXENV_STATUS_xxx
-  constants.
-  Description: This call changes the current list of multicast addresses to 
the input list and resets the network
-  adapter to accept it. If the number of multicast addresses is zero, 
multicast is disabled.
-  typedef struct {
-    PXENV_STATUS Status;
-    PXENV_UNDI_MCAST_ADDRESS_t R_Mcast_Buf;
-  } PXENV_UNDI_SET_MCAST_ADDR_T;
-  Set before calling API service
-  R_Mcast_Buf: See description in the UNDI RESET ADAPTER
-  (0004h) API.
-  Returned from API service
-  Status: See the PXENV_STATUS_xxx constants
-
-  @param  SimpleNetworkDevice   Device instance
-  @param  PxeUndiTable          Point to structure which hold parameter and 
return value
-                                for option ROM call.
 
-  @return Return value of PXE option ROM far call.
-**/
-EFI_STATUS
-PxeUndiSetMcastAddr (
-  IN     EFI_SIMPLE_NETWORK_DEV       *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_SET_MCAST_ADDR_T  *PxeUndiTable
-  )
-{
-  return MakePxeCall (
-          SimpleNetworkDevice,
-          PxeUndiTable,
-          sizeof (PXENV_UNDI_SET_MCAST_ADDR_T),
-          PXENV_UNDI_SET_MCAST_ADDR
-          );
-}
 
 /**
   PXE
@@ -674,19 +635,6 @@ PxeUndiSetStationAddr (
 
   @return Return value of PXE option ROM far call.
 **/
-EFI_STATUS
-PxeUndiSetPacketFilter (
-  IN     EFI_SIMPLE_NETWORK_DEV          *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_SET_PACKET_FILTER_T  *PxeUndiTable
-  )
-{
-  return MakePxeCall (
-          SimpleNetworkDevice,
-          PxeUndiTable,
-          sizeof (PXENV_UNDI_SET_PACKET_FILTER_T),
-          PXENV_UNDI_SET_PACKET_FILTER
-          );
-}
 
 /**
   PXE
@@ -863,19 +811,6 @@ PxeUndiClearStatistics (
 
   @return Return value of PXE option ROM far call.
 **/
-EFI_STATUS
-PxeUndiInitiateDiags (
-  IN     EFI_SIMPLE_NETWORK_DEV       *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_INITIATE_DIAGS_T  *PxeUndiTable
-  )
-{
-  return MakePxeCall (
-          SimpleNetworkDevice,
-          PxeUndiTable,
-          sizeof (PXENV_UNDI_INITIATE_DIAGS_T),
-          PXENV_UNDI_INITIATE_DIAGS
-          );
-}
 
 /**
   PXE
@@ -907,19 +842,6 @@ PxeUndiInitiateDiags (
 
   @return Return value of PXE option ROM far call.
 **/
-EFI_STATUS
-PxeUndiForceInterrupt (
-  IN     EFI_SIMPLE_NETWORK_DEV        *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_FORCE_INTERRUPT_T  *PxeUndiTable
-  )
-{
-  return MakePxeCall (
-          SimpleNetworkDevice,
-          PxeUndiTable,
-          sizeof (PXENV_UNDI_FORCE_INTERRUPT_T),
-          PXENV_UNDI_FORCE_INTERRUPT
-          );
-}
 
 /**
   PXE
@@ -1239,16 +1161,4 @@ PxeUndiStop (
 
   @return Return value of PXE option ROM far call.
 **/
-EFI_STATUS
-PxeUndiGetState (
-  IN     EFI_SIMPLE_NETWORK_DEV  *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_GET_STATE_T  *PxeUndiTable
-  )
-{
-  return MakePxeCall (
-          SimpleNetworkDevice,
-          PxeUndiTable,
-          sizeof (PXENV_UNDI_GET_STATE_T),
-          PXENV_UNDI_GET_STATE
-          );
-}
+
diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf 
b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
index 6eb01fc185..6d156a4123 100644
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
+++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
@@ -72,8 +72,6 @@
   DxeServicesTableLib
   PcdLib
   ReportStatusCodeLib
-  PeCoffLib
-  CacheMaintenanceLib
   DebugAgentLib
 
 [LibraryClasses.IA32]
diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h 
b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h
index 1e84772688..7779427f68 100644
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h
+++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h
@@ -63,8 +63,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 #include <Library/PcdLib.h>
 #include <Library/DevicePathLib.h>
 #include <Library/DxeServicesTableLib.h>
-#include <Library/PeCoffLib.h>
-#include <Library/CacheMaintenanceLib.h>
 #include <Library/DebugAgentLib.h>
 
 //
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c 
b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
index d27113c015..a7ff449557 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
@@ -323,42 +323,6 @@ EfiDevicePathInstanceCount (
   return Count;
 }
 
-/**
-  Adjusts the size of a previously allocated buffer.
-
-
-  @param OldPool         - A pointer to the buffer whose size is being 
adjusted.
-  @param OldSize         - The size of the current buffer.
-  @param NewSize         - The size of the new buffer.
-
-  @return   The newly allocated buffer.
-  @retval   NULL  Allocation failed.
-
-**/
-VOID *
-EfiReallocatePool (
-  IN VOID                 *OldPool,
-  IN UINTN                OldSize,
-  IN UINTN                NewSize
-  )
-{
-  VOID  *NewPool;
-
-  NewPool = NULL;
-  if (NewSize != 0) {
-    NewPool = AllocateZeroPool (NewSize);
-  }
-
-  if (OldPool != NULL) {
-    if (NewPool != NULL) {
-      CopyMem (NewPool, OldPool, OldSize < NewSize ? OldSize : NewSize);
-    }
-
-    FreePool (OldPool);
-  }
-
-  return NewPool;
-}
 
 /**
   Get a string from the Data Hub record based on
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h 
b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
index bdd22c8e75..b3b905d7ef 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
@@ -548,22 +548,6 @@ BOpt_IsEfiImageName (
   IN UINT16  *FileName
   );
 
-/**
-
-  Check whether current FileName point to a valid Efi Application
-
-  @param Dir       Pointer to current Directory
-  @param FileName  Pointer to current File name.
-
-  @retval TRUE      Is a valid Efi Application
-  @retval FALSE     not a valid Efi Application
-
-**/
-BOOLEAN
-BOpt_IsEfiApp (
-  IN EFI_FILE_HANDLE Dir,
-  IN UINT16          *FileName
-  );
 
 /**
 
@@ -702,18 +686,6 @@ FreeAllConsoles (
   VOID
   );
 
-/**
-  Update the device path that describing a terminal device
-  based on the new BaudRate, Data Bits, parity and Stop Bits
-  set.
-
-  @param DevicePath     The devicepath protocol instance wanted to be updated.
-
-**/
-VOID
-ChangeVariableDevicePath (
-  IN OUT EFI_DEVICE_PATH_PROTOCOL  *DevicePath
-  );
 
 /**
   Update the multi-instance device path of Terminal Device based on
@@ -875,15 +847,6 @@ Var_UpdateErrorOutOption (
   VOID
   );
 
-/**
-  Update the device path of "ConOut", "ConIn" and "ErrOut" based on the new 
BaudRate, Data Bits,
-  parity and stop Bits set.
-
-**/
-VOID
-Var_UpdateAllConsoleOption (
-  VOID
-  );
 
 /**
   This function update the "BootNext" EFI Variable. If there is no "BootNex" 
specified in BMM,
@@ -1154,22 +1117,6 @@ EfiLibFileInfo (
   IN EFI_FILE_HANDLE      FHand
   );
 
-/**
-  Adjusts the size of a previously allocated buffer.
-
-  @param OldPool         A pointer to the buffer whose size is being adjusted.
-  @param OldSize         The size of the current buffer.
-  @param NewSize         The size of the new buffer.
-
-  @return   The newly allocated buffer. if NULL, allocation failed.
-
-**/
-VOID*
-EfiReallocatePool (
-  IN VOID                 *OldPool,
-  IN UINTN                OldSize,
-  IN UINTN                NewSize
-  );
 
 /**
   Function deletes the variable specified by VarName and VarGuid.
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c 
b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index 895f13f214..c4a0e17f3b 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -1192,69 +1192,7 @@ BOpt_IsEfiImageName (
   return FALSE;
 }
 
-/**
-
-  Check whether current FileName point to a valid Efi Application
-
-  @param Dir       Pointer to current Directory
-  @param FileName  Pointer to current File name.
-
-  @retval TRUE      Is a valid Efi Application
-  @retval FALSE     not a valid Efi Application
-
-**/
-BOOLEAN
-BOpt_IsEfiApp (
-  IN EFI_FILE_HANDLE Dir,
-  IN UINT16          *FileName
-  )
-{
-  UINTN                       BufferSize;
-  EFI_IMAGE_DOS_HEADER        DosHdr;
-  UINT16                      Subsystem;
-  EFI_FILE_HANDLE             File;
-  EFI_STATUS                  Status;
-  EFI_IMAGE_OPTIONAL_HEADER_UNION PeHdr;
-
-  Status = Dir->Open (Dir, &File, FileName, EFI_FILE_MODE_READ, 0);
-
-  if (EFI_ERROR (Status)) {
-    return FALSE;
-  }
-
-  BufferSize = sizeof (EFI_IMAGE_DOS_HEADER);
-  File->Read (File, &BufferSize, &DosHdr);
-  if (DosHdr.e_magic != EFI_IMAGE_DOS_SIGNATURE) {
-    File->Close (File);
-    return FALSE;
-  }
 
-  File->SetPosition (File, DosHdr.e_lfanew);
-  BufferSize = sizeof (EFI_IMAGE_OPTIONAL_HEADER_UNION);
-  File->Read (File, &BufferSize, &PeHdr);
-  if (PeHdr.Pe32.Signature != EFI_IMAGE_NT_SIGNATURE) {
-    File->Close (File);
-    return FALSE;
-  }
-  //
-  // Determine PE type and read subsytem
-  //
-  if (PeHdr.Pe32.OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
-    Subsystem = PeHdr.Pe32.OptionalHeader.Subsystem;
-  } else if (PeHdr.Pe32.OptionalHeader.Magic == 
EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
-    Subsystem = PeHdr.Pe32Plus.OptionalHeader.Subsystem;
-  } else {
-    return FALSE;
-  }
-
-  if (Subsystem == EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION) {
-    File->Close (File);
-    return TRUE;
-  } else {
-    File->Close (File);
-    return FALSE;
-  }
-}
 
 /**
 
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c 
b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
index 964d8850ef..33b53bf3b6 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
@@ -218,71 +218,7 @@ ChangeTerminalDevicePath (
 
 }
 
-/**
-  Update the device path that describing a terminal device
-  based on the new BaudRate, Data Bits, parity and Stop Bits
-  set.
-
-  @param DevicePath terminal device's path
-
-**/
-VOID
-ChangeVariableDevicePath (
-  IN OUT EFI_DEVICE_PATH_PROTOCOL  *DevicePath
-  )
-{
-  EFI_DEVICE_PATH_PROTOCOL  *Node;
-  ACPI_HID_DEVICE_PATH      *Acpi;
-  UART_DEVICE_PATH          *Uart;
-  UINTN                     Com;
-  BM_TERMINAL_CONTEXT       *NewTerminalContext;
-  BM_MENU_ENTRY             *NewMenuEntry;
 
-  Node  = DevicePath;
-  Node  = NextDevicePathNode (Node);
-  Com   = 0;
-  while (!IsDevicePathEnd (Node)) {
-    Acpi = (ACPI_HID_DEVICE_PATH *) Node;
-    if (IsIsaSerialNode (Acpi)) {
-      CopyMem (&Com, &Acpi->UID, sizeof (UINT32));
-    }
-
-    if ((DevicePathType (Node) == MESSAGING_DEVICE_PATH) && (DevicePathSubType 
(Node) == MSG_UART_DP)) {
-      NewMenuEntry = BOpt_GetMenuEntry (
-                      &TerminalMenu,
-                      Com
-                      );
-      ASSERT (NewMenuEntry != NULL);
-      NewTerminalContext  = (BM_TERMINAL_CONTEXT *) 
NewMenuEntry->VariableContext;
-      Uart                = (UART_DEVICE_PATH *) Node;
-      CopyMem (
-        &Uart->BaudRate,
-        &NewTerminalContext->BaudRate,
-        sizeof (UINT64)
-        );
-
-      CopyMem (
-        &Uart->DataBits,
-        &NewTerminalContext->DataBits,
-        sizeof (UINT8)
-        );
-
-      CopyMem (
-        &Uart->Parity,
-        &NewTerminalContext->Parity,
-        sizeof (UINT8)
-        );
-
-      CopyMem (
-        &Uart->StopBits,
-        &NewTerminalContext->StopBits,
-        sizeof (UINT8)
-        );
-    }
-
-    Node = NextDevicePathNode (Node);
-  }
-}
 
 /**
   Retrieve ACPI UID of UART from device path
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c 
b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index ea798fab9d..2a7bdb13a8 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -312,70 +312,7 @@ Var_ChangeDriverOrder (
   return EFI_SUCCESS;
 }
 
-/**
-  Update the device path of "ConOut", "ConIn" and "ErrOut"
-  based on the new BaudRate, Data Bits, parity and Stop Bits
-  set.
-
-**/
-VOID
-Var_UpdateAllConsoleOption (
-  VOID
-  )
-{
-  EFI_DEVICE_PATH_PROTOCOL  *OutDevicePath;
-  EFI_DEVICE_PATH_PROTOCOL  *InpDevicePath;
-  EFI_DEVICE_PATH_PROTOCOL  *ErrDevicePath;
-  EFI_STATUS                Status;
 
-  OutDevicePath = EfiLibGetVariable (L"ConOut", &gEfiGlobalVariableGuid);
-  InpDevicePath = EfiLibGetVariable (L"ConIn", &gEfiGlobalVariableGuid);
-  ErrDevicePath = EfiLibGetVariable (L"ErrOut", &gEfiGlobalVariableGuid);
-  if (OutDevicePath != NULL) {
-    ChangeVariableDevicePath (OutDevicePath);
-    Status = gRT->SetVariable (
-                    L"ConOut",
-                    &gEfiGlobalVariableGuid,
-                    EFI_VARIABLE_BOOTSERVICE_ACCESS | 
EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                    GetDevicePathSize (OutDevicePath),
-                    OutDevicePath
-                    );
-    //
-    // Changing variable without increasing its size with current variable 
implementation shouldn't fail.
-    //
-    ASSERT_EFI_ERROR (Status);
-  }
-
-  if (InpDevicePath != NULL) {
-    ChangeVariableDevicePath (InpDevicePath);
-    Status = gRT->SetVariable (
-                    L"ConIn",
-                    &gEfiGlobalVariableGuid,
-                    EFI_VARIABLE_BOOTSERVICE_ACCESS | 
EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                    GetDevicePathSize (InpDevicePath),
-                    InpDevicePath
-                    );
-    //
-    // Changing variable without increasing its size with current variable 
implementation shouldn't fail.
-    //
-    ASSERT_EFI_ERROR (Status);
-  }
-
-  if (ErrDevicePath != NULL) {
-    ChangeVariableDevicePath (ErrDevicePath);
-    Status = gRT->SetVariable (
-                    L"ErrOut",
-                    &gEfiGlobalVariableGuid,
-                    EFI_VARIABLE_BOOTSERVICE_ACCESS | 
EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                    GetDevicePathSize (ErrDevicePath),
-                    ErrDevicePath
-                    );
-    //
-    // Changing variable without increasing its size with current variable 
implementation shouldn't fail.
-    //
-    ASSERT_EFI_ERROR (Status);
-  }
-}
 
 /**
   This function delete and build multi-instance device path for
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c 
b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index bdf63eabbf..46fdc53f2b 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -569,35 +569,6 @@ CallFrontPage (
   return Status;
 }
 
-/**
-  Acquire the string associated with the ProducerGuid and return it.
-
-
-  @param ProducerGuid    The Guid to search the HII database for
-  @param Token           The token value of the string to extract
-  @param String          The string that is extracted
-
-  @retval  EFI_SUCCESS  The function returns EFI_SUCCESS always.
-
-**/
-EFI_STATUS
-GetProducerString (
-  IN      EFI_GUID                  *ProducerGuid,
-  IN      EFI_STRING_ID             Token,
-  OUT     CHAR16                    **String
-  )
-{
-  EFI_STRING      TmpString;
-
-  TmpString = HiiGetPackageString (ProducerGuid, Token, NULL);
-  if (TmpString == NULL) {
-    *String = GetStringById (STRING_TOKEN (STR_MISSING_STRING));
-  } else {
-    *String = TmpString;
-  }
-
-  return EFI_SUCCESS;
-}
 
 /**
   Convert Processor Frequency Data to a string.
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h 
b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h
index bc2c0612d0..7e6290fd62 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h
@@ -198,23 +198,6 @@ InitializeFrontPage (
   IN BOOLEAN    InitializeHiiData
   );
 
-/**
-  Acquire the string associated with the ProducerGuid and return it.
-
-
-  @param ProducerGuid    - The Guid to search the HII database for
-  @param Token           - The token value of the string to extract
-  @param String          - The string that is extracted
-
-  @retval  EFI_SUCCESS  The function returns EFI_SUCCESS always.
-
-**/
-EFI_STATUS
-GetProducerString (
-  IN      EFI_GUID                  *ProducerGuid,
-  IN      EFI_STRING_ID             Token,
-  OUT     CHAR16                    **String
-  );
 
 /**
   This function is the main entry of the platform setup entry.
-- 
2.18.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to