summaryrefslogtreecommitdiffstats
path: root/EmulatorPkg/EmulatorPkg.fdf
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2016-03-01 15:39:43 -0800
committerJordan Justen <jordan.l.justen@intel.com>2016-03-02 16:05:16 -0800
commit9fe7c61bc69e94ed9f6c0a826a84fb61f03d40ce (patch)
treeb935e4457e553d538d45688bec009ba351b22182 /EmulatorPkg/EmulatorPkg.fdf
parentdb54ae0845e321e4cce35f0ccbb16b7fcb2b57db (diff)
downloadedk2-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.fdf')
-rw-r--r--EmulatorPkg/EmulatorPkg.fdf6
1 files changed, 1 insertions, 5 deletions
diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
index 302d81c807..8ac9098463 100644
--- a/EmulatorPkg/EmulatorPkg.fdf
+++ b/EmulatorPkg/EmulatorPkg.fdf
@@ -210,15 +210,11 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
!endif
-!if $(BUILD_NEW_SHELL)
+!ifndef $(USE_OLD_SHELL)
INF ShellPkg/Application/Shell/Shell.inf
!else
-!if $(USE_NEW_SHELL)
-INF RuleOverride = BINARY ShellBinPkg/UefiShell/UefiShell.inf
-!else
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
!endif
-!endif
FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
SECTION RAW = MdeModulePkg/Logo/Logo.bmp