summaryrefslogtreecommitdiff
path: root/OvmfPkg/OvmfPkgX64.fdf
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2013-08-23 18:45:47 +0000
committerjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>2013-08-23 18:45:47 +0000
commit9bef3cdc8a9d9f9344bd9cb94af3bbdc4ec5ed4d (patch)
treedbffb5f3791a80cc40a6ff0adc129cf78ffcc857 /OvmfPkg/OvmfPkgX64.fdf
parent8f12aa7e579b0d5a5dcb7437d181110b52abd719 (diff)
downloadedk2-platforms-9bef3cdc8a9d9f9344bd9cb94af3bbdc4ec5ed4d.tar.xz
OvmfPkg: Build and use the UEFI shell by default
Previously OVMF included the older EFI shell binary when building. Now we will build and use the UEFI shell (ShellPkg) instead. v2: * Don't bother building UEFI shell when USE_OLD_SHELL is defined * Fix errors in OvmfPkgIa32X64.fdf Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14600 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'OvmfPkg/OvmfPkgX64.fdf')
-rw-r--r--OvmfPkg/OvmfPkgX64.fdf6
1 files changed, 1 insertions, 5 deletions
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 98fe7d0665..a7c9bcd6a3 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -234,15 +234,11 @@ INF RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf
INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
-!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