ArmVirtPkg: Use SerialDxe in MdeModulePkg instead of EmbeddedPkg

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemu.dsc

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 5a644090be7c1de83ed81e7ad750c51faddd346f..e7bc56ef744911f6187bf60fc2771f72017aed82 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -162,6 +162,13 @@
   #\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
 \r
+[PcdsFixedAtBuild.AARCH64]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE\r
+\r
+  # KVM limits it IPA space to 40 bits (1 TB), so there is no need to\r
+  # support anything bigger, even if the host hardware does\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40\r
+\r
 [PcdsDynamicDefault.common]\r
   ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI\r
   #  enumeration to complete before installing ACPI tables.\r
@@ -199,6 +206,7 @@
 \r
   gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0\r
   gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0\r
+  gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0\r
 \r
   #\r
   # Set video resolution for boot options and for text setup.\r
@@ -213,6 +221,8 @@
   # SMBIOS entry point version\r
   #\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0300\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE\r
 \r
 ################################################################################\r
 #\r
@@ -254,7 +264,10 @@
   #\r
   ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf\r
+  }\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {\r
     <LibraryClasses>\r
@@ -275,7 +288,7 @@
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
-  EmbeddedPkg/SerialDxe/SerialDxe.inf\r
+  MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
 \r
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 \r
@@ -292,7 +305,6 @@
   # Platform Driver\r
   #\r
   ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
-  ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf\r
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
@@ -321,7 +333,10 @@
   #\r
   # SMBIOS Support\r
   #\r
-  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
+  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.inf\r
+  }\r
   OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
 \r
   #\r
@@ -354,3 +369,15 @@
   MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
+\r
+[Components.ARM]\r
+  #\r
+  # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need\r
+  # an intermediate OS loader. Add the LinuxLoader UEFI application so we can\r
+  # invoke it from the shell.\r
+  #\r
+  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
+  ArmPkg/Application/LinuxLoader/LinuxLoader.inf {\r
+    <LibraryClasses>\r
+      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf\r
+  }\r