The source code is copied verbatim, with the following two exceptions:
- the UNI files are dropped, together with the corresponding UNI
references in the INF file,
- the INF file receives a new FILE_GUID.
The OVMF DSC and FDF files are at once flipped to the cloned driver.
Cc: Jordan Justen <jordan.l.jus...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <ler...@redhat.com>
Regression-tested-by: Gabriel Somlo <so...@cmu.edu>
---
{PcAtChipsetPkg => OvmfPkg}/PciHostBridgeDxe/PciHostBridgeDxe.inf | 6 +-----
{PcAtChipsetPkg => OvmfPkg}/PciHostBridgeDxe/IoFifo.h | 0
{PcAtChipsetPkg => OvmfPkg}/PciHostBridgeDxe/PciHostBridge.h | 0
{PcAtChipsetPkg => OvmfPkg}/PciHostBridgeDxe/PciHostBridge.c | 0
{PcAtChipsetPkg => OvmfPkg}/PciHostBridgeDxe/PciRootBridgeIo.c | 0
OvmfPkg/OvmfPkgIa32.dsc | 2 +-
OvmfPkg/OvmfPkgIa32.fdf | 2 +-
OvmfPkg/OvmfPkgIa32X64.dsc | 2 +-
OvmfPkg/OvmfPkgIa32X64.fdf | 2 +-
OvmfPkg/OvmfPkgX64.dsc | 2 +-
OvmfPkg/OvmfPkgX64.fdf | 2 +-
{PcAtChipsetPkg => OvmfPkg}/PciHostBridgeDxe/Ia32/IoFifo.S | 0
{PcAtChipsetPkg => OvmfPkg}/PciHostBridgeDxe/Ia32/IoFifo.asm | 0
{PcAtChipsetPkg => OvmfPkg}/PciHostBridgeDxe/X64/IoFifo.S | 0
{PcAtChipsetPkg => OvmfPkg}/PciHostBridgeDxe/X64/IoFifo.asm | 0
15 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
b/OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
similarity index 85%
copy from PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
copy to OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
index be3622b..40f4c3c 100644
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+++ b/OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
@@ -18,8 +18,7 @@
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = PciHostBridge
- MODULE_UNI_FILE = PciHostBridge.uni
- FILE_GUID = 2383608E-C6D0-4e3e-858D-45DFAC3543D5
+ FILE_GUID = 311161C5-BFD9-4504-8016-213F2DAEDAF3
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
@@ -63,6 +62,3 @@ [Protocols]
[depex]
gEfiMetronomeArchProtocolGuid
-
-[UserExtensions.TianoCore."ExtraFiles"]
- PciHostBridgeExtra.uni
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/IoFifo.h
b/OvmfPkg/PciHostBridgeDxe/IoFifo.h
similarity index 100%
copy from PcAtChipsetPkg/PciHostBridgeDxe/IoFifo.h
copy to OvmfPkg/PciHostBridgeDxe/IoFifo.h
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.h
b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.h
similarity index 100%
copy from PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.h
copy to OvmfPkg/PciHostBridgeDxe/PciHostBridge.h
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c
b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
similarity index 100%
copy from PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c
copy to OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
b/OvmfPkg/PciHostBridgeDxe/PciRootBridgeIo.c
similarity index 100%
copy from PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
copy to OvmfPkg/PciHostBridgeDxe/PciRootBridgeIo.c
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 642b319..2775661 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -453,7 +453,7 @@ [Components]
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
UefiCpuPkg/CpuDxe/CpuDxe.inf
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
- PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+ OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
<LibraryClasses>
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 24ad0bf..9d020d5 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -214,7 +214,7 @@ [FV.DXEFV]
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
INF UefiCpuPkg/CpuDxe/CpuDxe.inf
INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
-INF PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
INF PcAtChipsetPkg/KbcResetDxe/Reset.inf
INF MdeModulePkg/Universal/Metronome/Metronome.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 819f52e..8514327 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -460,7 +460,7 @@ [Components.X64]
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
UefiCpuPkg/CpuDxe/CpuDxe.inf
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
- PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+ OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
<LibraryClasses>
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 5f98be8..1835631 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -214,7 +214,7 @@ [FV.DXEFV]
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
INF UefiCpuPkg/CpuDxe/CpuDxe.inf
INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
-INF PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
INF PcAtChipsetPkg/KbcResetDxe/Reset.inf
INF MdeModulePkg/Universal/Metronome/Metronome.inf
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 878daf0..9e252f3 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -458,7 +458,7 @@ [Components]
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
UefiCpuPkg/CpuDxe/CpuDxe.inf
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
- PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+ OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
<LibraryClasses>
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 11e74e7..b82eeba 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -214,7 +214,7 @@ [FV.DXEFV]
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
INF UefiCpuPkg/CpuDxe/CpuDxe.inf
INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
-INF PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
INF PcAtChipsetPkg/KbcResetDxe/Reset.inf
INF MdeModulePkg/Universal/Metronome/Metronome.inf
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/Ia32/IoFifo.S
b/OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.S
similarity index 100%
copy from PcAtChipsetPkg/PciHostBridgeDxe/Ia32/IoFifo.S
copy to OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.S
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/Ia32/IoFifo.asm
b/OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.asm
similarity index 100%
copy from PcAtChipsetPkg/PciHostBridgeDxe/Ia32/IoFifo.asm
copy to OvmfPkg/PciHostBridgeDxe/Ia32/IoFifo.asm
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/X64/IoFifo.S
b/OvmfPkg/PciHostBridgeDxe/X64/IoFifo.S
similarity index 100%
copy from PcAtChipsetPkg/PciHostBridgeDxe/X64/IoFifo.S
copy to OvmfPkg/PciHostBridgeDxe/X64/IoFifo.S
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/X64/IoFifo.asm
b/OvmfPkg/PciHostBridgeDxe/X64/IoFifo.asm
similarity index 100%
copy from PcAtChipsetPkg/PciHostBridgeDxe/X64/IoFifo.asm
copy to OvmfPkg/PciHostBridgeDxe/X64/IoFifo.asm
--
1.8.3.1
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
