On 1/24/24 17:38, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
> ---
> OvmfPkg/IntelTdx/IntelTdxX64.dsc | 33 +++-----------------------------
> OvmfPkg/IntelTdx/IntelTdxX64.fdf | 9 ++-------
> 2 files changed, 5 insertions(+), 37 deletions(-)
>
> diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> index 82e3e41cfc57..57072116e43e 100644
> --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> @@ -201,10 +201,6 @@ [LibraryClasses]
>
> VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
>
> VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
>
> -!if $(BUILD_SHELL) == TRUE
> - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> -!endif
> - ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
>
> S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
> SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
>
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
> @@ -212,6 +208,8 @@ [LibraryClasses]
>
> Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf
>
> TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
>
> +!include OvmfPkg/Include/Dsc/ShellLibs.dsc.inc
> +
> [LibraryClasses.common]
> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> CcExitLib|OvmfPkg/Library/CcExitLib/CcExitLib.inf
> @@ -717,32 +715,7 @@ [Components]
> MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
> MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
>
> -!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
> - OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
> - <PcdsFixedAtBuild>
> - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> - }
> -!endif
> -!if $(BUILD_SHELL) == TRUE
> - 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
> -
> 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
> - }
> -!endif
> +!include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc
>
> !if $(SECURE_BOOT_ENABLE) == TRUE
>
> SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
> diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf
> b/OvmfPkg/IntelTdx/IntelTdxX64.fdf
> index e844a0988d68..f3b5126254c6 100644
> --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf
> +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf
> @@ -307,13 +307,6 @@ [FV.NCCFV]
> INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
> INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
>
> -!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
> -INF
> OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
> -!endif
> -!if $(BUILD_SHELL) == TRUE
> -INF ShellPkg/Application/Shell/Shell.inf
> -!endif
> -
> INF MdeModulePkg/Logo/LogoDxe.inf
>
> #
> @@ -332,6 +325,8 @@ [FV.NCCFV]
> INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
> INF OvmfPkg/PlatformDxe/Platform.inf
>
> +!include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc
> +
>
> ################################################################################
>
> [FV.FVMAIN_COMPACT]
Again, please document in the commit message that this brings some new
stuff (shell commands) to the platform.
Acked-by: Laszlo Ersek <ler...@redhat.com>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114435): https://edk2.groups.io/g/devel/message/114435
Mute This Topic: https://groups.io/mt/103935351/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe:
https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
