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.dsc

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 2b35027..6373ecf 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -302,12 +302,8 @@
   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2

 !endif

 

-!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

 

 [PcdsFixedAtBuild.X64]

@@ -511,7 +507,7 @@
   OvmfPkg/Csm/Csm16/Csm16.inf

 !endif

 

-!if $(BUILD_NEW_SHELL)

+!ifndef $(USE_OLD_SHELL)

   ShellPkg/Application/Shell/Shell.inf {

     <LibraryClasses>

       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf