diff options
| author | Mike Beaton <mjsbeaton@gmail.com> | 2024-09-13 09:28:39 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2025-01-16 23:06:40 +0000 |
| commit | cb672a8eb10ff48b385b53c5fd13e7f175efa94d (patch) | |
| tree | d1e152a774d017fc28735f9c9e3dc6592b72420d /ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | |
| parent | 076ef39ba2aaf8e917c49a076cd8d42523186485 (diff) | |
| download | edk2-cb672a8eb10ff48b385b53c5fd13e7f175efa94d.tar.gz | |
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>
Diffstat (limited to 'ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc')
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 8 |
1 files changed, 1 insertions, 7 deletions
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
|