summaryrefslogtreecommitdiffstats
path: root/ArmVirtPkg/ArmVirtQemu.fdf
diff options
context:
space:
mode:
authorStar Zeng <star.zeng@intel.com>2015-11-26 08:52:12 +0000
committerlzeng14 <lzeng14@Edk2>2015-11-26 08:52:12 +0000
commitad7f6bc2e1163125cdb26f6b0e6695554028626a (patch)
treec932d1bd7bb2dc8ea7123104503b030591ca5267 /ArmVirtPkg/ArmVirtQemu.fdf
parentece2806d02a5a5fd863bf0911af0b795ddacf3b0 (diff)
downloadedk2-ad7f6bc2e1163125cdb26f6b0e6695554028626a.tar.gz
edk2-ad7f6bc2e1163125cdb26f6b0e6695554028626a.tar.bz2
edk2-ad7f6bc2e1163125cdb26f6b0e6695554028626a.zip
ArmVirtPkg: Use SerialDxe in MdeModulePkg instead of EmbeddedPkg
Beyond just changing the directly related lines in the FDF and DSC files, we have to adapt the EarlyFdtPL011SerialPortLib and FdtPL011SerialPortLib instances as well, in the same patch. This is because the EmbeddedPkg driver expects the SerialPortSetAttributes(), SerialPortSetControl() and SerialPortGetControl() functions from SerialPortExtLib, while the MdeModulePkg driver expects them from SerialPortLib itself. We cannot implement these functions in ArmVirtPkg's SerialPortLib instances *before* flipping the driver, because it would cause double function definitions in the EmbeddedPkg driver. We also can't implement the functions *after* flipping the driver, because it would cause unresolved function references in the MdeModulePkg driver. Therefore we have to implement the functions simultaneously with the driver replacement. Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <liming.gao@intel.com> Cc: Laszlo Ersek <lersek@redhat.com> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <star.zeng@intel.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18973 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmVirtPkg/ArmVirtQemu.fdf')
-rw-r--r--ArmVirtPkg/ArmVirtQemu.fdf2
1 files changed, 1 insertions, 1 deletions
diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index 89a4015e59..738e3db570 100644
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -134,7 +134,7 @@ READ_LOCK_STATUS = TRUE
INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
- INF EmbeddedPkg/SerialDxe/SerialDxe.inf
+ INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf