INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
INF RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
-INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
-INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
\r
INF FatPkg/EnhancedFatDxe/Fat.inf\r
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
\r
-!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
+!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE\r
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf\r
!endif\r
+INF OvmfPkg/AmdSev/Grub/Grub.inf\r
+!if $(BUILD_SHELL) == TRUE\r
INF ShellPkg/Application/Shell/Shell.inf\r
+!endif\r
\r
INF MdeModulePkg/Logo/LogoDxe.inf\r
\r