commit 07c7e683607c295950edb3652a9edd549b0dd753
author Pedro Falcato <pedro.falcato@gmail.com> Thu Jun 01 18:27:38 2023 +0100
committer mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Thu Jun 01 18:08:33 2023 +0000
tree 5db885c43085aaf7b23d576944daee6044573a27
parent 069d4035874cfaeb650d42a95f0841d25f185c6e

OvmfPkg/AmdSev: Replace the OVMF-specific SataControllerDxe

Replace the OVMF-specific SataControllerDxe (to be later removed) with
the generic, MdeModulePkg one, for the AmdSev platform.

Signed-off-by: Pedro Falcato <pedro.falcato@gmail.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>

OvmfPkg/AmdSev/AmdSevX64.dsc

diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index dfcef0e..d24909e 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -674,7 +674,7 @@
   MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf

   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

-  OvmfPkg/SataControllerDxe/SataControllerDxe.inf

+  MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf

   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf

   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf

   MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf

OvmfPkg/AmdSev/AmdSevX64.fdf

diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
index fec0846..463bd3e 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -250,7 +250,7 @@
 INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

 INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

 INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

-INF  OvmfPkg/SataControllerDxe/SataControllerDxe.inf

+INF  MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf

 INF  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf

 INF  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf

 INF  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf