UEFI HII: Make all folder and file consistent.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UefiHiiEnable4354@4586 6f19259b-4bc3-4df7-8a09-765794883524

8 files changed, 7 insertions, 89 deletions

diff --git a/MdeModulePkg/Universal/BdsDxe/Bds.h b/MdeModulePkg/Universal/BdsDxe/Bds.h
index a3c40ae..fbfa965 100644
--- a/MdeModulePkg/Universal/BdsDxe/Bds.h
+++ b/MdeModulePkg/Universal/BdsDxe/Bds.h
@@ -69,7 +69,7 @@ Revision History
 #include <Library/DxeServicesTableLib.h>

 #include <Library/PerformanceLib.h>

 #include <Library/ReportStatusCodeLib.h>

-#include <Library/UefiIfrSupportLib.h>

+#include <Library/IfrSupportLib.h>

 #include <Library/UefiRuntimeServicesTableLib.h>

 #include <Library/HobLib.h>

 #include <Library/BaseLib.h>

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
index 451a41a..c4c6b7f 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -87,7 +87,7 @@
   BaseLib

   HobLib

   UefiRuntimeServicesTableLib

-  UefiIfrSupportLib

+  IfrSupportLib

   GenericBdsLib

   ReportStatusCodeLib

   PerformanceLib

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index e0bf1e5..9f19258 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -38,7 +38,7 @@ Revision History
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/UefiIfrSupportLib.h>
+#include <Library/IfrSupportLib.h>
 #include <Library/HiiLib.h>
 
 #include <MdeModuleHii.h>
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index b9d57d5..42a3317 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -55,7 +55,7 @@
   BaseMemoryLib

   DebugLib

   HiiLib

-  UefiIfrSupportLib

+  IfrSupportLib

   BaseLib

 

 

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 07516ff..3ade4da 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -49,7 +49,7 @@ Revision History
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/BaseLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/UefiIfrSupportLib.h>
+#include <Library/IfrSupportLib.h>
 #include <Library/HiiLib.h>
 
 #include "R8Lib.h"
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/UefiSetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/UefiSetupBrowserDxe.inf
deleted file mode 100644
index 82bbcf7..0000000
--- a/MdeModulePkg/Universal/SetupBrowserDxe/UefiSetupBrowserDxe.inf
+++ /dev/null
@@ -1,82 +0,0 @@
-#/** @file

-# Component name for module SetupBrowser

-#

-# FIX ME!

-# Copyright (c) 2007, Intel Corporation. All rights reserved.

-#

-#  All rights reserved. This program and the accompanying materials

-#  are licensed and made available under the terms and conditions of the BSD License

-#  which accompanies this distribution. The full text of the license may be found at

-#  http://opensource.org/licenses/bsd-license.php

-#  

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-#

-#**/

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = SetupBrowser

-  FILE_GUID                      = EBf342FE-B1D3-4EF8-957C-8048606FF671

-  MODULE_TYPE                    = DXE_DRIVER

-  VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x0002000A

-

-  ENTRY_POINT                    = InitializeSetup

-

-#

-# The following information is for reference only and not required by the build tools.

-#

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

-#

-

-[Sources.common]

-  SetupBrowserStr.uni

-  Setup.c

-  Setup.h

-  IfrParse.c

-  Expression.c

-  InputHandler.c

-  Print.c

-  Print.h

-  Presentation.c

-  ProcessOptions.c

-  Ui.c

-  Ui.h

-  R8Lib.c

-  R8Lib.h

-  Colors.h

-

-

-[Packages]

-  MdePkg/MdePkg.dec

-  MdeModulePkg/MdeModulePkg.dec

-

-

-[LibraryClasses]

-  MemoryAllocationLib

-  BaseLib

-  UefiBootServicesTableLib

-  UefiDriverEntryPoint

-  UefiRuntimeServicesTableLib

-  BaseMemoryLib

-  DebugLib

-  PrintLib

-  GraphicsLib

-  UefiIfrSupportLib

-  HiiLib

-

-[Protocols]

-  gEfiPrintProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED

-  gEfiHiiConfigAccessProtocolGuid

-  gEfiHiiStringProtocolGuid

-  gEfiFormBrowser2ProtocolGuid

-  gEfiHiiConfigRoutingProtocolGuid

-  gEfiHiiDatabaseProtocolGuid

-  gEfiUnicodeCollation2ProtocolGuid

-

-[Depex]

-  gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid

-

diff --git a/MdeModulePkg/Universal/iScsi/IScsi.inf b/MdeModulePkg/Universal/iScsi/IScsi.inf
index 73cd61f..0e4569c 100644
--- a/MdeModulePkg/Universal/iScsi/IScsi.inf
+++ b/MdeModulePkg/Universal/iScsi/IScsi.inf
@@ -78,7 +78,7 @@
   DebugLib

   PrintLib

   HiiLib

-  UefiIfrSupportLib

+  IfrSupportLib

   NetLib

 

 [Protocols]

diff --git a/MdeModulePkg/Universal/iScsi/IScsiConfig.h b/MdeModulePkg/Universal/iScsi/IScsiConfig.h
index b694b7b..aab488f 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiConfig.h
+++ b/MdeModulePkg/Universal/iScsi/IScsiConfig.h
@@ -25,7 +25,7 @@ Abstract:
 //#include "EfiDriverLib.h"

 //#include "Base.h"

 #include <Library/HiiLib.h>

-#include <Library/UefiIfrSupportLib.h>

+#include <Library/IfrSupportLib.h>

 #include <Library/DebugLib.h>

 #include <Library/BaseLib.h>

 //#include "EfiPrintLib.h"