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

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.

This commit applies these files consistently within OvmfPkg.

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>

12 files changed, 53 insertions, 225 deletions

diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
index 5180e81f36..5aab790316 100644
--- a/OvmfPkg/Bhyve/BhyveX64.dsc
+++ b/OvmfPkg/Bhyve/BhyveX64.dsc
@@ -35,6 +35,11 @@
 !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc

 

   #

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

+  #

+  DEFINE BUILD_SHELL             = TRUE

+

+  #

   # Network definition

   #

   DEFINE NETWORK_TLS_ENABLE             = FALSE

@@ -223,7 +228,8 @@
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

 !endif

 

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

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

+

   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf

   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf

@@ -761,40 +767,7 @@
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf

 

-!if $(TOOL_CHAIN_TAG) != "XCODE5"

-!if $(NETWORK_ENABLE) == TRUE

-  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

-    <PcdsFixedAtBuild>

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-  }

-!endif

-!endif

-  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

-      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

 

 !if $(SECURE_BOOT_ENABLE) == TRUE

   SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf
index e2219d24d3..715ae883fb 100644
--- a/OvmfPkg/Bhyve/BhyveX64.fdf
+++ b/OvmfPkg/Bhyve/BhyveX64.fdf
@@ -269,12 +269,7 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf

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

 

-!if $(TOOL_CHAIN_TAG) != "XCODE5"

-!if $(NETWORK_ENABLE) == TRUE

-INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

-!endif

-!endif

-INF  ShellPkg/Application/Shell/Shell.inf

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

 

 INF MdeModulePkg/Logo/LogoDxe.inf

 

diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index 06dd32a30a..1223e6f6a1 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -36,6 +36,11 @@
 !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc

 

   #

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

+  #

+  DEFINE BUILD_SHELL             = TRUE

+

+  #

   # Network definition

   #

   DEFINE NETWORK_TLS_ENABLE             = FALSE

@@ -237,7 +242,8 @@
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

 !endif

 

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

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

+

   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf

   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf

@@ -842,52 +848,7 @@
 !include NetworkPkg/NetworkComponents.dsc.inc

 !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc

 

-!if $(TOOL_CHAIN_TAG) != "XCODE5"

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

-  }

-!endif

-  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

-      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

 

 !if $(SECURE_BOOT_ENABLE) == TRUE

   SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf
index 7af6fe6b64..3a29ca130f 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.fdf
+++ b/OvmfPkg/CloudHv/CloudHvX64.fdf
@@ -288,14 +288,7 @@ INF  FatPkg/EnhancedFatDxe/Fat.inf
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf

 INF  OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf

 

-!if $(TOOL_CHAIN_TAG) != "XCODE5"

-!if $(NETWORK_ENABLE) == TRUE

-INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

-INF  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf

-!endif

-INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

-!endif

-INF  ShellPkg/Application/Shell/Shell.inf

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

 

 INF MdeModulePkg/Logo/LogoDxe.inf

 

diff --git a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc
index 4075688e41..e8f4f42b33 100644
--- a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc
+++ b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc
@@ -33,6 +33,9 @@
       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

diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc
index 38f69747b0..eef89be88e 100644
--- a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc
+++ b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc
@@ -2,6 +2,10 @@
 #    SPDX-License-Identifier: BSD-2-Clause-Patent

 ##

 

+#

+# Built shell can be useful even when not included here, and is used in CI:

+# https://github.com/tianocore/edk2/commit/bc982869dd3e69ffd374fd968d378b5d954f66e8

+#

 !if $(BUILD_SHELL) == TRUE && $(SECURE_BOOT_ENABLE) == FALSE

 

 !if $(TOOL_CHAIN_TAG) != "XCODE5"

diff --git a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
index b3978e5946..8fa0aa8705 100644
--- a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
+++ b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
@@ -35,6 +35,11 @@
   DEFINE TPM2_CONFIG_ENABLE      = FALSE

 

   #

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

+  #

+  DEFINE BUILD_SHELL             = TRUE

+

+  #

   # Network definition

   #

   DEFINE NETWORK_IP6_ENABLE              = FALSE

@@ -168,6 +173,8 @@
   BaseCryptLib                     | CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

   RngLib                           | MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf

 

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

+

 !if $(HTTP_BOOT_ENABLE) == TRUE

   HttpLib                          | MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf

 !endif

@@ -657,28 +664,6 @@
   }

 

   #

-  #app

+  # UEFI application (Shell Embedded Boot Loader)

   #

-  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

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

-!if ($(NETWORK_ENABLE) == TRUE) AND ($(NETWORK_IP4_ENABLE) == TRUE)

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

-!endif

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

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

-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

-      SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.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

diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index b3c9a362d8..9e1e2ba852 100644
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -33,6 +33,11 @@
   DEFINE SOURCE_DEBUG_ENABLE     = FALSE

 

   #

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

+  #

+  DEFINE BUILD_SHELL             = TRUE

+

+  #

   # Network definition

   #

   DEFINE NETWORK_TLS_ENABLE             = FALSE

@@ -214,7 +219,8 @@
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

 !endif

 

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

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

+

   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf

   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf

@@ -697,52 +703,7 @@
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf

 

-!if $(TOOL_CHAIN_TAG) != "XCODE5"

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

-  }

-!endif

-  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

-      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

 

   OvmfPkg/PlatformDxe/Platform.inf

   OvmfPkg/AmdSevDxe/AmdSevDxe.inf {

diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf
index 924ce28252..804481303c 100644
--- a/OvmfPkg/OvmfXen.fdf
+++ b/OvmfPkg/OvmfXen.fdf
@@ -305,14 +305,7 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf

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

 

-!if $(TOOL_CHAIN_TAG) != "XCODE5"

-!if $(NETWORK_ENABLE) == TRUE

-INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

-INF  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf

-!endif

-INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

-!endif

-INF  ShellPkg/Application/Shell/Shell.inf

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

 

 INF MdeModulePkg/Logo/LogoDxe.inf

 

diff --git a/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc b/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
index 0f2a082f53..19a1dcc436 100644
--- a/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
+++ b/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
@@ -51,7 +51,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

   PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

@@ -287,49 +289,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

-  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

 

   #

   # ACPI Support

diff --git a/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc b/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
index 5cb2a0a5bb..55ce41aca4 100644
--- a/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
+++ b/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
@@ -37,6 +37,11 @@
   DEFINE DEBUG_ON_SERIAL_PORT    = TRUE

 

   #

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

+  #

+  DEFINE BUILD_SHELL             = TRUE

+

+  #

   # Network definition

   #

   DEFINE NETWORK_IP6_ENABLE             = FALSE

diff --git a/OvmfPkg/RiscVVirt/RiscVVirtQemu.fdf b/OvmfPkg/RiscVVirt/RiscVVirtQemu.fdf
index b07160bf9b..6729e6668b 100644
--- a/OvmfPkg/RiscVVirt/RiscVVirtQemu.fdf
+++ b/OvmfPkg/RiscVVirt/RiscVVirtQemu.fdf
@@ -129,12 +129,7 @@ INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf
 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

-INF  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf

-!endif

-INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

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

 

 #

 # Bds