UEFI HII:

1) Make all folder and file consistent.
2) Enable UEFI HII for the defualt build Nt32Pkg/Nt32Pkg.dsc tip.



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

6 files changed, 43 insertions, 101 deletions

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 581bce2..f4a7d48 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -1,10 +1,10 @@
 #/** @file

-# EFI/Framework Emulation Platform

+# EFI/Framework Emulation Platform with UEFI HII interface supported.

 #

 # The Emulation Platform can be used to debug individual modules, prior to creating

 #    a real platform. This also provides an example for how an DSC is created.

 #

-# Copyright (c) 2006 - 2007, Intel Corporation

+# Copyright (c) 2006 - 2008, Intel Corporation

 #

 #  All rights reserved. This program and the accompanying materials

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

@@ -31,7 +31,7 @@
   BUILD_TARGETS                  = DEBUG

   SKUID_IDENTIFIER               = DEFAULT

   FLASH_DEFINITION               = Nt32Pkg/Nt32Pkg.fdf

- 

+

 

 ################################################################################

 #

@@ -60,18 +60,19 @@
   PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf

   PciIncompatibleDeviceSupportLib|IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf

   CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf

-  FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf

-  GraphicsLib|IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf

+  GraphicsLib|MdeModulePkg/Library/GraphicsLib/GraphicsLib.inf

   FvbServiceLib|MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf

   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

   UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf

-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf

-  HiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf

+  HiiLib|MdePkg/Library/HiiLib/HiiLib.inf

   S3Lib|MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf

   RecoveryLib|MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf

-  UefiIfrSupportLib|MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf

+  IfrSupportLib|MdeModulePkg/Library/IfrSupportLib/IfrSupportLib.inf

   GenericBdsLib|MdeModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

+  PlatformBdsLib|Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

+  DxePiLib|MdePkg/Library/DxePiLib/DxePiLib.inf

+  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

 

 [LibraryClasses.common.BASE]

   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

@@ -104,7 +105,6 @@
 [LibraryClasses.common.DXE_SMM_DRIVER]

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

   ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf

   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

@@ -159,7 +159,6 @@
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf

   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

@@ -177,7 +176,6 @@
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf

   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

   ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

@@ -194,7 +192,6 @@
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf

   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

   ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

@@ -210,7 +207,6 @@
 [LibraryClasses.common.UEFI_APPLICATION]

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

   ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf

   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

@@ -276,10 +272,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleInputError|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR

   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleOutputError|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR

   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultTimeout|0x0008

-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangCodes|"engfra"|VOID*|7

-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang|"eng"|VOID*|4

-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes|"en;fr"|VOID*|6

-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang|"en"|VOID*|3

   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueEfiWatchDogTimerExpired|0x00011003

   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMemoryTestStarted|0x00051006

   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueSetVirtualAddressMap|0x03101004

@@ -372,7 +364,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0

 

-

 ################################################################################

 #

 # Components Section - list of all EDK II Modules needed by this Platform

@@ -422,10 +413,8 @@
   IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf

   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf

-  IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf

   Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf

   Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf

-  Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf

   MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf

   IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf

   Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf

@@ -442,7 +431,6 @@
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

-  IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf

   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

   IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition

@@ -453,7 +441,6 @@
   Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf

   Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf

   Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf

-  IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf

   MdeModulePkg/Application/HelloWorld/HelloWorld.inf

 

   #

@@ -471,61 +458,26 @@
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

   Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf

 

+  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf 

+  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf {

+    <LibraryClasses>

+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+  }

+  

 [BuildOptions]

-  DEBUG_*_IA32_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /ALIGN:4096 /SUBSYSTEM:CONSOLE

-  RELEASE_*_IA32_DLINK_FLAGS = /ALIGN:4096

-  *_*_IA32_CC_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D TIANO_RELEASE_VERSION=0x00080006

-

-

-

-

-#############################################################################################################

-# NOTE:

-# The following [Libraries.IA32] section is for building R8 module under the R9 tool chain.

-# If you want build R8 module for Nt32 platform, please uncomment [Libraries.IA32] section and

-# libraries used by that R8 module.

-# Currently, Nt32 platform do not has any R8 style module

-#  

-#

-#[Libraries.IA32]

-  #

-  # Libraries common to PEI and DXE

-  #

-  #  EdkCompatibilityPkg\Foundation\Efi\Guid\EfiGuidLib.inf

-  #  EdkCompatibilityPkg\Foundation\Framework\Guid\EdkFrameworkGuidLib.inf

-  #  EdkCompatibilityPkg\Foundation\Guid\EdkGuidLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\EfiCommonLib\EfiCommonLib.inf

-  #  EdkCompatibilityPkg\Foundation\Cpu\Pentium\CpuIA32Lib\CpuIA32Lib.inf

-  #  EdkCompatibilityPkg\Foundation\Cpu\Itanium\CpuIA64Lib\CpuIA64Lib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\CustomizedDecompress\CustomizedDecompress.inf

-  #  EdkCompatibilityPkg\Foundation\Library\CompilerStub\CompilerStubLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\Dxe\Hob\HobLib.inf

-

-  #

-  # PEI libraries

-  #

-  #  EdkCompatibilityPkg\Foundation\Framework\Ppi\EdkFrameworkPpiLib.inf

-  #  EdkCompatibilityPkg\Foundation\Ppi\EdkPpiLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\Pei\PeiLib\PeiLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\Pei\Hob\PeiHobLib.inf

-

-  #

-  # DXE libraries

-  #

-  #  EdkCompatibilityPkg\Foundation\Core\Dxe\ArchProtocol\ArchProtocolLib.inf

-  #  EdkCompatibilityPkg\Foundation\Efi\Protocol\EfiProtocolLib.inf

-  #  EdkCompatibilityPkg\Foundation\Framework\Protocol\EdkFrameworkProtocolLib.inf

-  #  EdkCompatibilityPkg\Foundation\Protocol\EdkProtocolLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiDriverLib\EfiDriverLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\RuntimeDxe\EfiRuntimeLib\EfiRuntimeLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\Dxe\Graphics\Graphics.inf

-  #  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiIfrSupportLib\EfiIfrSupportLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\Dxe\Print\PrintLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiScriptLib\EfiScriptLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiUiLib\EfiUiLib.inf

-

-  #

-  # Print/Graphics Library consume SetupBrowser Print Protocol

-  #

-  #  EdkCompatibilityPkg\Foundation\Library\Dxe\PrintLite\PrintLib.inf

-  #  EdkCompatibilityPkg\Foundation\Library\Dxe\GraphicsLite\Graphics.inf

+  DEBUG_ICC_IA32_DLINK_FLAGS                  = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE

+  DEBUG_VS2003_IA32_DLINK_FLAGS               = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE

+  DEBUG_MYTOOLS_IA32_DLINK_FLAGS              = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE

+  DEBUG_WINDDK3790x1830_IA32_DLINK_FLAGS      = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE

+  DEBUG_VS2005PRO_IA32_DLINK_FLAGS            = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE

+  DEBUG_MIXED_IA32_DLINK_FLAGS                = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE

+  RELEASE_ICC_IA32_DLINK_FLAGS                = /ALIGN:4096

+  RELEASE_VS2003_IA32_DLINK_FLAGS             = /ALIGN:4096

+  RELEASE_MYTOOLS_IA32_DLINK_FLAGS            = /ALIGN:4096

+  RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS    = /ALIGN:4096

+  RELEASE_VS2005PRO_IA32_DLINK_FLAGS          = /ALIGN:4096

+  RELEASE_MIXED_IA32_DLINK_FLAGS              = /ALIGN:4096

+  MSFT:DEBUG_*_IA32_DLINK_FLAGS = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE

+  MSFT:RELEASE_*_IA32_DLINK_FLAGS = /ALIGN:4096

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 175c712..5ad183c 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -1,4 +1,4 @@
-# This is NT32 FDF file

+# This is NT32 FDF file with UEFI HII features enabled

 #

 # Copyright (c) 2007, Intel Corporation

 #

@@ -161,10 +161,10 @@ INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
 INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf

 INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf

-INF  IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf

+INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 INF  Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf

 INF  Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf

-INF  Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf

+INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

 INF  MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf

 INF  IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf

 INF  Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf

@@ -181,7 +181,7 @@ INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
 INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

-INF  IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf

+INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

 INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

 INF  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

 INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition

@@ -192,7 +192,7 @@ INF  Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf
 INF  Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf

 INF  Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf

 INF  Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf

-INF  IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf

+INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf

 INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf

 

 ################################################################################

@@ -269,16 +269,6 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   

   }

 

-[Rule.Common.PEIM.TIANOCOMPRESSED]

-  FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {

-    PEI_DEPEX PEI_DEPEX Optional         |.depex

-    GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {

-      PE32      PE32                     |.efi

-      UI        STRING="$(MODULE_NAME)" Optional

-      VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-    }

-  }

-

 [Rule.Common.DXE_CORE]

   FILE DXE_CORE = $(NAMED_GUID) {

     COMPRESS PI_STD {

diff --git a/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.dsc b/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.dsc
index 358484b..6f6907d 100644
--- a/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.dsc
+++ b/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.dsc
@@ -71,7 +71,7 @@
   HiiLib|MdePkg/Library/HiiLib/HiiLib.inf

   S3Lib|MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf

   RecoveryLib|MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf

-  UefiIfrSupportLib|MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf

+  IfrSupportLib|MdeModulePkg/Library/IfrSupportLib/IfrSupportLib.inf

   GenericBdsLib|MdeModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

   PlatformBdsLib|Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

@@ -473,8 +473,8 @@
 

   #Nt32Pkg/UefiPlatformBdsDxe/UefiPlatformBdsDxe.inf

   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf 

-  MdeModulePkg/Universal/UefiHiiDatabaseDxe/UefiHiiDatabaseDxe.inf

-  MdeModulePkg/Universal/UefiSetupBrowserDxe/UefiSetupBrowserDxe.inf

+  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

   MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

diff --git a/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.fdf b/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.fdf
index 061d93d..5c130ce 100644
--- a/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.fdf
+++ b/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.fdf
@@ -161,7 +161,7 @@ INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
 INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf

 INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf

-INF  MdeModulePkg/Universal/UefiHiiDatabaseDxe/UefiHiiDatabaseDxe.inf

+INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 INF  Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf

 INF  Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf

 #INF  Nt32Pkg/UefiPlatformBdsDxe/UefiPlatformBdsDxe.inf 

@@ -182,7 +182,7 @@ INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
 INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

-INF  MdeModulePkg/Universal/UefiSetupBrowserDxe/UefiSetupBrowserDxe.inf

+INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

 INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

 INF  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

 INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition

diff --git a/Nt32Pkg/UefiPlatformBdsDxe/Generic/Bds.h b/Nt32Pkg/UefiPlatformBdsDxe/Generic/Bds.h
index 68070c7..988b96e 100644
--- a/Nt32Pkg/UefiPlatformBdsDxe/Generic/Bds.h
+++ b/Nt32Pkg/UefiPlatformBdsDxe/Generic/Bds.h
@@ -89,7 +89,7 @@ Revision History
 #include <Library/DevicePathLib.h>
 #include <Library/GenericBdsLib.h>
 #include <Library/GraphicsLib.h>
-#include <Library/UefiIfrSupportLib.h>
+#include <Library/IfrSupportLib.h>
 #include <Library/HiiLib.h>
 
 #include <Common/MaxBbsEntries.h>
diff --git a/Nt32Pkg/UefiPlatformBdsDxe/UefiPlatformBdsDxe.inf b/Nt32Pkg/UefiPlatformBdsDxe/UefiPlatformBdsDxe.inf
index 4e3ccd9..95dcc7f 100644
--- a/Nt32Pkg/UefiPlatformBdsDxe/UefiPlatformBdsDxe.inf
+++ b/Nt32Pkg/UefiPlatformBdsDxe/UefiPlatformBdsDxe.inf
@@ -107,7 +107,7 @@
   BaseMemoryLib

   DebugLib

   PrintLib

-  UefiIfrSupportLib

+  IfrSupportLib

   GenericBdsLib

   GraphicsLib

   HiiLib