diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2016-03-01 15:39:43 -0800 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2016-03-02 16:05:16 -0800 |
| commit | 9fe7c61bc69e94ed9f6c0a826a84fb61f03d40ce (patch) | |
| tree | b935e4457e553d538d45688bec009ba351b22182 /EmulatorPkg/EmulatorPkg.dsc | |
| parent | db54ae0845e321e4cce35f0ccbb16b7fcb2b57db (diff) | |
| download | edk2-9fe7c61bc69e94ed9f6c0a826a84fb61f03d40ce.tar.gz edk2-9fe7c61bc69e94ed9f6c0a826a84fb61f03d40ce.tar.bz2 edk2-9fe7c61bc69e94ed9f6c0a826a84fb61f03d40ce.zip | |
EmulatorPkg: Use UEFI Shell by default
Now we will build the UEFI shell from source and include it in the
EmulatorPkg build.
USE_OLD_SHELL can be defined on the command line to force using the
old shell.
Fixes: https://github.com/tianocore/edk2/issues/60
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'EmulatorPkg/EmulatorPkg.dsc')
| -rw-r--r-- | EmulatorPkg/EmulatorPkg.dsc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 27a78d5570..73bb64cb92 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -195,12 +195,8 @@ gEmulatorPkgTokenSpaceGuid.PcdEmuMemorySize|L"64!64"
-!if $(BUILD_NEW_SHELL)
+!ifndef $(USE_OLD_SHELL)
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
-!else
-!if $(USE_NEW_SHELL)
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
-!endif
!endif
#define BOOT_WITH_FULL_CONFIGURATION 0x00
@@ -381,7 +377,7 @@ FatPkg/EnhancedFatDxe/Fat.inf
!endif
-!if $(BUILD_NEW_SHELL)
+!ifndef $(USE_OLD_SHELL)
ShellPkg/Application/Shell/Shell.inf {
<LibraryClasses>
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -392,14 +388,16 @@ NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+ NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
- FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-# MemoryAllocationLib|EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf
# SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
# SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
+ BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
+ IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
|