ArmVirtPkg: Use OvmfPkg/Include/*/Shell*.inc

While fixing https://github.com/tianocore/edk2/pull/6092 (the
fact that some OvmfPkg and ArmVirtPkg platforms included residual
NetworkPkg components even when compiled with -D NETWORK_ENABLE=0),
it was noted that OvmfPkg/Include/*/Shell*.inc files which apply
the required fix logic are available and already used in some
OvmfPkg platforms.

A previous commit applied these files consistently within OvmfPkg.
This commit applies these files within ArmVirtPkg.

This has the side effect that some platforms now include one or
more of HttpDynamicCommand, VariablePolicyDynamicCommand and
LinuxInitrdDynamicShellCommand when they previously did not.
This fixes unintentional drift between platforms, and provides
additional shell commands which may be useful in some cases.

Signed-off-by: Mike Beaton <mjsbeaton@gmail.com>

5 files changed, 14 insertions, 73 deletions

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 5bd4712bd0..10501fced3 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -9,6 +9,12 @@
 #

 

 [Defines]

+

+  #

+  # Shell can be useful for debugging but should not be enabled for production

+  #

+  DEFINE BUILD_SHELL             = TRUE

+

   DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F

 

 !if $(TARGET) != NOOPT

@@ -66,7 +72,9 @@
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

+

+!include OvmfPkg/Include/Dsc/ShellLibs.dsc.inc

+

   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

 

@@ -395,53 +403,7 @@
   #

   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf

 

-!if $(NETWORK_ENABLE) == TRUE

-  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

-    <PcdsFixedAtBuild>

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-  }

-  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {

-    <PcdsFixedAtBuild>

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-  }

-!endif

-  ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf {

-    <PcdsFixedAtBuild>

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-  }

-  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {

-    <PcdsFixedAtBuild>

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-  }

-  ShellPkg/Application/Shell/Shell.inf {

-    <LibraryClasses>

-      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

-      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf

-!if $(ACPIVIEW_ENABLE) == TRUE

-      NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf

-!endif

-      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf

-!if $(NETWORK_ENABLE) == TRUE

-!if $(NETWORK_IP4_ENABLE) == TRUE

-      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf

-!endif

-!if $(NETWORK_IP6_ENABLE) == TRUE

-      NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf

-!endif

-!endif

-      HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf

-      PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

-      BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf

-

-    <PcdsFixedAtBuild>

-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-      gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000

-  }

+!include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc

 

 [Components.AARCH64]

   #

diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf
index 77005c7147..ef39ccb877 100644
--- a/ArmVirtPkg/ArmVirtCloudHv.fdf
+++ b/ArmVirtPkg/ArmVirtCloudHv.fdf
@@ -166,13 +166,7 @@ READ_LOCK_STATUS   = TRUE
   #

   # UEFI application (Shell Embedded Boot Loader)

   #

-  INF ShellPkg/Application/Shell/Shell.inf

-!if $(NETWORK_ENABLE) == TRUE

-  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

-  INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf

-!endif

-  INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf

-  INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

+!include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc

 

   #

   # Bds

diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf
index ed2804fc54..1ca388084e 100644
--- a/ArmVirtPkg/ArmVirtKvmTool.fdf
+++ b/ArmVirtPkg/ArmVirtKvmTool.fdf
@@ -173,10 +173,7 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf

   INF OvmfPkg/VirtioRngDxe/VirtioRng.inf

 

-  INF ShellPkg/Application/Shell/Shell.inf

-!if $(NETWORK_ENABLE) == TRUE

-  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

-!endif

+!include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc

 

   #

   # Bds

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index b97a2c706b..5720bd28c8 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -101,13 +101,7 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioRngDxe/VirtioRng.inf

   INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf

 

-  INF ShellPkg/Application/Shell/Shell.inf

-!if $(NETWORK_ENABLE) == TRUE

-  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

-  INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf

-!endif

-  INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf

-  INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

+!include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc

 

   #

   # Bds

diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index 5e15cd070e..15efa07813 100644
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -177,13 +177,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

   INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf

 

-  INF ShellPkg/Application/Shell/Shell.inf

-!if $(NETWORK_ENABLE) == TRUE

-  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

-  INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf

-!endif

-  INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf

-  INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

+!include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc

 

   #

   # Bds