From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web11.176.1631794854554898581 for ; Thu, 16 Sep 2021 05:20:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LDVbRDbO; spf=pass (domain: redhat.com, ip: 216.205.24.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631794853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=atwdQnZD18zaokm622kkYKWTM3NLc4/MAT1xf0twHuA=; b=LDVbRDbO5in5QAHmsvIIYOutzsFo/bdNOAWjecaAo9MkQIUqN03N1fEzj1v8sOfVyHcvB1 eAQeH3tXXzIuHAfNJvV4MuFbeoNV2YuaxFOoh79pvtSFjsYKn7piJhjU4PmoCIT7G2/2SX VuQs2zhhgIo4g0JsaLKGA2OI+TJ2+Xg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-91-64C9ZK9rO_ar3s_1dgIUCA-1; Thu, 16 Sep 2021 08:20:52 -0400 X-MC-Unique: 64C9ZK9rO_ar3s_1dgIUCA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE2DB804742; Thu, 16 Sep 2021 12:20:50 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A30610016F2; Thu, 16 Sep 2021 12:20:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 89401180093E; Thu, 16 Sep 2021 14:20:27 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jordan Justen , Gerd Hoffmann , Jiewen Yao , Julien Grall , Stefan Berger , Leif Lindholm , Ard Biesheuvel , Andrew Fish , Michael D Kinney , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony Perard , Jiewen Yao Subject: [PATCH v4 07/20] OvmfPkg/Microvm: no csm Date: Thu, 16 Sep 2021 14:20:14 +0200 Message-Id: <20210916122027.2352393-8-kraxel@redhat.com> In-Reply-To: <20210916122027.2352393-1-kraxel@redhat.com> References: <20210916122027.2352393-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Guests depending on BIOS will probably not work that well with microvm due to legacy hardware being not available. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3599 Signed-off-by: Gerd Hoffmann Acked-by: Jiewen Yao --- OvmfPkg/Microvm/MicrovmX64.dsc | 26 -------------------------- OvmfPkg/Microvm/MicrovmX64.fdf | 6 ------ 2 files changed, 32 deletions(-) diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 646ce5f0d8cf..e90428ea76a9 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -443,9 +443,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE -!ifdef $(CSM_ENABLE) - gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE -!endif [PcdsFixedAtBuild] gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 @@ -567,11 +564,7 @@ [PcdsDynamicDefault] gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio32Base|0x0 gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio32Size|0x0 gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Base|0x0 -!ifdef $(CSM_ENABLE) - gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size|0x0 -!else gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size|0x800000000 -!endif gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|0 @@ -685,10 +678,6 @@ [Components] MdeModulePkg/Universal/BdsDxe/BdsDxe.inf { XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf -!ifdef $(CSM_ENABLE) - NULL|OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf - NULL|OvmfPkg/Csm/LegacyBootManagerLib/LegacyBootManagerLib.inf -!endif } MdeModulePkg/Logo/LogoDxe.inf MdeModulePkg/Application/UiApp/UiApp.inf { @@ -696,10 +685,6 @@ [Components] NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf -!ifdef $(CSM_ENABLE) - NULL|OvmfPkg/Csm/LegacyBootManagerLib/LegacyBootManagerLib.inf - NULL|OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf -!endif } OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf { @@ -753,9 +738,7 @@ [Components] MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf -!ifndef $(CSM_ENABLE) OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf -!endif OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf OvmfPkg/VirtioGpuDxe/VirtioGpu.inf @@ -812,15 +795,6 @@ [Components] MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf -!ifdef $(CSM_ENABLE) - OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf { - - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - } - OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf - OvmfPkg/Csm/Csm16/Csm16.inf -!endif - !if $(TOOL_CHAIN_TAG) != "XCODE5" ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index 3182950277ea..660519a25a19 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -319,13 +319,7 @@ [FV.DXEFV] INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf -!ifdef $(CSM_ENABLE) -INF OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf -INF OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf -INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf -!else INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf -!endif INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf -- 2.31.1