commit 9bef3cdc8a9d9f9344bd9cb94af3bbdc4ec5ed4d
author Jordan Justen <jordan.l.justen@intel.com> Fri Aug 23 18:45:47 2013 +0000
committer jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> Fri Aug 23 18:45:47 2013 +0000
tree dbffb5f3791a80cc40a6ff0adc129cf78ffcc857
parent 8f12aa7e579b0d5a5dcb7437d181110b52abd719

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

OvmfPkg/OvmfPkgIa32X64.fdf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 2bd31f6..d93a7ff 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -234,15 +234,11 @@
 

 INF  RuleOverride = BINARY USE = X64 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 USE = X64 ShellBinPkg/UefiShell/UefiShell.inf

-!else

 INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf

 !endif

-!endif

 

 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {

   SECTION RAW = MdeModulePkg/Logo/Logo.bmp