diff options
author | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-03-16 13:57:11 +0800 |
---|---|---|
committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-03-17 12:25:14 +0800 |
commit | 46d5189bdeacd7f640aa13589635b262d7230e35 (patch) | |
tree | 98ef3eed775b0976976fac9df40351572fcc2adc | |
parent | 7c6f0d14c3db1ade3e1ef701e39babd7a314eb56 (diff) | |
download | edk2-46d5189bdeacd7f640aa13589635b262d7230e35.tar.gz edk2-46d5189bdeacd7f640aa13589635b262d7230e35.tar.bz2 edk2-46d5189bdeacd7f640aa13589635b262d7230e35.zip |
Nt32Pkg: Use Shell source code directly
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
-rw-r--r-- | Nt32Pkg/Nt32Pkg.dsc | 20 | ||||
-rw-r--r-- | Nt32Pkg/Nt32Pkg.fdf | 2 |
2 files changed, 20 insertions, 2 deletions
diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 8927dcd125..fa3446be06 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -115,7 +115,7 @@ CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
- SortLib|MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf
+ SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
#
# UEFI & PI
#
@@ -522,6 +522,24 @@ NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
}
MdeModulePkg/Logo/LogoDxe.inf
+ ShellPkg/Application/Shell/Shell.inf {
+ <PcdsFixedAtBuild>
+ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+ <LibraryClasses>
+ NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+ NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+ NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+ NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+ NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+ NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+ NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+ NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+ ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+ ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+ HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+ BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
+ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+ }
###################################################################################################
#
diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf index 282e59c7f1..ffa4b0a4a5 100644 --- a/Nt32Pkg/Nt32Pkg.fdf +++ b/Nt32Pkg/Nt32Pkg.fdf @@ -289,7 +289,7 @@ INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf #
################################################################################
!ifndef $(USE_OLD_SHELL)
-INF ShellBinPkg/UefiShell/UefiShell.inf
+INF ShellPkg/Application/Shell/Shell.inf
!else
INF EdkShellBinPkg/FullShell/FullShell.inf
!endif
|