ArmVirtPkg/FdtPciHostBridgeLib: map ECAM and I/O spaces in GCD memory map

[mirror_edk2.git] / Vlv2TbltDevicePkg / PlatformPkgGccX64.dsc

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 3e3522aee908730ff68eca92c0b16b2843518359..f8ad29df59869fa50a9d265b9a8a9b6db8d396bd 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -285,7 +285,7 @@
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
-!if $(FTPM_ENABLE) == TRUE\r
+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
@@ -1462,6 +1462,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
   FatPkg/EnhancedFatDxe/Fat.inf\r
+  ShellPkg/Application/Shell/Shell.inf\r
 !if $(SATA_ENABLE) == TRUE\r
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf\r
 !endif\r
@@ -1528,11 +1529,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 \r
 !if $(NETWORK_ENABLE) == TRUE\r
   !if $(NETWORK_ISCSI_ENABLE) == TRUE\r
-    !if $(NETWORK_IP6_ENABLE) == TRUE\r
-      NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-    !else\r
-      MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-    !endif\r
+    NetworkPkg/IScsiDxe/IScsiDxe.inf\r
   !endif\r
   !if $(NETWORK_VLAN_ENABLE) == TRUE\r
     MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
@@ -1554,24 +1551,16 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
     MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
     MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-    MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {\r
-      <PcdsPatchableInModule>\r
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000\r
-    }\r
+    NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+    NetworkPkg/TcpDxe/TcpDxe.inf\r
     MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
     !if $(NETWORK_IP6_ENABLE) == TRUE\r
       NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
       NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
       NetworkPkg/IpSecDxe/IpSecDxe.inf\r
-      NetworkPkg/TcpDxe/TcpDxe.inf\r
       NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
       NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
     !endif\r
-    !if $(NETWORK_IP6_ENABLE) == TRUE\r
-      NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-    !else\r
-      MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-    !endif\r
 !endif\r
 \r
 !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)\r