From 9bef3cdc8a9d9f9344bd9cb94af3bbdc4ec5ed4d Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 23 Aug 2013 18:45:47 +0000 Subject: 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 Reviewed-by: Laszlo Ersek git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14600 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/OvmfPkgIa32X64.dsc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'OvmfPkg/OvmfPkgIa32X64.dsc') diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 2b35027b6a..6373ecfebe 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 { ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf -- cgit v1.2.3