From 9bef3cdc8a9d9f9344bd9cb94af3bbdc4ec5ed4d Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 23 Aug 2013 18:45:47 +0000 Subject: [PATCH] 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/OvmfPkgIa32.dsc | 8 ++------ OvmfPkg/OvmfPkgIa32.fdf | 6 +----- OvmfPkg/OvmfPkgIa32X64.dsc | 8 ++------ OvmfPkg/OvmfPkgIa32X64.fdf | 6 +----- OvmfPkg/OvmfPkgX64.dsc | 8 ++------ OvmfPkg/OvmfPkgX64.fdf | 6 +----- 6 files changed, 9 insertions(+), 33 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 5f10d60fab..8eb45b3a0a 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -297,12 +297,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 !if $(SECURE_BOOT_ENABLE) == TRUE @@ -504,7 +500,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 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 270da67e9f..df4f2276ee 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.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 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 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 2bd31f6b82..d93a7ff2e5 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -234,15 +234,11 @@ INF RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf 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 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 3159bae2d9..2530a489df 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.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 !if $(SECURE_BOOT_ENABLE) == TRUE @@ -509,7 +505,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 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 -- 2.39.2