Remove EdkShellBinPkg in OvmfPkgIa32.fdf,
OvmfPkg/OvmfPkgIa32X64.fdf amd OvmfPkg/OvmfPkgX64.fdf.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108
v2: Remove USE_OLD_SHELL in DSC and FDF because it will be
unnecessary to use it.
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
!endif\r
\r
gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
!endif\r
\r
-!ifndef $(USE_OLD_SHELL)\r
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
OvmfPkg/Csm/Csm16/Csm16.inf\r
!endif\r
\r
OvmfPkg/Csm/Csm16/Csm16.inf\r
!endif\r
\r
-!ifndef $(USE_OLD_SHELL)\r
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
<PcdsFixedAtBuild>\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
<PcdsFixedAtBuild>\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000\r
}\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000\r
}\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
INF FatPkg/EnhancedFatDxe/Fat.inf\r
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
\r
INF FatPkg/EnhancedFatDxe/Fat.inf\r
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
\r
-!ifndef $(USE_OLD_SHELL)\r
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
INF ShellPkg/Application/Shell/Shell.inf\r
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
INF ShellPkg/Application/Shell/Shell.inf\r
-!else\r
-INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
-!endif\r
\r
INF MdeModulePkg/Logo/LogoDxe.inf\r
\r
\r
INF MdeModulePkg/Logo/LogoDxe.inf\r
\r
gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
!endif\r
\r
gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
!endif\r
\r
-!ifndef $(USE_OLD_SHELL)\r
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
OvmfPkg/Csm/Csm16/Csm16.inf\r
!endif\r
\r
OvmfPkg/Csm/Csm16/Csm16.inf\r
!endif\r
\r
-!ifndef $(USE_OLD_SHELL)\r
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
<PcdsFixedAtBuild>\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
<PcdsFixedAtBuild>\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000\r
}\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000\r
}\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
INF FatPkg/EnhancedFatDxe/Fat.inf\r
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
\r
INF FatPkg/EnhancedFatDxe/Fat.inf\r
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
\r
-!ifndef $(USE_OLD_SHELL)\r
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
INF ShellPkg/Application/Shell/Shell.inf\r
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
INF ShellPkg/Application/Shell/Shell.inf\r
-!else\r
-INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf\r
-!endif\r
\r
INF MdeModulePkg/Logo/LogoDxe.inf\r
\r
\r
INF MdeModulePkg/Logo/LogoDxe.inf\r
\r
gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
!endif\r
\r
gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
!endif\r
\r
-!ifndef $(USE_OLD_SHELL)\r
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
OvmfPkg/Csm/Csm16/Csm16.inf\r
!endif\r
\r
OvmfPkg/Csm/Csm16/Csm16.inf\r
!endif\r
\r
-!ifndef $(USE_OLD_SHELL)\r
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
<PcdsFixedAtBuild>\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
<PcdsFixedAtBuild>\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000\r
}\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000\r
}\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
INF FatPkg/EnhancedFatDxe/Fat.inf\r
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
\r
INF FatPkg/EnhancedFatDxe/Fat.inf\r
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
\r
-!ifndef $(USE_OLD_SHELL)\r
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
INF ShellPkg/Application/Shell/Shell.inf\r
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
INF ShellPkg/Application/Shell/Shell.inf\r
-!else\r
-INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
-!endif\r
\r
INF MdeModulePkg/Logo/LogoDxe.inf\r
\r
\r
INF MdeModulePkg/Logo/LogoDxe.inf\r
\r