ArmPlatformPkg: Use SerialDxe in MdeModulePkg instead of EmbeddedPkg

[mirror_edk2.git] / ArmPlatformPkg / ArmJunoPkg / ArmJuno.dsc

diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc
index 9b125289228b611117ecfba28c16dd5a8c2efc11..ba838c706361c108cee5f4796c1dedcd54ec7914 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc
+++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc
@@ -1,5 +1,6 @@
 #\r
 #  Copyright (c) 2013-2015, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -51,12 +52,14 @@
 [LibraryClasses.common.SEC]\r
   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf\r
   ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf\r
-  LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+  LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
   MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf\r
   HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf\r
   PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf\r
   PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf\r
   PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf\r
+\r
+[LibraryClasses.common.SEC, LibraryClasses.common.PEIM]\r
   MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf\r
 \r
 [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_DRIVER]\r
@@ -80,11 +83,6 @@
 \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE\r
 \r
-  #\r
-  # FDT installation : enable the development specific features\r
-  #\r
-  gEmbeddedTokenSpaceGuid.PcdOverridePlatformFdt|TRUE\r
-\r
 [PcdsFixedAtBuild.common]\r
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Juno"\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ArmJuno"\r
@@ -132,19 +130,27 @@
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C010000\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C02F000\r
 \r
+  #\r
+  # PLDA PCI Root Complex\r
+  #\r
+  gArmPlatformTokenSpaceGuid.PcdPciBusMax|255\r
+  gArmPlatformTokenSpaceGuid.PcdPciIoBase|0x5f800000\r
+  gArmPlatformTokenSpaceGuid.PcdPciIoSize|0x00800000\r
+  gArmPlatformTokenSpaceGuid.PcdPciMmio32Base|0x50000000\r
+  gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x08000000\r
+  gArmPlatformTokenSpaceGuid.PcdPciMmio64Base|0x4000000000\r
+  gArmPlatformTokenSpaceGuid.PcdPciMmio64Size|0x100000000\r
+\r
   # List of Device Paths that support BootMonFs\r
   gArmPlatformTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)"\r
 \r
   #\r
   # ARM OS Loader\r
   #\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NOR Flash"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/Image"\r
-  gArmPlatformTokenSpaceGuid.PcdFdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno.dtb"\r
-\r
   # Support the Linux EFI stub by default\r
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"EFI Linux from NOR Flash"\r
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/Image"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=ttyAMA0,115200 earlycon=pl011,0x7ff80000 root=/dev/sda1 rootwait verbose debug"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0\r
 \r
   # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)"\r
@@ -170,6 +176,10 @@
   #\r
   gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths|L"                                                                                                                                "\r
 \r
+  # Not all Juno platforms support PCI. This dynamic PCD disables or enable\r
+  # PCI support.\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE\r
+\r
 ################################################################################\r
 #\r
 # Components Section - list of all EDK II Modules needed by this Platform\r
@@ -209,9 +219,12 @@
   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/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf\r
+  }\r
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
 \r
   #\r
@@ -239,7 +252,24 @@
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 \r
+  # Required by PCI\r
+  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
+\r
+  #\r
+  # PCI Support\r
+  #\r
+  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
+  ArmPlatformPkg/ArmJunoPkg/Drivers/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+\r
+  #\r
+  # SATA Controller\r
+  #\r
+  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf\r
+  EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf\r
+\r
+  #\r
   # Networking stack\r
+  #\r
   EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf\r
 \r
   #\r