CorebootPayloadPkg: Use generic SerialDxe driver

Use generic SerialDxe driver in MdeModulePkg instead of the one
in CorebootModulePkg. By doing this the reference for
PciSioSerialDxe driver will also be removed from DSC and FDF file.

Cc: Prince Agyeman <prince.agyeman@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Maurice Ma <maurice.ma@intel.com>
Reviewed-by: Lee Leahy <leroy.p.leahy@intel.com>

diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 4aee5ac6313325ca2020b5d756503a25bcb6e354..848438ffad30202720001ee727486734e4ada08c 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -112,12 +112,11 @@ INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 #\r
 INF CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf\r
 INF CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf\r
 #\r
 INF CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf\r
 INF CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf\r

-INF CorebootModulePkg/PciSioSerialDxe/PciSioSerialDxe.inf\r

 \r
 #\r
 # ISA Support\r
 #\r
 \r
 #\r
 # ISA Support\r
 #\r

-INF CorebootModulePkg/SerialDxe/SerialDxe.inf\r
+INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r

 \r
 #\r
 # Console Support\r
 \r
 #\r
 # Console Support\r

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index 725c912db808ae742c51f0a787ef61c9787f39de..7db4e15edc9234c10454a321dce1957d51a04735 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -398,7 +398,6 @@
   #\r
   CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf\r
   CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf\r
   #\r
   CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf\r
   CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf\r

-  CorebootModulePkg/PciSioSerialDxe/PciSioSerialDxe.inf\r

 \r
   #\r
   # SCSI/ATA/IDE/DISK Support\r
 \r
   #\r
   # SCSI/ATA/IDE/DISK Support\r


@@ -438,7 +437,7 @@
   #\r
   # ISA Support\r
   #\r
   #\r
   # ISA Support\r
   #\r

-  CorebootModulePkg/SerialDxe/SerialDxe.inf\r
+  MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r

 \r
   #\r
   # Console Support\r
 \r
   #\r
   # Console Support\r

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index c2396592d19a2b8634a641d1f2dd60b2175567d5..730134637fa670f4b8799197f35bcd466e598128 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -402,7 +402,6 @@
   #\r
   CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf\r
   CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf\r
   #\r
   CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf\r
   CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf\r

-  CorebootModulePkg/PciSioSerialDxe/PciSioSerialDxe.inf\r

 \r
   #\r
   # SCSI/ATA/IDE/DISK Support\r
 \r
   #\r
   # SCSI/ATA/IDE/DISK Support\r


@@ -442,7 +441,7 @@
   #\r
   # ISA Support\r
   #\r
   #\r
   # ISA Support\r
   #\r

-  CorebootModulePkg/SerialDxe/SerialDxe.inf\r
+  MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r

 \r
   #\r
   # Console Support\r
 \r
   #\r
   # Console Support\r